diff --git a/.github/actions/configure-docker/action.yml b/.github/actions/configure-docker/action.yml
index 5c9531d35925..b4abf7c274ab 100644
--- a/.github/actions/configure-docker/action.yml
+++ b/.github/actions/configure-docker/action.yml
@@ -15,7 +15,7 @@ runs:
           print("::warning title=Unknown input to configure docker action::Provided value was ${{ inputs.cache-provider }}")
 
     - name: Set up Docker Buildx
-      uses: docker/setup-buildx-action@v3
+      uses: docker/setup-buildx-action@v4
       with:
         # Use host network to allow access to cirrus gha cache running on the host
         driver-opts: |
@@ -23,7 +23,7 @@ runs:
 
     # This is required to allow buildkit to access the actions cache
     - name: Expose actions cache variables
-      uses: actions/github-script@v6
+      uses: actions/github-script@v8
       with:
         script: |
           Object.keys(process.env).forEach(function (key) {
diff --git a/.github/actions/restore-caches/action.yml b/.github/actions/restore-caches/action.yml
index 8dc35d4902ed..21f2807f4c72 100644
--- a/.github/actions/restore-caches/action.yml
+++ b/.github/actions/restore-caches/action.yml
@@ -5,7 +5,7 @@ runs:
   steps:
     - name: Restore Ccache cache
       id: ccache-cache
-      uses: cirruslabs/cache/restore@v4
+      uses: cirruslabs/cache/restore@v5
       with:
         path: ${{ env.CCACHE_DIR }}
         key: ccache-${{ env.CONTAINER_NAME }}-${{ github.run_id }}
@@ -14,7 +14,7 @@ runs:
 
     - name: Restore depends sources cache
       id: depends-sources
-      uses: cirruslabs/cache/restore@v4
+      uses: cirruslabs/cache/restore@v5
       with:
         path: ${{ env.SOURCES_PATH }}
         key: depends-sources-${{ env.CONTAINER_NAME }}-${{ env.DEPENDS_HASH }}
@@ -23,7 +23,7 @@ runs:
 
     - name: Restore built depends cache
       id: depends-built
-      uses: cirruslabs/cache/restore@v4
+      uses: cirruslabs/cache/restore@v5
       with:
         path: ${{ env.BASE_CACHE }}
         key: depends-built-${{ env.CONTAINER_NAME }}-${{ env.DEPENDS_HASH }}
@@ -32,7 +32,7 @@ runs:
 
     - name: Restore previous releases cache
       id: previous-releases
-      uses: cirruslabs/cache/restore@v4
+      uses: cirruslabs/cache/restore@v5
       with:
         path: ${{ env.PREVIOUS_RELEASES_DIR }}
         key: previous-releases-${{ env.CONTAINER_NAME }}-${{ env.PREVIOUS_RELEASES_HASH }}
diff --git a/.github/actions/save-caches/action.yml b/.github/actions/save-caches/action.yml
index 0e3b31246c61..3072ab3f224a 100644
--- a/.github/actions/save-caches/action.yml
+++ b/.github/actions/save-caches/action.yml
@@ -11,28 +11,28 @@ runs:
         echo "previous releases direct cache hit to primary key: ${{ env.previous-releases-cache-hit }}"
 
     - name: Save Ccache cache
-      uses: cirruslabs/cache/save@v4
+      uses: cirruslabs/cache/save@v5
       if: ${{ (github.event_name == 'push') && (github.ref_name == github.event.repository.default_branch) }}
       with:
         path: ${{ env.CCACHE_DIR }}
         key: ccache-${{ env.CONTAINER_NAME }}-${{ github.run_id }}
 
     - name: Save depends sources cache
-      uses: cirruslabs/cache/save@v4
+      uses: cirruslabs/cache/save@v5
       if: ${{ (github.event_name == 'push') && (github.ref_name == github.event.repository.default_branch) && (env.depends-sources-cache-hit != 'true') }}
       with:
         path: ${{ env.SOURCES_PATH }}
         key: depends-sources-${{ env.CONTAINER_NAME }}-${{ env.DEPENDS_HASH }}
 
     - name: Save built depends cache
-      uses: cirruslabs/cache/save@v4
+      uses: cirruslabs/cache/save@v5
       if: ${{ (github.event_name == 'push') && (github.ref_name == github.event.repository.default_branch) && (env.depends-built-cache-hit != 'true' )}}
       with:
         path: ${{ env.BASE_CACHE }}
         key: depends-built-${{ env.CONTAINER_NAME }}-${{ env.DEPENDS_HASH }}
 
     - name: Save previous releases cache
-      uses: cirruslabs/cache/save@v4
+      uses: cirruslabs/cache/save@v5
       if: ${{ (github.event_name == 'push') && (github.ref_name == github.event.repository.default_branch) && (env.previous-releases-cache-hit != 'true' )}}
       with:
         path: ${{ env.PREVIOUS_RELEASES_DIR }}
diff --git a/.github/ci-windows-cross.py b/.github/ci-windows-cross.py
index af350094cdac..6453cb9eac02 100755
--- a/.github/ci-windows-cross.py
+++ b/.github/ci-windows-cross.py
@@ -102,9 +102,6 @@ def run_functional_tests():
         # feature_unsupported_utxo_db.py fails on Windows because of emojis in the test data directory.
         "--exclude",
         "feature_unsupported_utxo_db.py",
-        # See https://github.com/bitcoin/bitcoin/issues/31409.
-        "--exclude",
-        "wallet_multiwallet.py",
     ]
     run(test_runner_cmd)
 
diff --git a/.github/ci-windows.py b/.github/ci-windows.py
index 236c6301d017..964558a2e209 100755
--- a/.github/ci-windows.py
+++ b/.github/ci-windows.py
@@ -8,6 +8,7 @@
 import shlex
 import subprocess
 import sys
+import time
 from pathlib import Path
 
 sys.path.append(str(Path(__file__).resolve().parent.parent / "test"))
@@ -70,10 +71,20 @@ def generate(ci_type):
         "-B",
         "build",
         "-Werror=dev",
-        "--preset",
-        "vs2026",
+        "--preset=vs2026",
+        # Using x64-windows-release for both host and target triplets
+        # to ensure vcpkg builds only release packages, thereby optimizing
+        # build time.
+        # See https://github.com/microsoft/vcpkg/issues/50927.
+        "-DVCPKG_HOST_TRIPLET=x64-windows-release",
+        "-DVCPKG_TARGET_TRIPLET=x64-windows-release",
     ] + GENERATE_OPTIONS[ci_type]
-    run(command)
+    if run(command, check=False).returncode != 0:
+        print("=== ⚠️ ===")
+        print("Generate failure! Network issue? Retry once ...")
+        time.sleep(12)
+        print("=== ⚠️ ===")
+        run(command)
 
 
 def build(_ci_type):
diff --git a/.github/workflows/ci.yml b/.github/workflows/ci.yml
index 70305f261869..f12ceb012ec4 100644
--- a/.github/workflows/ci.yml
+++ b/.github/workflows/ci.yml
@@ -186,7 +186,7 @@ jobs:
 
       - name: Restore Ccache cache
         id: ccache-cache
-        uses: actions/cache/restore@v4
+        uses: actions/cache/restore@v5
         with:
           path: ${{ env.CCACHE_DIR }}
           key: ${{ github.job }}-${{ matrix.job-type }}-ccache-${{ github.run_id }}
@@ -206,7 +206,7 @@ jobs:
           FILE_ENV: ${{ matrix.file-env }}
 
       - name: Save Ccache cache
-        uses: actions/cache/save@v4
+        uses: actions/cache/save@v5
         if: github.event_name != 'pull_request' && github.ref_name == github.event.repository.default_branch && steps.ccache-cache.outputs.cache-hit != 'true'
         with:
           path: ${{ env.CCACHE_DIR }}
@@ -253,26 +253,16 @@ jobs:
           py -3 --version
           bash --version
 
-      - name: Using vcpkg with MSBuild
-        run: |
-          echo "set(VCPKG_BUILD_TYPE release)" >> "${VCPKG_INSTALLATION_ROOT}/triplets/x64-windows.cmake"
-          # Workaround for libevent, which requires CMake 3.1 but is incompatible with CMake >= 4.0.
-          sed -i '1s/^/set(ENV{CMAKE_POLICY_VERSION_MINIMUM} 3.5)\n/' "${VCPKG_INSTALLATION_ROOT}/scripts/ports.cmake"
-
-      - name: Set VCPKG_ROOT
-        run: |
-          echo "VCPKG_ROOT=${VCPKG_INSTALLATION_ROOT}" >> "$GITHUB_ENV"
-
       - name: Restore vcpkg tools cache
         id: vcpkg-tools-cache
         uses: actions/cache/restore@v5
         with:
-          path: C:/vcpkg/downloads/tools
+          path: ~/AppData/Local/vcpkg/downloads/tools
           key: ${{ github.job }}-vcpkg-tools-${{ github.run_id }}
           restore-keys: ${{ github.job }}-vcpkg-tools-
 
       - name: Restore vcpkg binary cache
-        uses: actions/cache/restore@v4
+        uses: actions/cache/restore@v5
         id: vcpkg-binary-cache
         with:
           path: ~/AppData/Local/vcpkg/archives
@@ -283,7 +273,7 @@ jobs:
           py -3 .github/ci-windows.py ${{ matrix.job-type }} generate
 
       - name: Save vcpkg binary cache
-        uses: actions/cache/save@v4
+        uses: actions/cache/save@v5
         if: github.event_name != 'pull_request' && github.ref_name == github.event.repository.default_branch && steps.vcpkg-binary-cache.outputs.cache-hit != 'true' && matrix.job-type == 'standard'
         with:
           path: ~/AppData/Local/vcpkg/archives
@@ -294,7 +284,7 @@ jobs:
         # Only save cache from one job as they share tools. If the matrix is expanded to jobs with unique tools, this may need amending.
         if: github.event_name != 'pull_request' && github.ref_name == github.event.repository.default_branch && steps.vcpkg-tools-cache.outputs.cache-hit != 'true' && matrix.job-type == 'standard'
         with:
-          path: C:/vcpkg/downloads/tools
+          path: ~/AppData/Local/vcpkg/downloads/tools
           key: ${{ github.job }}-vcpkg-tools-${{ github.run_id }}
 
       - name: Build
@@ -378,7 +368,7 @@ jobs:
         uses: ./.github/actions/save-caches
 
       - name: Upload built executables
-        uses: actions/upload-artifact@v6
+        uses: actions/upload-artifact@v7
         with:
           name: ${{ matrix.artifact-name }}-${{ github.run_id }}
           path: |
@@ -416,7 +406,7 @@ jobs:
           ref: ${{ needs.record-frozen-commit.outputs.commit }}
 
       - name: Download built executables
-        uses: actions/download-artifact@v7
+        uses: actions/download-artifact@v8
         with:
           name: ${{ matrix.artifact-name }}-${{ github.run_id }}
 
@@ -486,6 +476,12 @@ jobs:
             timeout-minutes: 120
             file-env: './ci/test/00_setup_env_mac_cross_intel.sh'
 
+          - name: 'FreeBSD Cross'
+            cirrus-runner: 'ghcr.io/cirruslabs/ubuntu-runner-amd64:24.04-md'
+            fallback-runner: 'ubuntu-24.04'
+            timeout-minutes: 120
+            file-env: './ci/test/00_setup_env_freebsd_cross.sh'
+
           - name: 'No wallet'
             cirrus-runner: 'ghcr.io/cirruslabs/ubuntu-runner-amd64:24.04-sm'
             fallback-runner: 'ubuntu-24.04'
diff --git a/CMakeLists.txt b/CMakeLists.txt
index db7a19ad93a7..eda934cc8205 100644
--- a/CMakeLists.txt
+++ b/CMakeLists.txt
@@ -27,7 +27,7 @@ get_directory_property(precious_variables CACHE_VARIABLES)
 # Project / Package metadata
 #=============================
 set(CLIENT_NAME "Bitcoin Core")
-set(CLIENT_VERSION_MAJOR 30)
+set(CLIENT_VERSION_MAJOR 31)
 set(CLIENT_VERSION_MINOR 99)
 set(CLIENT_VERSION_BUILD 0)
 set(CLIENT_VERSION_RC 0)
@@ -117,8 +117,12 @@ if(ENABLE_WALLET)
   if(VCPKG_TARGET_TRIPLET)
     # Use of the `unofficial::` namespace is a vcpkg package manager convention.
     find_package(unofficial-sqlite3 CONFIG REQUIRED)
+    add_library(SQLite3::SQLite3 ALIAS unofficial::sqlite3::sqlite3)
   else()
     find_package(SQLite3 3.7.17 REQUIRED)
+    if(NOT TARGET SQLite3::SQLite3) # CMake < 4.3
+      add_library(SQLite3::SQLite3 ALIAS SQLite::SQLite3)
+    endif()
   endif()
 endif()
 cmake_dependent_option(BUILD_WALLET_TOOL "Build bitcoin-wallet tool." ${BUILD_TESTS} "ENABLE_WALLET" OFF)
@@ -449,6 +453,7 @@ else()
   try_append_cxx_flags("-Wall" TARGET warn_interface SKIP_LINK)
   try_append_cxx_flags("-Wextra" TARGET warn_interface SKIP_LINK)
   try_append_cxx_flags("-Wgnu" TARGET warn_interface SKIP_LINK)
+  try_append_cxx_flags("-Wcovered-switch-default" TARGET warn_interface SKIP_LINK)
   # Some compilers will ignore -Wformat-security without -Wformat, so just combine the two here.
   try_append_cxx_flags("-Wformat -Wformat-security" TARGET warn_interface SKIP_LINK)
   try_append_cxx_flags("-Wvla" TARGET warn_interface SKIP_LINK)
@@ -690,6 +695,7 @@ if(configure_warnings)
       message(WARNING "${warning}")
     endforeach()
     message("  ******\n")
+    message(AUTHOR_WARNING "Warnings have been encountered!")
 endif()
 
 # We want all build properties to be encapsulated properly.
diff --git a/CONTRIBUTING.md b/CONTRIBUTING.md
index deb2b40a138b..f0e88514eeec 100644
--- a/CONTRIBUTING.md
+++ b/CONTRIBUTING.md
@@ -146,7 +146,7 @@ about Git.
 ### Creating the Pull Request
 
 The title of the pull request should be prefixed by the component or area that
-the pull request affects. Valid areas as:
+the pull request affects. Valid areas are:
 
   - `consensus` for changes to consensus critical code
   - `doc` for changes to the documentation
diff --git a/ci/lint/01_install.sh b/ci/lint/01_install.sh
index 44563d424e25..573dbca5fe56 100755
--- a/ci/lint/01_install.sh
+++ b/ci/lint/01_install.sh
@@ -41,20 +41,18 @@ command -v python3
 python3 --version
 
 ${CI_RETRY_EXE} pip3 install \
-  lief==0.16.6 \
-  mypy==1.18.2 \
+  lief==0.17.5 \
+  mypy==1.19.1 \
   pyzmq==27.1.0 \
-  ruff==0.13.2 \
-  vulture==2.14
+  ruff==0.15.5
 
 SHELLCHECK_VERSION=v0.11.0
-curl -sL "https://github.com/koalaman/shellcheck/releases/download/${SHELLCHECK_VERSION}/shellcheck-${SHELLCHECK_VERSION}.linux.x86_64.tar.xz" | \
+curl --fail -L "https://github.com/koalaman/shellcheck/releases/download/${SHELLCHECK_VERSION}/shellcheck-${SHELLCHECK_VERSION}.linux.$(uname --machine).tar.xz" | \
     tar --xz -xf - --directory /tmp/
 mv "/tmp/shellcheck-${SHELLCHECK_VERSION}/shellcheck" /usr/bin/
 
-MLC_VERSION=v1
-MLC_BIN=mlc-x86_64-linux
-curl -sL "https://github.com/becheran/mlc/releases/download/${MLC_VERSION}/${MLC_BIN}" -o "/usr/bin/mlc"
+MLC_VERSION=v1.2.0
+curl --fail -L "https://github.com/becheran/mlc/releases/download/${MLC_VERSION}/mlc-$(uname --machine)-linux" -o "/usr/bin/mlc"
 chmod +x /usr/bin/mlc
 
 popd || exit
diff --git a/ci/retry/retry b/ci/retry/retry
index 37021f009630..7942b6c4f09b 100755
--- a/ci/retry/retry
+++ b/ci/retry/retry
@@ -4,8 +4,6 @@ __sleep_amount() {
   if [ -n "$constant_sleep" ]; then
     sleep_time=$constant_sleep
   else
-    #TODO: check for awk
-    #TODO: check if user would rather use one of the other possible dependencies: python, ruby, bc, dc
     sleep_time=`awk "BEGIN {t = $min_sleep * $(( (1<<($attempts -1)) )); print (t > $max_sleep ? $max_sleep : t)}"`
   fi
 }
@@ -43,7 +41,6 @@ retry()
 
     P="$1"
     for param in "${@:2}"; do P="$P '$param'"; done
-    #TODO: replace single quotes in each arg with '"'"' ?
     export RETRY_ATTEMPT=$attempts
     bash -c "$P"
     return_code=$?
diff --git a/ci/test/00_setup_env_freebsd_cross.sh b/ci/test/00_setup_env_freebsd_cross.sh
new file mode 100755
index 000000000000..da7304d1d26d
--- /dev/null
+++ b/ci/test/00_setup_env_freebsd_cross.sh
@@ -0,0 +1,23 @@
+#!/usr/bin/env bash
+#
+# Copyright (c) The Bitcoin Core developers
+# Distributed under the MIT software license, see the accompanying
+# file COPYING or https://opensource.org/license/mit.
+
+export LC_ALL=C.UTF-8
+
+export CONTAINER_NAME=ci_freebsd_cross
+export CI_IMAGE_NAME_TAG="mirror.gcr.io/ubuntu:24.04"
+export APT_LLVM_V="22"
+export FREEBSD_VERSION=15.0
+export PACKAGES="clang-${APT_LLVM_V} llvm-${APT_LLVM_V} lld"
+export HOST=x86_64-unknown-freebsd
+export DEP_OPTS="build_CC=clang build_CXX=clang++ AR=llvm-ar-${APT_LLVM_V} STRIP=llvm-strip-${APT_LLVM_V} NM=llvm-nm-${APT_LLVM_V} RANLIB=llvm-ranlib-${APT_LLVM_V}"
+export GOAL="install"
+export BITCOIN_CONFIG="\
+ --preset=dev-mode \
+ -DREDUCE_EXPORTS=ON \
+ -DWITH_USDT=OFF \
+"
+export RUN_UNIT_TESTS=false
+export RUN_FUNCTIONAL_TESTS=false
diff --git a/ci/test/00_setup_env_native_fuzz_with_valgrind.sh b/ci/test/00_setup_env_native_fuzz_with_valgrind.sh
index d8b0f5f1b5bb..ed84ae84cf35 100755
--- a/ci/test/00_setup_env_native_fuzz_with_valgrind.sh
+++ b/ci/test/00_setup_env_native_fuzz_with_valgrind.sh
@@ -8,7 +8,7 @@ export LC_ALL=C.UTF-8
 
 export CI_IMAGE_NAME_TAG="mirror.gcr.io/debian:trixie"
 export CONTAINER_NAME=ci_native_fuzz_valgrind
-export PACKAGES="libevent-dev libboost-dev libsqlite3-dev valgrind libcapnp-dev capnproto"
+export PACKAGES="clang llvm libclang-rt-dev libevent-dev libboost-dev libsqlite3-dev valgrind libcapnp-dev capnproto"
 export NO_DEPENDS=1
 export RUN_UNIT_TESTS=false
 export RUN_FUNCTIONAL_TESTS=false
@@ -17,5 +17,6 @@ export FUZZ_TESTS_CONFIG="--valgrind"
 export GOAL="all"
 export BITCOIN_CONFIG="\
  -DBUILD_FOR_FUZZING=ON \
- -DCMAKE_CXX_FLAGS='-Wno-error=array-bounds' \
+ -DCMAKE_C_COMPILER=clang \
+ -DCMAKE_CXX_COMPILER=clang++ \
 "
diff --git a/ci/test/00_setup_env_native_iwyu.sh b/ci/test/00_setup_env_native_iwyu.sh
index 3868510d43a3..27b1e02b6db8 100755
--- a/ci/test/00_setup_env_native_iwyu.sh
+++ b/ci/test/00_setup_env_native_iwyu.sh
@@ -8,9 +8,9 @@ export LC_ALL=C.UTF-8
 
 export CI_IMAGE_NAME_TAG="mirror.gcr.io/debian:trixie"  # To build codegen, CMake must be 3.31 or newer.
 export CONTAINER_NAME=ci_native_iwyu
-export TIDY_LLVM_V="21"
-export APT_LLVM_V="${TIDY_LLVM_V}"
-export PACKAGES="clang-${TIDY_LLVM_V} clang-format-${TIDY_LLVM_V} libclang-${TIDY_LLVM_V}-dev llvm-${TIDY_LLVM_V}-dev jq libevent-dev libboost-dev libzmq3-dev systemtap-sdt-dev qt6-base-dev qt6-tools-dev qt6-l10n-tools libqrencode-dev libsqlite3-dev libcapnp-dev capnproto"
+export IWYU_LLVM_V="22"
+export APT_LLVM_V="${IWYU_LLVM_V}"
+export PACKAGES="clang-${IWYU_LLVM_V} clang-format-${IWYU_LLVM_V} libclang-${IWYU_LLVM_V}-dev llvm-${IWYU_LLVM_V}-dev jq libevent-dev libboost-dev libzmq3-dev systemtap-sdt-dev qt6-base-dev qt6-tools-dev qt6-l10n-tools libqrencode-dev libsqlite3-dev libcapnp-dev capnproto"
 export NO_DEPENDS=1
 export RUN_UNIT_TESTS=false
 export RUN_FUNCTIONAL_TESTS=false
@@ -20,6 +20,6 @@ export RUN_IWYU=true
 export GOAL="codegen"
 export BITCOIN_CONFIG="\
  --preset dev-mode -DBUILD_GUI=OFF \
- -DCMAKE_C_COMPILER=clang-${TIDY_LLVM_V} \
- -DCMAKE_CXX_COMPILER=clang++-${TIDY_LLVM_V} \
+ -DCMAKE_C_COMPILER=clang-${IWYU_LLVM_V} \
+ -DCMAKE_CXX_COMPILER=clang++-${IWYU_LLVM_V} \
 "
diff --git a/ci/test/00_setup_env_native_valgrind.sh b/ci/test/00_setup_env_native_valgrind.sh
index 30c84bf48743..0ca02f77824c 100755
--- a/ci/test/00_setup_env_native_valgrind.sh
+++ b/ci/test/00_setup_env_native_valgrind.sh
@@ -8,16 +8,18 @@ export LC_ALL=C.UTF-8
 
 export CI_IMAGE_NAME_TAG="mirror.gcr.io/debian:trixie"
 export CONTAINER_NAME=ci_native_valgrind
-export PACKAGES="valgrind python3-zmq libevent-dev libboost-dev libzmq3-dev libsqlite3-dev libcapnp-dev capnproto python3-pip"
+export PACKAGES="clang llvm libclang-rt-dev valgrind python3-zmq libevent-dev libboost-dev libzmq3-dev libsqlite3-dev libcapnp-dev capnproto python3-pip"
 export PIP_PACKAGES="--break-system-packages pycapnp"
 export USE_VALGRIND=1
 export NO_DEPENDS=1
 # bind tests excluded for now, see https://github.com/bitcoin/bitcoin/issues/17765#issuecomment-602068547
 export TEST_RUNNER_EXTRA="--exclude rpc_bind --exclude feature_bind_extra"
 export GOAL="install"
-# TODO enable GUI
+# GUI disabled, because it only passes with a DEBUG=1 depends build
 export BITCOIN_CONFIG="\
-  --preset=dev-mode \
+ --preset=dev-mode \
  -DBUILD_GUI=OFF \
  -DWITH_USDT=OFF \
+ -DCMAKE_C_COMPILER=clang \
+ -DCMAKE_CXX_COMPILER=clang++ \
 "
diff --git a/ci/test/01_base_install.sh b/ci/test/01_base_install.sh
index f8d337f6c902..5a6e06811fa0 100755
--- a/ci/test/01_base_install.sh
+++ b/ci/test/01_base_install.sh
@@ -8,6 +8,11 @@ export LC_ALL=C.UTF-8
 
 set -o errexit -o pipefail -o xtrace
 
+if [ "${DANGER_RUN_CI_ON_HOST}" != "1" ]; then
+  echo "This script will make unsafe local and global modifications, so it can only be run inside a container and requires DANGER_RUN_CI_ON_HOST=1"
+  exit 1
+fi
+
 CFG_DONE="${BASE_ROOT_DIR}/ci.base-install-done"  # Use a global setting to remember whether this script ran to avoid running it twice
 
 if [ "$( cat "${CFG_DONE}" || true )" == "done" ]; then
@@ -80,9 +85,9 @@ if [[ -n "${USE_INSTRUMENTED_LIBCPP}" ]]; then
 fi
 
 if [[ "${RUN_IWYU}" == true ]]; then
-  ${CI_RETRY_EXE} git clone --depth=1 https://github.com/include-what-you-use/include-what-you-use -b clang_"${TIDY_LLVM_V}" /include-what-you-use
+  ${CI_RETRY_EXE} git clone --depth=1 https://github.com/include-what-you-use/include-what-you-use -b clang_"${IWYU_LLVM_V}" /include-what-you-use
   (cd /include-what-you-use && patch -p1 < /ci_container_base/ci/test/01_iwyu.patch)
-  cmake -B /iwyu-build/ -G 'Unix Makefiles' -DCMAKE_PREFIX_PATH=/usr/lib/llvm-"${TIDY_LLVM_V}" -S /include-what-you-use
+  cmake -B /iwyu-build/ -G 'Unix Makefiles' -DCMAKE_PREFIX_PATH=/usr/lib/llvm-"${IWYU_LLVM_V}" -S /include-what-you-use
   make -C /iwyu-build/ install "$MAKEJOBS"
 fi
 
@@ -99,4 +104,16 @@ if [ -n "$XCODE_VERSION" ] && [ ! -d "${DEPENDS_DIR}/SDKs/${OSX_SDK_BASENAME}" ]
   tar -C "${DEPENDS_DIR}/SDKs" -xf "$OSX_SDK_PATH"
 fi
 
+FREEBSD_SDK_BASENAME="freebsd-${HOST}-${FREEBSD_VERSION}"
+
+if [ -n "$FREEBSD_VERSION" ] && [ ! -d "${DEPENDS_DIR}/SDKs/${FREEBSD_SDK_BASENAME}" ]; then
+  FREEBSD_SDK_FILENAME="base-${FREEBSD_VERSION}.txz"
+  FREEBSD_SDK_PATH="${DEPENDS_DIR}/sdk-sources/${FREEBSD_SDK_FILENAME}"
+  if [ ! -f "$FREEBSD_SDK_PATH" ]; then
+    ${CI_RETRY_EXE} curl --location --fail "https://download.freebsd.org/releases/amd64/${FREEBSD_VERSION}-RELEASE/base.txz" -o "$FREEBSD_SDK_PATH"
+  fi
+  mkdir -p "${DEPENDS_DIR}/SDKs/${FREEBSD_SDK_BASENAME}"
+  tar -C "${DEPENDS_DIR}/SDKs/${FREEBSD_SDK_BASENAME}" -xf "$FREEBSD_SDK_PATH"
+fi
+
 echo -n "done" > "${CFG_DONE}"
diff --git a/ci/test/01_iwyu.patch b/ci/test/01_iwyu.patch
index 209e133f0e39..d86a02dc7669 100644
--- a/ci/test/01_iwyu.patch
+++ b/ci/test/01_iwyu.patch
@@ -3,9 +3,9 @@ See: https://en.cppreference.com/w/cpp/preprocessor/include.html.
 
 --- a/iwyu_path_util.cc
 +++ b/iwyu_path_util.cc
-@@ -211,7 +211,7 @@ bool IsQuotedInclude(const string& s) {
+@@ -222,7 +222,7 @@ bool IsQuotedInclude(StringRef s) {
  }
-
+ 
  string AddQuotes(string include_name, bool angled) {
 -  if (angled) {
 +  if (true) {
@@ -19,7 +19,7 @@ See: https://github.com/include-what-you-use/include-what-you-use/blob/clang_21/
 
 --- a/iwyu_include_picker.cc
 +++ b/iwyu_include_picker.cc
-@@ -100,20 +100,20 @@ const IncludeMapEntry libc_symbol_map[] = {
+@@ -104,20 +104,20 @@ const IncludeMapEntry libc_symbol_map[] = {
    // equal.  The visibility on the symbol-name is ignored; by convention
    // we always set it to kPrivate.
    { "_POSIX_VDISABLE", kPrivate, "<unistd.h>", kPublic },
@@ -46,7 +46,7 @@ See: https://github.com/include-what-you-use/include-what-you-use/blob/clang_21/
    { "error_t", kPrivate, "<argp.h>", kPublic },
    { "error_t", kPrivate, "<argz.h>", kPublic },
    { "FD_CLR", kPrivate, "<sys/select.h>", kPublic },
-@@ -122,10 +122,10 @@ const IncludeMapEntry libc_symbol_map[] = {
+@@ -126,10 +126,10 @@ const IncludeMapEntry libc_symbol_map[] = {
    { "fd_set", kPrivate, "<sys/select.h>", kPublic },
    { "FD_SETSIZE", kPrivate, "<sys/select.h>", kPublic },
    { "FD_ZERO", kPrivate, "<sys/select.h>", kPublic },
@@ -61,7 +61,7 @@ See: https://github.com/include-what-you-use/include-what-you-use/blob/clang_21/
    { "fsblkcnt_t", kPrivate, "<sys/types.h>", kPublic },
    { "fsfilcnt_t", kPrivate, "<sys/types.h>", kPublic },
    { "getopt", kPrivate, "<unistd.h>", kPublic },
-@@ -135,31 +135,31 @@ const IncludeMapEntry libc_symbol_map[] = {
+@@ -139,47 +139,47 @@ const IncludeMapEntry libc_symbol_map[] = {
    { "in_addr_t", kPrivate, "<netinet/in.h>", kPublic },
    { "in_port_t", kPrivate, "<netinet/in.h>", kPublic },
    { "id_t", kPrivate, "<sys/types.h>", kPublic },
@@ -77,20 +77,52 @@ See: https://github.com/include-what-you-use/include-what-you-use/blob/clang_21/
 -  { "int16_t", kPrivate, "<stdint.h>", kPublic },
 -  { "int32_t", kPrivate, "<stdint.h>", kPublic },
 -  { "int64_t", kPrivate, "<stdint.h>", kPublic },
+-  { "int_fast8_t", kPrivate, "<stdint.h>", kPublic },
+-  { "int_fast16_t", kPrivate, "<stdint.h>", kPublic },
+-  { "int_fast32_t", kPrivate, "<stdint.h>", kPublic },
+-  { "int_fast64_t", kPrivate, "<stdint.h>", kPublic },
+-  { "int_least8_t", kPrivate, "<stdint.h>", kPublic },
+-  { "int_least16_t", kPrivate, "<stdint.h>", kPublic },
+-  { "int_least32_t", kPrivate, "<stdint.h>", kPublic },
+-  { "int_least64_t", kPrivate, "<stdint.h>", kPublic },
 -  { "uint8_t", kPrivate, "<stdint.h>", kPublic },
 -  { "uint16_t", kPrivate, "<stdint.h>", kPublic },
 -  { "uint32_t", kPrivate, "<stdint.h>", kPublic },
 -  { "uint64_t", kPrivate, "<stdint.h>", kPublic },
+-  { "uint_fast8_t", kPrivate, "<stdint.h>", kPublic },
+-  { "uint_fast16_t", kPrivate, "<stdint.h>", kPublic },
+-  { "uint_fast32_t", kPrivate, "<stdint.h>", kPublic },
+-  { "uint_fast64_t", kPrivate, "<stdint.h>", kPublic },
+-  { "uint_least8_t", kPrivate, "<stdint.h>", kPublic },
+-  { "uint_least16_t", kPrivate, "<stdint.h>", kPublic },
+-  { "uint_least32_t", kPrivate, "<stdint.h>", kPublic },
+-  { "uint_least64_t", kPrivate, "<stdint.h>", kPublic },
 -  { "intptr_t", kPrivate, "<stdint.h>", kPublic },
 -  { "uintptr_t", kPrivate, "<stdint.h>", kPublic },
 +  { "int8_t", kPrivate, "<stdint.h>", kPrivate },
 +  { "int16_t", kPrivate, "<stdint.h>", kPrivate },
 +  { "int32_t", kPrivate, "<stdint.h>", kPrivate },
 +  { "int64_t", kPrivate, "<stdint.h>", kPrivate },
++  { "int_fast8_t", kPrivate, "<stdint.h>", kPrivate },
++  { "int_fast16_t", kPrivate, "<stdint.h>", kPrivate },
++  { "int_fast32_t", kPrivate, "<stdint.h>", kPrivate },
++  { "int_fast64_t", kPrivate, "<stdint.h>", kPrivate },
++  { "int_least8_t", kPrivate, "<stdint.h>", kPrivate },
++  { "int_least16_t", kPrivate, "<stdint.h>", kPrivate },
++  { "int_least32_t", kPrivate, "<stdint.h>", kPrivate },
++  { "int_least64_t", kPrivate, "<stdint.h>", kPrivate },
 +  { "uint8_t", kPrivate, "<stdint.h>", kPrivate },
 +  { "uint16_t", kPrivate, "<stdint.h>", kPrivate },
 +  { "uint32_t", kPrivate, "<stdint.h>", kPrivate },
 +  { "uint64_t", kPrivate, "<stdint.h>", kPrivate },
++  { "uint_fast8_t", kPrivate, "<stdint.h>", kPrivate },
++  { "uint_fast16_t", kPrivate, "<stdint.h>", kPrivate },
++  { "uint_fast32_t", kPrivate, "<stdint.h>", kPrivate },
++  { "uint_fast64_t", kPrivate, "<stdint.h>", kPrivate },
++  { "uint_least8_t", kPrivate, "<stdint.h>", kPrivate },
++  { "uint_least16_t", kPrivate, "<stdint.h>", kPrivate },
++  { "uint_least32_t", kPrivate, "<stdint.h>", kPrivate },
++  { "uint_least64_t", kPrivate, "<stdint.h>", kPrivate },
 +  { "intptr_t", kPrivate, "<stdint.h>", kPrivate },
 +  { "uintptr_t", kPrivate, "<stdint.h>", kPrivate },
    { "iovec", kPrivate, "<sys/uio.h>", kPublic },
@@ -114,7 +146,7 @@ See: https://github.com/include-what-you-use/include-what-you-use/blob/clang_21/
    { "mcontext_t", kPrivate, "<ucontext.h>", kPublic },
    { "mode_t", kPrivate, "<sys/types.h>", kPublic },
    { "nl_item", kPrivate, "<nl_types.h>", kPublic },
-@@ -175,8 +175,8 @@ const IncludeMapEntry libc_symbol_map[] = {
+@@ -195,8 +195,8 @@ const IncludeMapEntry libc_symbol_map[] = {
    { "optind", kPrivate, "<unistd.h>", kPublic },
    { "optopt", kPrivate, "<unistd.h>", kPublic },
    { "pid_t", kPrivate, "<sys/types.h>", kPublic },
@@ -125,7 +157,7 @@ See: https://github.com/include-what-you-use/include-what-you-use/blob/clang_21/
    { "pthread_attr_t", kPrivate, "<pthread.h>", kPublic },
    { "pthread_cond_t", kPrivate, "<pthread.h>", kPublic },
    { "pthread_condattr_t", kPrivate, "<pthread.h>", kPublic },
-@@ -187,7 +187,7 @@ const IncludeMapEntry libc_symbol_map[] = {
+@@ -207,7 +207,7 @@ const IncludeMapEntry libc_symbol_map[] = {
    { "pthread_rwlock_t", kPrivate, "<pthread.h>", kPublic },
    { "pthread_rwlockattr_t", kPrivate, "<pthread.h>", kPublic },
    { "pthread_t", kPrivate, "<pthread.h>", kPublic },
@@ -134,7 +166,7 @@ See: https://github.com/include-what-you-use/include-what-you-use/blob/clang_21/
    { "regex_t", kPrivate, "<regex.h>", kPublic },
    { "regmatch_t", kPrivate, "<regex.h>", kPublic },
    { "regoff_t", kPrivate, "<regex.h>", kPublic },
-@@ -218,51 +218,51 @@ const IncludeMapEntry libc_symbol_map[] = {
+@@ -238,54 +238,54 @@ const IncludeMapEntry libc_symbol_map[] = {
    { "SCHED_FIFO", kPrivate, "<sched.h>", kPublic },
    { "SCHED_OTHER", kPrivate, "<sched.h>", kPublic },
    { "SCHED_RR", kPrivate, "<sched.h>", kPublic },
@@ -167,7 +199,10 @@ See: https://github.com/include-what-you-use/include-what-you-use/blob/clang_21/
    { "timer_t", kPrivate, "<sys/types.h>", kPublic },
 -  { "timespec", kPrivate, "<time.h>", kPublic },
 +  { "timespec", kPrivate, "<time.h>", kPrivate },
-   { "timeval", kPrivate, "<sys/time.h>", kPublic },
+   { "timeval", kPrivate, "<sys/time.h>", kPublic },  // 'canonical' location for timeval
+   { "timeval", kPrivate, "<sys/resource.h>", kPublic },
+   { "timeval", kPrivate, "<sys/select.h>", kPublic },
+   { "timeval", kPrivate, "<utmpx.h>", kPublic },
 -  { "tm", kPrivate, "<time.h>", kPublic },
 +  { "tm", kPrivate, "<time.h>", kPrivate },
    { "u_char", kPrivate, "<sys/types.h>", kPublic },
@@ -212,7 +247,7 @@ See: https://github.com/include-what-you-use/include-what-you-use/blob/clang_21/
    { "IBSHIFT", kPrivate, "<asm/termbits.h>", kPublic },
    { "MAP_POPULATE", kPrivate, "<sys/mman.h>", kPublic },
    { "MAP_POPULATE", kPrivate, "<linux/mman.h>", kPublic },
-@@ -270,22 +270,22 @@ const IncludeMapEntry libc_symbol_map[] = {
+@@ -293,22 +293,22 @@ const IncludeMapEntry libc_symbol_map[] = {
    { "MAP_STACK", kPrivate, "<linux/mman.h>", kPublic },
    { "MAXHOSTNAMELEN", kPrivate, "<sys/param.h>", kPublic },
    { "MAXHOSTNAMELEN", kPrivate, "<protocols/timed.h>", kPublic },
@@ -248,7 +283,7 @@ See: https://github.com/include-what-you-use/include-what-you-use/blob/clang_21/
    { "NULL", kPrivate, "<clocale>", kPublic },
    { "NULL", kPrivate, "<cstddef>", kPublic },
    { "NULL", kPrivate, "<cstdio>", kPublic },
-@@ -293,13 +293,13 @@ const IncludeMapEntry libc_symbol_map[] = {
+@@ -316,13 +316,13 @@ const IncludeMapEntry libc_symbol_map[] = {
    { "NULL", kPrivate, "<cstring>", kPublic },
    { "NULL", kPrivate, "<ctime>", kPublic },
    { "NULL", kPrivate, "<cwchar>", kPublic },
@@ -266,10 +301,10 @@ See: https://github.com/include-what-you-use/include-what-you-use/blob/clang_21/
 +  { "NULL", kPrivate, "<time.h>", kPrivate },
 +  { "NULL", kPrivate, "<wchar.h>", kPrivate },
 +  { "offsetof", kPrivate, "<stddef.h>", kPrivate },
- };
- 
- // Common kludges for C++ standard libraries
-@@ -355,7 +355,7 @@ const IncludeMapEntry libc_include_map[] = {
+   // Auxiliary vector entry types.
+   { "AT_BASE", kPrivate, "<sys/auxv.h>", kPublic },
+   { "AT_BASE_PLATFORM", kPrivate, "<sys/auxv.h>", kPublic },
+@@ -409,7 +409,7 @@ const IncludeMapEntry libc_include_map[] = {
    { "<bits/a.out.h>", kPrivate, "<a.out.h>", kPublic },
    { "<bits/auxv.h>", kPrivate, "<sys/auxv.h>", kPublic },
    { "<bits/byteswap.h>", kPrivate, "<byteswap.h>", kPublic },
@@ -278,7 +313,7 @@ See: https://github.com/include-what-you-use/include-what-you-use/blob/clang_21/
    { "<bits/confname.h>", kPrivate, "<unistd.h>", kPublic },
    { "<bits/dirent.h>", kPrivate, "<dirent.h>", kPublic },
    { "<bits/dlfcn.h>", kPrivate, "<dlfcn.h>", kPublic },
-@@ -363,18 +363,18 @@ const IncludeMapEntry libc_include_map[] = {
+@@ -417,18 +417,18 @@ const IncludeMapEntry libc_include_map[] = {
    { "<bits/endian.h>", kPrivate, "<endian.h>", kPublic },
    { "<bits/environments.h>", kPrivate, "<unistd.h>", kPublic },
    { "<bits/epoll.h>", kPrivate, "<sys/epoll.h>", kPublic },
@@ -304,7 +339,7 @@ See: https://github.com/include-what-you-use/include-what-you-use/blob/clang_21/
    { "<bits/inotify.h>", kPrivate, "<sys/inotify.h>", kPublic },
    { "<bits/ioctl-types.h>", kPrivate, "<sys/ioctl.h>", kPublic },
    { "<bits/ioctls.h>", kPrivate, "<sys/ioctl.h>", kPublic },
-@@ -382,24 +382,24 @@ const IncludeMapEntry libc_include_map[] = {
+@@ -436,24 +436,24 @@ const IncludeMapEntry libc_include_map[] = {
    { "<bits/ipctypes.h>", kPrivate, "<sys/ipc.h>", kPublic },
    { "<bits/libio-ldbl.h>", kPrivate, "<libio.h>", kPublic },
    { "<bits/link.h>", kPrivate, "<link.h>", kPublic },
@@ -337,7 +372,7 @@ See: https://github.com/include-what-you-use/include-what-you-use/blob/clang_21/
    { "<bits/posix_opt.h>", kPrivate, "<unistd.h>", kPublic },
    { "<bits/printf-ldbl.h>", kPrivate, "<printf.h>", kPublic },
    { "<bits/pthreadtypes.h>", kPrivate, "<pthread.h>", kPublic },
-@@ -409,17 +409,17 @@ const IncludeMapEntry libc_include_map[] = {
+@@ -463,17 +463,17 @@ const IncludeMapEntry libc_include_map[] = {
    { "<bits/select2.h>", kPrivate, "<sys/select.h>", kPublic },
    { "<bits/sem.h>", kPrivate, "<sys/sem.h>", kPublic },
    { "<bits/semaphore.h>", kPrivate, "<semaphore.h>", kPublic },
@@ -365,7 +400,7 @@ See: https://github.com/include-what-you-use/include-what-you-use/blob/clang_21/
    { "<bits/sockaddr.h>", kPrivate, "<sys/un.h>", kPublic },
    { "<bits/socket.h>", kPrivate, "<sys/socket.h>", kPublic },
    { "<bits/socket2.h>", kPrivate, "<sys/socket.h>", kPublic },
-@@ -429,22 +429,22 @@ const IncludeMapEntry libc_include_map[] = {
+@@ -483,22 +483,22 @@ const IncludeMapEntry libc_include_map[] = {
    { "<bits/statfs.h>", kPrivate, "<sys/statfs.h>", kPublic },
    { "<bits/statvfs.h>", kPrivate, "<sys/statvfs.h>", kPublic },
    { "<bits/statx-generic.h>", kPrivate, "<sys/stat.h>", kPublic },
@@ -400,7 +435,7 @@ See: https://github.com/include-what-you-use/include-what-you-use/blob/clang_21/
    { "<bits/syscall.h>", kPrivate, "<sys/syscall.h>", kPublic },
    { "<bits/sysctl.h>", kPrivate, "<sys/sysctl.h>", kPublic },
    { "<bits/syslog-ldbl.h>", kPrivate, "<sys/syslog.h>", kPrivate },
-@@ -459,12 +459,12 @@ const IncludeMapEntry libc_include_map[] = {
+@@ -515,12 +515,12 @@ const IncludeMapEntry libc_include_map[] = {
    { "<bits/termios-struct.h>", kPrivate, "<termios.h>", kPublic },
    { "<bits/termios-tcflow.h>", kPrivate, "<termios.h>", kPublic },
    { "<bits/termios.h>", kPrivate, "<termios.h>", kPublic },
@@ -413,9 +448,9 @@ See: https://github.com/include-what-you-use/include-what-you-use/blob/clang_21/
 -  { "<bits/types/siginfo_t.h>", kPrivate, "<signal.h>", kPublic },
 +  { "<bits/types/siginfo_t.h>", kPrivate, "<signal.h>", kPrivate },
    { "<bits/types/siginfo_t.h>", kPrivate, "<sys/wait.h>", kPublic },
-   { "<bits/uio.h>", kPrivate, "<sys/uio.h>", kPublic },
-   { "<bits/unistd.h>", kPrivate, "<unistd.h>", kPublic },
-@@ -474,11 +474,11 @@ const IncludeMapEntry libc_include_map[] = {
+   { "<bits/types/struct_rusage.h>", kPrivate, "<sys/resource.h>", kPublic },
+   { "<bits/types/struct_sched_param.h>", kPrivate, "<sched.h>", kPublic },
+@@ -532,11 +532,11 @@ const IncludeMapEntry libc_include_map[] = {
    { "<bits/utsname.h>", kPrivate, "<sys/utsname.h>", kPublic },
    { "<bits/waitflags.h>", kPrivate, "<sys/wait.h>", kPublic },
    { "<bits/waitstatus.h>", kPrivate, "<sys/wait.h>", kPublic },
@@ -432,7 +467,7 @@ See: https://github.com/include-what-you-use/include-what-you-use/blob/clang_21/
    { "<bits/xtitypes.h>", kPrivate, "<stropts.h>", kPublic },
    // Sometimes libc tells you what mapping to do via an '#error':
    // # error "Never use <bits/dlfcn.h> directly; include <dlfcn.h> instead."
-@@ -488,7 +488,7 @@ const IncludeMapEntry libc_include_map[] = {
+@@ -546,7 +546,7 @@ const IncludeMapEntry libc_include_map[] = {
    { "<bits/a.out.h>", kPrivate, "<a.out.h>", kPublic },
    { "<bits/byteswap-16.h>", kPrivate, "<byteswap.h>", kPublic },
    { "<bits/byteswap.h>", kPrivate, "<byteswap.h>", kPublic },
@@ -441,7 +476,7 @@ See: https://github.com/include-what-you-use/include-what-you-use/blob/clang_21/
    { "<bits/confname.h>", kPrivate, "<unistd.h>", kPublic },
    { "<bits/dirent.h>", kPrivate, "<dirent.h>", kPublic },
    { "<bits/dlfcn.h>", kPrivate, "<dlfcn.h>", kPublic },
-@@ -498,38 +498,38 @@ const IncludeMapEntry libc_include_map[] = {
+@@ -556,38 +556,38 @@ const IncludeMapEntry libc_include_map[] = {
    { "<bits/eventfd.h>", kPrivate, "<sys/eventfd.h>", kPublic },
    { "<bits/fcntl-linux.h>", kPrivate, "<fcntl.h>", kPublic },
    { "<bits/fcntl.h>", kPrivate, "<fcntl.h>", kPublic },
@@ -495,7 +530,7 @@ See: https://github.com/include-what-you-use/include-what-you-use/blob/clang_21/
    { "<bits/timerfd.h>", kPrivate, "<sys/timerfd.h>", kPublic },
    { "<bits/typesizes.h>", kPrivate, "<sys/types.h>", kPublic },
    // Top-level #includes that just forward to another file:
-@@ -541,13 +541,13 @@ const IncludeMapEntry libc_include_map[] = {
+@@ -599,13 +599,13 @@ const IncludeMapEntry libc_include_map[] = {
    // on the POSIX.1-2024 list, I just choose the top-level one.
    { "<sys/aio.h>", kPrivate, "<aio.h>", kPublic },
    { "<sys/dirent.h>", kPrivate, "<dirent.h>", kPublic },
@@ -512,7 +547,7 @@ See: https://github.com/include-what-you-use/include-what-you-use/blob/clang_21/
    { "<sys/syslog.h>", kPrivate, "<syslog.h>", kPublic },
    { "<sys/termios.h>", kPrivate, "<termios.h>", kPublic },
    { "<sys/unistd.h>", kPrivate, "<unistd.h>", kPublic },
-@@ -567,21 +567,21 @@ const IncludeMapEntry libc_include_map[] = {
+@@ -625,21 +625,21 @@ const IncludeMapEntry libc_include_map[] = {
    { "<asm/unistd_64.h>", kPrivate, "<asm/unistd.h>", kPrivate },
    // I don't know what grep would have found these.  I found them
    // via user report.
@@ -539,7 +574,7 @@ See: https://github.com/include-what-you-use/include-what-you-use/blob/clang_21/
  };
  
  const IncludeMapEntry stdlib_c_include_map[] = {
-@@ -600,32 +600,32 @@ const IncludeMapEntry stdlib_c_include_map[] = {
+@@ -658,32 +658,32 @@ const IncludeMapEntry stdlib_c_include_map[] = {
    // https://github.com/cplusplus/draft/blob/c+%2B20/source/lib-intro.tex
    //
    // $ curl -s -N https://raw.githubusercontent.com/cplusplus/draft/c%2B%2B20/source/lib-intro.tex | sed -n '/begin{multicolfloattable}.*{headers.cpp.c}/,/end{multicolfloattable}/p' | grep tcode | perl -nle 'm/tcode{<c(.*)>}/ && print qq@  { "<$1.h>", kPublic, "<c$1>", kPublic },@' | sort
@@ -548,7 +583,12 @@ See: https://github.com/include-what-you-use/include-what-you-use/blob/clang_21/
 -  { "<ctype.h>", kPublic, "<cctype>", kPublic },
 -  { "<errno.h>", kPublic, "<cerrno>", kPublic },
 -  { "<fenv.h>", kPublic, "<cfenv>", kPublic },
--  { "<float.h>", kPublic, "<cfloat>", kPublic },
++  { "<assert.h>", kPrivate, "<cassert>", kPublic },
++  { "<complex.h>", kPrivate, "<ccomplex>", kPublic },
++  { "<ctype.h>", kPrivate, "<cctype>", kPublic },
++  { "<errno.h>", kPrivate, "<cerrno>", kPublic },
++  { "<fenv.h>", kPrivate, "<cfenv>", kPublic },
+   { "<float.h>", kPublic, "<cfloat>", kPublic },
 -  { "<inttypes.h>", kPublic, "<cinttypes>", kPublic },
 -  { "<iso646.h>", kPublic, "<ciso646>", kPublic },
 -  { "<limits.h>", kPublic, "<climits>", kPublic },
@@ -569,12 +609,6 @@ See: https://github.com/include-what-you-use/include-what-you-use/blob/clang_21/
 -  { "<uchar.h>", kPublic, "<cuchar>", kPublic },
 -  { "<wchar.h>", kPublic, "<cwchar>", kPublic },
 -  { "<wctype.h>", kPublic, "<cwctype>", kPublic },
-+  { "<assert.h>", kPrivate, "<cassert>", kPublic },
-+  { "<complex.h>", kPrivate, "<ccomplex>", kPublic },
-+  { "<ctype.h>", kPrivate, "<cctype>", kPublic },
-+  { "<errno.h>", kPrivate, "<cerrno>", kPublic },
-+  { "<fenv.h>", kPrivate, "<cfenv>", kPublic },
-+  { "<float.h>", kPrivate, "<cfloat>", kPublic },
 +  { "<inttypes.h>", kPrivate, "<cinttypes>", kPublic },
 +  { "<iso646.h>", kPrivate, "<ciso646>", kPublic },
 +  { "<limits.h>", kPrivate, "<climits>", kPublic },
diff --git a/ci/test/02_run_container.py b/ci/test/02_run_container.py
index dce3730a65a4..abaa535553db 100755
--- a/ci/test/02_run_container.py
+++ b/ci/test/02_run_container.py
@@ -158,7 +158,13 @@ def ci_exec(cmd_inner, **kwargs):
         if os.getenv("DANGER_RUN_CI_ON_HOST"):
             prefix = []
         else:
-            prefix = ["docker", "exec", container_id]
+            prefix = [
+                "docker",
+                "exec",
+                "--env",
+                "DANGER_RUN_CI_ON_HOST=1",  # Safe to set *inside* the container
+                container_id,
+            ]
 
         return run([*prefix, *cmd_inner], **kwargs)
 
diff --git a/ci/test/03_test_script.sh b/ci/test/03_test_script.sh
index eb03c2dd4936..45bc12700fb6 100755
--- a/ci/test/03_test_script.sh
+++ b/ci/test/03_test_script.sh
@@ -6,7 +6,12 @@
 
 export LC_ALL=C.UTF-8
 
-set -ex
+set -o errexit -o xtrace
+
+if [ "${DANGER_RUN_CI_ON_HOST}" != "1" ]; then
+  echo "This script will make unsafe local and global modifications, so it can only be run inside a container and requires DANGER_RUN_CI_ON_HOST=1"
+  exit 1
+fi
 
 cd "${BASE_ROOT_DIR}"
 
@@ -44,6 +49,19 @@ echo "=== BEGIN env ==="
 env
 echo "=== END env ==="
 
+# The CI framework should be flexible where it is run from. For example, from
+# a git-archive, a git-worktree, or a normal git repo.
+# The iwyu task requires a working git repo, which may not always be
+# available, so initialize one with force.
+if [[ "${RUN_IWYU}" == true ]]; then
+  mv .git .git_ci_backup || true
+  git init
+  git add ./src  # the git diff command used later for iwyu only cares about ./src
+  git config user.email "ci@ci"
+  git config user.name "CI"
+  git commit -m "dummy CI ./src init for IWYU"
+fi
+
 if [ "$RUN_FUZZ_TESTS" = "true" ]; then
   export DIR_FUZZ_IN=${DIR_QA_ASSETS}/fuzz_corpora/
   if [ ! -d "$DIR_FUZZ_IN" ]; then
@@ -137,6 +155,14 @@ if [ "$RUN_CHECK_DEPS" = "true" ]; then
   "${BASE_ROOT_DIR}/contrib/devtools/check-deps.sh" "${BASE_BUILD_DIR}"
 fi
 
+if [[ "$CI_OS_NAME" == "macos" && "${GOAL}" = "install deploy" ]]; then
+  unzip "${BASE_BUILD_DIR}/bitcoin-macos-app.zip" -d "${BASE_BUILD_DIR}/deploy"
+  if ! ( codesign --verify "${BASE_BUILD_DIR}/deploy/Bitcoin-Qt.app" ); then
+    echo "Codesigning failed."
+    false
+  fi
+fi
+
 if [ "$RUN_UNIT_TESTS" = "true" ]; then
   DIR_UNIT_TEST_DATA="${DIR_UNIT_TEST_DATA}" \
   LD_LIBRARY_PATH="${DEPENDS_DIR}/${HOST}/lib" \
@@ -183,7 +209,7 @@ fi
 
 if [[ "${RUN_IWYU}" == true ]]; then
   # TODO: Consider enforcing IWYU across the entire codebase.
-  FILES_WITH_ENFORCED_IWYU="/src/((crypto|index|kernel|primitives|univalue/(lib|test)|zmq)/.*\\.cpp|node/blockstorage\\.cpp|node/utxo_snapshot\\.cpp|core_io\\.cpp|signet\\.cpp)"
+  FILES_WITH_ENFORCED_IWYU="/src/(((crypto|index|kernel|primitives|univalue/(lib|test)|util|zmq|compat)/.*|common/license_info|node/blockstorage|node/utxo_snapshot|clientversion|core_io|signet)\\.cpp)"
   jq --arg patterns "$FILES_WITH_ENFORCED_IWYU" 'map(select(.file | test($patterns)))' "${BASE_BUILD_DIR}/compile_commands.json" > "${BASE_BUILD_DIR}/compile_commands_iwyu_errors.json"
   jq --arg patterns "$FILES_WITH_ENFORCED_IWYU" 'map(select(.file | test($patterns) | not))' "${BASE_BUILD_DIR}/compile_commands.json" > "${BASE_BUILD_DIR}/compile_commands_iwyu_warnings.json"
 
@@ -198,7 +224,7 @@ if [[ "${RUN_IWYU}" == true ]]; then
              -Xiwyu --check_also="*/primitives/*.h" \
              2>&1 | tee /tmp/iwyu_ci.out
     python3 "/include-what-you-use/fix_includes.py" --nosafe_headers < /tmp/iwyu_ci.out
-    git diff -U1 | ./contrib/devtools/clang-format-diff.py -binary="clang-format-${TIDY_LLVM_V}" -p1 -i -v
+    git diff -U1 | ./contrib/devtools/clang-format-diff.py -binary="clang-format-${IWYU_LLVM_V}" -p1 -i -v
   }
 
   run_iwyu "compile_commands_iwyu_errors.json"
diff --git a/ci/test_imagefile b/ci/test_imagefile
index 93494cc1bbe7..908e9a0f5ab4 100644
--- a/ci/test_imagefile
+++ b/ci/test_imagefile
@@ -21,4 +21,4 @@ COPY ./ci/test/00_setup_env.sh ./${FILE_ENV} ./ci/test/01_base_install.sh ./ci/t
 # Bash is required, so install it when missing
 RUN sh -c "bash -c 'true' || ( apk update && apk add --no-cache bash )"
 
-RUN ["bash", "-c", "cd /ci_container_base/ && set -o errexit && source ./ci/test/00_setup_env.sh && ./ci/test/01_base_install.sh"]
+RUN ["bash", "-c", "cd /ci_container_base/ && set -o errexit && source ./ci/test/00_setup_env.sh && DANGER_RUN_CI_ON_HOST=1 ./ci/test/01_base_install.sh"]
diff --git a/cmake/leveldb.cmake b/cmake/leveldb.cmake
index e21190420ec8..cff8c61f96ca 100644
--- a/cmake/leveldb.cmake
+++ b/cmake/leveldb.cmake
@@ -87,6 +87,9 @@ else()
   try_append_cxx_flags("-Wconditional-uninitialized" TARGET nowarn_leveldb_interface SKIP_LINK
     IF_CHECK_PASSED "-Wno-conditional-uninitialized"
   )
+  try_append_cxx_flags("-Wcovered-switch-default" TARGET nowarn_leveldb_interface SKIP_LINK
+    IF_CHECK_PASSED "-Wno-covered-switch-default"
+  )
 endif()
 
 target_link_libraries(leveldb PRIVATE
diff --git a/contrib/completions/bash/bitcoin.bash b/contrib/completions/bash/bitcoin.bash
new file mode 100644
index 000000000000..a2ecae03e5ec
--- /dev/null
+++ b/contrib/completions/bash/bitcoin.bash
@@ -0,0 +1,100 @@
+# bash programmable completion for bitcoin(1) wrapper
+# Copyright (c) 2026-present The Bitcoin Core developers
+# Distributed under the MIT software license, see the accompanying
+# file COPYING or http://www.opensource.org/licenses/mit-license.php.
+
+# wrapper to delegate completion to the real function
+_bitcoin_wrap() {
+    local delegate="$1" shift_count="$2"
+    local func="_${delegate//-/_}"
+    local words cword dir file
+
+    # load completion script if function not yet defined
+    if ! declare -F $func >/dev/null; then
+        dir="$(cd "$(dirname "${BASH_SOURCE[0]}")" && pwd)"
+        file="$(grep -l -E "complete[[:space:]]+-F[[:space:]]+${func}" "$dir"/* 2>/dev/null | head -n1)"
+        [ -z "$file" ] && file="$(grep -l -E "^[[:space:]]*${func}[[:space:]]*\(\)" "$dir"/* 2>/dev/null | head -n1)"
+        [ -n "$file" ] && source "$file" || return 0
+    fi
+
+    _get_comp_words_by_ref -n = words cword
+
+    COMP_WORDS=( "$delegate" "${words[@]:$shift_count}" )
+    COMP_CWORD=$(( cword - (shift_count - 1) ))
+    COMP_LINE="${COMP_WORDS[@]}"
+    COMP_POINT=${#COMP_LINE}
+    $func "$delegate"
+}
+
+_bitcoin() {
+    local cur prev words cword
+    local bitcoin subcmd offset
+
+    # save and use original argument to invoke bitcoin for help
+    # it might not be in $PATH
+    bitcoin="$1"
+
+    COMPREPLY=()
+    _get_comp_words_by_ref -n = cur prev words cword
+
+    case "${words[1]}" in
+        -m|-M|--multiprocess|--monolithic)
+            subcmd="${words[2]}"
+            offset=3
+            ;;
+        *)
+            subcmd="${words[1]}"
+            offset=2
+            ;;
+    esac
+
+    case "$subcmd" in
+        gui|node)
+            _bitcoin_wrap bitcoind "$offset"
+            return 0
+            ;;
+        rpc)
+            _bitcoin_wrap bitcoin-cli "$offset"
+            return 0
+            ;;
+        tx)
+            _bitcoin_wrap bitcoin-tx "$offset"
+            return 0
+            ;;
+    esac
+
+    case "$cur" in
+        -*=*)   # prevent nonsense completions
+            return 0
+            ;;
+        *)
+            local options commands
+
+            # only parse help if sensible
+            if [[ -z "$cur" || "$cur" =~ ^- ]]; then
+                options=$($bitcoin help 2>&1 | awk '{ for(i=1;i<=NF;i++) if ($i~/^--/) { sub(/=.*/, "=",$i); print $i } }' )
+            fi
+            if [[ -z "$cur" || "$cur" =~ ^[a-z] ]]; then
+                commands=$($bitcoin help 2>/dev/null | awk '$1 ~ /^[a-z]/ { print $1; }')
+            fi
+
+            COMPREPLY=( $( compgen -W "$options $commands" -- "$cur" ) )
+
+            # Prevent space if an argument is desired
+            if [[ $COMPREPLY == *= ]]; then
+                compopt -o nospace
+            fi
+            return 0
+            ;;
+    esac
+
+} &&
+complete -F _bitcoin bitcoin
+
+# Local variables:
+# mode: shell-script
+# sh-basic-offset: 4
+# sh-indent-comment: t
+# indent-tabs-mode: nil
+# End:
+# ex: ts=4 sw=4 et filetype=sh
diff --git a/contrib/devtools/iwyu/bitcoin.core.imp b/contrib/devtools/iwyu/bitcoin.core.imp
index 960cb05d85a1..9b471cb82f23 100644
--- a/contrib/devtools/iwyu/bitcoin.core.imp
+++ b/contrib/devtools/iwyu/bitcoin.core.imp
@@ -2,17 +2,7 @@
   # Compiler intrinsics.
   # See: https://github.com/include-what-you-use/include-what-you-use/issues/1764.
   { "include": [ "<emmintrin.h>", "private", "<immintrin.h>", "public" ] },
+  { "include": [ "<mmintrin.h>", "private", "<immintrin.h>", "public" ] },
   { "include": [ "<smmintrin.h>", "private", "<immintrin.h>", "public" ] },
   { "include": [ "<tmmintrin.h>", "private", "<immintrin.h>", "public" ] },
-
-  # libc symbols.
-  # See: https://github.com/include-what-you-use/include-what-you-use/issues/1809.
-  { "symbol": ["AT_HWCAP", "private", "<sys/auxv.h>", "public"] },
-  { "symbol": ["AT_HWCAP2", "private", "<sys/auxv.h>", "public"] },
-
-  # Workarounds for IWYU issues.
-  # See: https://github.com/include-what-you-use/include-what-you-use/issues/1616.
-  { "symbol": ["std::pair", "private", "<utility>", "public"] },
-  # See: https://github.com/include-what-you-use/include-what-you-use/issues/1863.
-  { "symbol": ["std::vector", "private", "<vector>", "public"] },
 ]
diff --git a/contrib/guix/INSTALL.md b/contrib/guix/INSTALL.md
index a157acb4b75c..f6f286c03cbf 100644
--- a/contrib/guix/INSTALL.md
+++ b/contrib/guix/INSTALL.md
@@ -761,6 +761,21 @@ Please see the following links for more details:
 - A commit to skip this test is included since Guix 1.4.0:
 [codeberg/guix@6ba1058](https://codeberg.org/guix/guix/commit/6ba1058df0c4ce5611c2367531ae5c3cdc729ab4)
 
+## zdiff3
+
+[Currently](https://issues.guix.gnu.org/72942) `guix` builds may fail if the
+global git config has `merge.conflictstyle` set to `zdiff3` as follows:
+
+```
+Updating channel 'guix' from Git repository at 'https://codeberg.org/guix/guix.git'...
+guix time-machine: error: Git error: unknown style 'zdiff3' given for 'merge.conflictstyle'
+```
+
+This can be fixed by setting `merge.conflictstyle` to `diff3`:
+
+```bash
+git config --global merge.conflictstyle diff3
+```
 
 [install-script]: #options-1-and-2-using-the-official-shell-installer-script-or-binary-tarball
 [install-bin-tarball]: #options-1-and-2-using-the-official-shell-installer-script-or-binary-tarball
@@ -782,7 +797,9 @@ an irreversible way, you may want to completely purge Guix from your system and
 start over.
 
 1. Uninstall Guix itself according to the way you installed it (e.g. `sudo apt
-   purge guix` for Ubuntu packaging, `sudo make uninstall` for a build from source).
+   purge guix` for Ubuntu packaging, `sudo make uninstall` for a build from
+   source, or running the GUIX [install script][install-script] with the
+   `--uninstall` [flag](https://guix.gnu.org/manual/devel/en/guix.html#index-uninstalling-Guix)).
 2. Remove all build users and groups
 
    You may check for relevant users and groups using:
diff --git a/contrib/guix/guix-build b/contrib/guix/guix-build
index ee285bf322cf..bef1c8412a7b 100755
--- a/contrib/guix/guix-build
+++ b/contrib/guix/guix-build
@@ -383,6 +383,8 @@ EOF
         #     Running in an isolated container minimizes build-time differences
         #     between machines and improves reproducibility
         #
+        #   --writable-root    make the root filesystem writable
+        #
         #   --pure             unset existing environment variables
         #
         #     Same rationale as --container
@@ -441,6 +443,7 @@ EOF
         # shellcheck disable=SC2086,SC2031
         time-machine shell --manifest="${PWD}/contrib/guix/manifest.scm" \
                                  --container \
+                                 --writable-root \
                                  --pure \
                                  --no-cwd \
                                  --share="$PWD"=/bitcoin \
diff --git a/contrib/guix/guix-clean b/contrib/guix/guix-clean
index 9af0a793cff7..32258cd7477e 100755
--- a/contrib/guix/guix-clean
+++ b/contrib/guix/guix-clean
@@ -9,6 +9,14 @@ set -e -o pipefail
 # shellcheck source=libexec/prelude.bash
 source "$(dirname "${BASH_SOURCE[0]}")/libexec/prelude.bash"
 
+# Parse supported args
+FORCE=0
+if [[ $* == "--force" ]]; then
+    FORCE=1
+elif [ $# != 0 ]; then
+    echo "Script only takes optional --force arg."
+    exit 1
+fi
 
 ###################
 ## Sanity Checks ##
@@ -80,4 +88,14 @@ for precious_dirs_file in "${found_precious_dirs_files[@]}"; do
     done < "$precious_dirs_file"
 done
 
+if [[ $FORCE == 0 ]]; then
+    git clean -nxdff "${exclude_flags[@]}"
+
+    read -p "Proceed? (y/n) " -r
+    if [[ ! $REPLY =~ ^[Yy]$ ]]; then
+        echo "Aborted."
+        exit 1
+    fi
+fi
+
 git clean -xdff "${exclude_flags[@]}"
diff --git a/contrib/guix/guix-codesign b/contrib/guix/guix-codesign
index 791b75c540bc..39291dfe9ceb 100755
--- a/contrib/guix/guix-codesign
+++ b/contrib/guix/guix-codesign
@@ -299,6 +299,8 @@ EOF
         #     Running in an isolated container minimizes build-time differences
         #     between machines and improves reproducibility
         #
+        #   --writable-root    make the root filesystem writable
+        #
         #   --pure             unset existing environment variables
         #
         #     Same rationale as --container
@@ -341,6 +343,7 @@ EOF
         # shellcheck disable=SC2086,SC2031
         time-machine shell --manifest="${PWD}/contrib/guix/manifest.scm" \
                                  --container \
+                                 --writable-root \
                                  --pure \
                                  --no-cwd \
                                  --share="$PWD"=/bitcoin \
diff --git a/contrib/guix/libexec/build.sh b/contrib/guix/libexec/build.sh
index 072e5b91ba61..51354273efae 100755
--- a/contrib/guix/libexec/build.sh
+++ b/contrib/guix/libexec/build.sh
@@ -6,7 +6,7 @@ export LC_ALL=C
 set -e -o pipefail
 
 # Environment variables for determinism
-export TAR_OPTIONS="--owner=0 --group=0 --numeric-owner --mtime='@${SOURCE_DATE_EPOCH}' --sort=name"
+export TAR_OPTIONS="--no-same-owner --owner=0 --group=0 --numeric-owner --mtime='@${SOURCE_DATE_EPOCH}' --sort=name"
 export TZ=UTC
 
 # Although Guix _does_ set umask when building its own packages (in our case,
@@ -272,10 +272,6 @@ mkdir -p "$DISTSRC"
     # Install built Bitcoin Core to $INSTALLPATH
     case "$HOST" in
         *darwin*)
-            # This workaround can be dropped for CMake >= 3.27.
-            # See the upstream commit 689616785f76acd844fd448c51c5b2a0711aafa2.
-            find build -name 'cmake_install.cmake' -exec sed -i 's| -u -r | |g' {} +
-
             cmake --install build --strip --prefix "${INSTALLPATH}" ${V:+--verbose}
             ;;
         *)
@@ -309,6 +305,7 @@ mkdir -p "$DISTSRC"
                 ;;
             *linux*)
                 cp "${DISTSRC}/README.md" "${DISTNAME}/"
+                cp "${DISTSRC}/doc/INSTALL_linux.md" "${DISTNAME}/INSTALL.md"
                 ;;
         esac
 
diff --git a/contrib/guix/libexec/prelude.bash b/contrib/guix/libexec/prelude.bash
index b7c13cc91d8c..166675e8bf09 100644
--- a/contrib/guix/libexec/prelude.bash
+++ b/contrib/guix/libexec/prelude.bash
@@ -71,7 +71,7 @@ fi
 time-machine() {
     # shellcheck disable=SC2086
     guix time-machine --url=https://codeberg.org/guix/guix.git \
-                      --commit=5cb84f2013c5b1e48a7d0e617032266f1e6059e2 \
+                      --commit=c5eee3336cc1d10a3cc1c97fde2809c3451624d3 \
                       --cores="$JOBS" \
                       --keep-failed \
                       --fallback \
diff --git a/contrib/guix/manifest.scm b/contrib/guix/manifest.scm
index 9cadd410537c..4fd901e57a5c 100644
--- a/contrib/guix/manifest.scm
+++ b/contrib/guix/manifest.scm
@@ -1,12 +1,11 @@
 (use-modules (gnu packages)
              ((gnu packages bash) #:select (bash-minimal))
              (gnu packages bison)
-             ((gnu packages certs) #:select (nss-certs))
-             ((gnu packages check) #:select (libfaketime))
              ((gnu packages cmake) #:select (cmake-minimal))
              (gnu packages commencement)
              (gnu packages compression)
              (gnu packages cross-base)
+             ((gnu packages crypto) #:select (osslsigncode))
              (gnu packages gawk)
              (gnu packages gcc)
              ((gnu packages installers) #:select (nsis-x86_64))
@@ -17,13 +16,10 @@
              (gnu packages pkg-config)
              ((gnu packages python) #:select (python-minimal))
              ((gnu packages python-build) #:select (python-poetry-core))
-             ((gnu packages python-crypto) #:select (python-asn1crypto))
-             ((gnu packages python-science) #:select (python-scikit-build-core))
-             ((gnu packages python-xyz) #:select (python-pydantic-2))
+             ((gnu packages python-crypto) #:select (python-asn1crypto python-oscrypto))
+             ((gnu packages python-xyz) #:select (python-lief))
              ((gnu packages tls) #:select (openssl))
              ((gnu packages version-control) #:select (git-minimal))
-             (guix build-system cmake)
-             (guix build-system gnu)
              (guix build-system python)
              (guix build-system pyproject)
              (guix build-system trivial)
@@ -32,7 +28,7 @@
              (guix git-download)
              ((guix licenses) #:prefix license:)
              (guix packages)
-             ((guix utils) #:select (cc-for-target substitute-keyword-arguments)))
+             ((guix utils) #:select (substitute-keyword-arguments)))
 
 (define-syntax-rule (search-our-patches file-name ...)
   "Return the list of absolute file names corresponding to each
@@ -43,13 +39,36 @@ FILE-NAME found in ./patches relative to the current file."
 
 (define building-on (string-append "--build=" (list-ref (string-split (%current-system) #\-) 0) "-guix-linux-gnu"))
 
+(define (base-binutils target)
+  (package
+    (inherit (cross-binutils target)) ;; 2.44
+    (version "2.46.0")
+    (source (origin
+              (method url-fetch)
+              (uri (string-append "mirror://gnu/binutils/binutils-"
+                          version ".tar.bz2"))
+              (sha256
+               (base32
+                "04nd9vl7c1pxjbc9wh3ckddzhz5g82xyjqq9y9kf171a59im4c8g"))))
+    (arguments
+      (substitute-keyword-arguments (package-arguments (cross-binutils target))
+        ((#:configure-flags flags)
+          #~(append #$flags
+            (list "--enable-gprofng=no")))))
+    (native-inputs
+      (modify-inputs
+        (package-native-inputs (cross-binutils target))
+        (delete "bison")))
+  )
+)
+
 (define (make-cross-toolchain target
                               base-gcc-for-libc
                               base-kernel-headers
                               base-libc
                               base-gcc)
   "Create a cross-compilation toolchain package for TARGET"
-  (let* ((xbinutils (cross-binutils target))
+  (let* ((xbinutils (base-binutils target))
          ;; 1. Build a cross-compiling gcc without targeting any libc, derived
          ;; from BASE-GCC-FOR-LIBC
          (xgcc-sans-libc (cross-gcc target
@@ -95,25 +114,17 @@ chain for " target " development."))
       (license (package-license xgcc)))))
 
 (define base-gcc
-  (package
-    (inherit gcc-14) ;; 14.2.0
-    (version "14.3.0")
-    (source (origin
-              (method url-fetch)
-              (uri (string-append "mirror://gnu/gcc/gcc-"
-                                  version "/gcc-" version ".tar.xz"))
-              (sha256
-               (base32
-                "0fna78ly417g69fdm4i5f3ms96g8xzzjza8gwp41lqr5fqlpgp70"))))))
+  (package-with-extra-patches gcc-14
+    (search-our-patches "gcc-remap-guix-store.patch" "gcc-ssa-generation.patch")))
 
 (define base-linux-kernel-headers linux-libre-headers-6.1)
 
 (define* (make-bitcoin-cross-toolchain target
                                        #:key
-                                       (base-gcc-for-libc (gcc-libgcc-patches linux-base-gcc))
+                                       (base-gcc-for-libc linux-base-gcc)
                                        (base-kernel-headers base-linux-kernel-headers)
                                        (base-libc glibc-2.31)
-                                       (base-gcc (gcc-libgcc-patches linux-base-gcc)))
+                                       (base-gcc linux-base-gcc))
   "Convenience wrapper around MAKE-CROSS-TOOLCHAIN with default values
 desirable for building Bitcoin Core release binaries."
   (make-cross-toolchain target
@@ -122,10 +133,6 @@ desirable for building Bitcoin Core release binaries."
                         base-libc
                         base-gcc))
 
-(define (gcc-libgcc-patches gcc)
-  (package-with-extra-patches gcc
-    (search-our-patches "gcc-remap-guix-store.patch" "gcc-ssa-generation.patch")))
-
 (define (binutils-mingw-patches binutils)
   (package-with-extra-patches binutils
     (search-our-patches "binutils-unaligned-default.patch")))
@@ -136,13 +143,13 @@ desirable for building Bitcoin Core release binaries."
 
 (define (make-mingw-pthreads-cross-toolchain target)
   "Create a cross-compilation toolchain package for TARGET"
-  (let* ((xbinutils (binutils-mingw-patches (cross-binutils target)))
+  (let* ((xbinutils (binutils-mingw-patches (base-binutils target)))
          (machine (substring target 0 (string-index target #\-)))
          (pthreads-xlibc (winpthreads-patches (make-mingw-w64 machine
-                                         #:xgcc (cross-gcc target #:xgcc (gcc-libgcc-patches base-gcc))
+                                         #:xgcc (cross-gcc target #:xgcc base-gcc)
                                          #:with-winpthreads? #t)))
          (pthreads-xgcc (cross-gcc target
-                                    #:xgcc (gcc-libgcc-patches mingw-w64-base-gcc)
+                                    #:xgcc mingw-w64-base-gcc
                                     #:xbinutils xbinutils
                                     #:libc pthreads-xlibc)))
     ;; Define a meta-package that propagates the resulting XBINUTILS, XLIBC, and
@@ -164,80 +171,6 @@ chain for " target " development."))
       (home-page (package-home-page pthreads-xgcc))
       (license (package-license pthreads-xgcc)))))
 
-;; While LIEF is packaged in Guix, we maintain our own package,
-;; to simplify building, and more easily apply updates.
-;; Moreover, the Guix's package uses cmake, which caused build
-;; failure; see https://github.com/bitcoin/bitcoin/pull/27296.
-(define-public python-lief
-  (package
-    (name "python-lief")
-    (version "0.16.6")
-    (source (origin
-              (method git-fetch)
-              (uri (git-reference
-                    (url "https://github.com/lief-project/LIEF")
-                    (commit version)))
-              (file-name (git-file-name name version))
-              (sha256
-               (base32
-                "1pq9nagrnkl1x943bqnpiyxmkd9vk99znfxiwqp6vf012b50bz2a"))
-              (patches (search-our-patches "lief-scikit-0-9.patch"))))
-    (build-system pyproject-build-system)
-    (native-inputs (list cmake-minimal
-                         ninja
-                         python-scikit-build-core
-                         python-pydantic-2))
-    (arguments
-     (list
-      #:tests? #f                  ;needs network
-      #:phases #~(modify-phases %standard-phases
-                   (add-before 'build 'set-pythonpath
-                     (lambda _
-                       (setenv "PYTHONPATH"
-                         (string-append (string-append (getcwd) "/api/python/backend")
-                                      ":" (or (getenv "PYTHONPATH") "")))))
-                  (add-after 'set-pythonpath 'change-directory
-                     (lambda _
-                       (chdir "api/python"))))))
-    (home-page "https://github.com/lief-project/LIEF")
-    (synopsis "Library to instrument executable formats")
-    (description
-     "@code{python-lief} is a cross platform library which can parse, modify
-and abstract ELF, PE and MachO formats.")
-    (license license:asl2.0)))
-
-(define osslsigncode
-  (package
-    (name "osslsigncode")
-    (version "2.5")
-    (source (origin
-              (method git-fetch)
-              (uri (git-reference
-                    (url "https://github.com/mtrojnar/osslsigncode")
-                    (commit version)))
-              (sha256
-               (base32
-                "1j47vwq4caxfv0xw68kw5yh00qcpbd56d7rq6c483ma3y7s96yyz"))))
-    (build-system cmake-build-system)
-    (arguments
-     (list
-      #:phases
-      #~(modify-phases %standard-phases
-          (replace 'check
-            (lambda* (#:key tests? #:allow-other-keys)
-              (if tests?
-                  (invoke "faketime" "-f" "@2025-01-01 00:00:00" ;; Tests fail after 2025.
-                          "ctest" "--output-on-failure" "--no-tests=error")
-                  (format #t "test suite not run~%")))))))
-    (inputs (list libfaketime openssl))
-    (home-page "https://github.com/mtrojnar/osslsigncode")
-    (synopsis "Authenticode signing and timestamping tool")
-    (description "osslsigncode is a small tool that implements part of the
-functionality of the Microsoft tool signtool.exe - more exactly the Authenticode
-signing and timestamping. But osslsigncode is based on OpenSSL and cURL, and
-thus should be able to compile on most platforms where these exist.")
-    (license license:gpl3+))) ; license is with openssl exception
-
 (define-public python-elfesteem
   (let ((commit "2eb1e5384ff7a220fd1afacd4a0170acff54fe56"))
     (package
@@ -262,64 +195,6 @@ thus should be able to compile on most platforms where these exist.")
       (description "elfesteem parses ELF, PE and Mach-O files.")
       (license license:lgpl2.1))))
 
-(define-public python-oscrypto
-  (package
-    (name "python-oscrypto")
-    (version "1.3.0")
-    (source
-     (origin
-       (method git-fetch)
-       (uri (git-reference
-             (url "https://github.com/wbond/oscrypto")
-             (commit version)))
-       (file-name (git-file-name name version))
-       (sha256
-        (base32
-         "1v5wkmzcyiqy39db8j2dvkdrv2nlsc48556h73x4dzjwd6kg4q0a"))
-       (patches (search-our-patches "oscrypto-hard-code-openssl.patch"))))
-    (build-system python-build-system)
-    (native-search-paths
-     (list (search-path-specification
-            (variable "SSL_CERT_FILE")
-            (file-type 'regular)
-            (separator #f)                ;single entry
-            (files '("etc/ssl/certs/ca-certificates.crt")))))
-
-    (propagated-inputs
-      (list python-asn1crypto openssl))
-    (arguments
-     `(#:phases
-       (modify-phases %standard-phases
-         (add-after 'unpack 'hard-code-path-to-libscrypt
-           (lambda* (#:key inputs #:allow-other-keys)
-             (let ((openssl (assoc-ref inputs "openssl")))
-               (substitute* "oscrypto/__init__.py"
-                 (("@GUIX_OSCRYPTO_USE_OPENSSL@")
-                  (string-append openssl "/lib/libcrypto.so" "," openssl "/lib/libssl.so")))
-               #t)))
-         (add-after 'unpack 'disable-broken-tests
-           (lambda _
-             ;; This test is broken as there is no keyboard interrupt.
-             (substitute* "tests/test_trust_list.py"
-               (("^(.*)class TrustListTests" line indent)
-                (string-append indent
-                               "@unittest.skip(\"Disabled by Guix\")\n"
-                               line)))
-             (substitute* "tests/test_tls.py"
-               (("^(.*)class TLSTests" line indent)
-                (string-append indent
-                               "@unittest.skip(\"Disabled by Guix\")\n"
-                               line)))
-             #t))
-         (replace 'check
-           (lambda _
-             (invoke "python" "run.py" "tests")
-             #t)))))
-    (home-page "https://github.com/wbond/oscrypto")
-    (synopsis "Compiler-free Python crypto library backed by the OS")
-    (description "oscrypto is a compilation-free, always up-to-date encryption library for Python.")
-    (license license:expat)))
-
 (define-public python-oscryptotests
   (package (inherit python-oscrypto)
     (name "python-oscryptotests")
@@ -351,7 +226,8 @@ thus should be able to compile on most platforms where these exist.")
            "1qw2k7xis53179lpqdqyylbcmp76lj7sagp883wmxg5i7chhc96k"))))
       (build-system python-build-system)
       (propagated-inputs
-        (list python-asn1crypto
+        (list openssl
+              python-asn1crypto
               python-oscrypto
               python-oscryptotests)) ;; certvalidator tests import oscryptotests
       (arguments
@@ -480,7 +356,7 @@ inspecting signatures in Mach-O binaries.")
                #t))))))))
 
 (define-public glibc-2.31
-  (let ((commit "7b27c450c34563a28e634cccb399cd415e71ebfe"))
+  (let ((commit "28eb5caf895ced5d895cb02757e109004a2d33e5"))
   (package
     (inherit glibc) ;; 2.39
     (version "2.31")
@@ -492,7 +368,7 @@ inspecting signatures in Mach-O binaries.")
               (file-name (git-file-name "glibc" commit))
               (sha256
                (base32
-                "017qdpr5id7ddb4lpkzj2li1abvw916m3fc6n7nw28z4h5qbv2n0"))
+                "07arjrc1smqy8wrhg38apr1s9ji7xv1rpzdapk4k2ps2n07irp58"))
               (patches (search-our-patches "glibc-guix-prefix.patch"
                                            "glibc-riscv-jumptarget.patch"))))
     (arguments
@@ -545,7 +421,7 @@ inspecting signatures in Mach-O binaries.")
         gnu-make
         ninja
         ;; Scripting
-        python-minimal ;; (3.10)
+        python-minimal ;; (3.11)
         ;; Git
         git-minimal
         ;; Tests
@@ -555,7 +431,6 @@ inspecting signatures in Mach-O binaries.")
            (list zip
                  (make-mingw-pthreads-cross-toolchain "x86_64-w64-mingw32")
                  nsis-x86_64
-                 nss-certs
                  osslsigncode))
           ((string-contains target "-linux-")
            (list bison
diff --git a/contrib/guix/patches/gcc-ssa-generation.patch b/contrib/guix/patches/gcc-ssa-generation.patch
index 2e5a600230ec..7054fbf3d0b4 100644
--- a/contrib/guix/patches/gcc-ssa-generation.patch
+++ b/contrib/guix/patches/gcc-ssa-generation.patch
@@ -1,3 +1,8 @@
+This patch can be removed when using GCC 14.4, 15.3 or 16.x.
+14.x: https://github.com/gcc-mirror/gcc/commit/2d7099faa5c59b871e3027268d70a8a46d892824
+15.x: https://github.com/gcc-mirror/gcc/commit/7debee2cb6503b2af0f1d43b0e56b759474396d5
+16.x: https://github.com/gcc-mirror/gcc/commit/c6085ca0ed4cef3bcf4eb382cb71e44219c10f6e
+
 commit b46614ebfc57ccca8a050668ad0e8ba5968c5943
 Author: Jakub Jelinek <jakub@redhat.com>
 Date:   Tue Jan 6 08:36:20 2026 +0100
diff --git a/contrib/guix/patches/lief-scikit-0-9.patch b/contrib/guix/patches/lief-scikit-0-9.patch
deleted file mode 100644
index 71e617834f07..000000000000
--- a/contrib/guix/patches/lief-scikit-0-9.patch
+++ /dev/null
@@ -1,21 +0,0 @@
-Partially revert f23ced2f4ffc170d0a6f40ff4a1bee575e3447cf
-
-Restore compat with python-scikit-build-core 0.9.x
-Can be dropped when using python-scikit-build-core >= 0.10.x
-
---- a/api/python/backend/setup.py
-+++ b/api/python/backend/setup.py
-@@ -101,12 +101,12 @@ def _get_hooked_config(is_editable: bool) -> Optional[dict[str, Union[str, List[
-     config_settings = {
-         "logging.level": "DEBUG",
-         "build-dir": config.build_dir,
--        "build.targets": config.build.targets,
-         "install.strip": config.strip,
-         "backport.find-python": "0",
-         "wheel.py-api":  config.build.py_api,
-         "cmake.source-dir": SRC_DIR.as_posix(),
-         "cmake.build-type": config.build.build_type,
-+        "cmake.targets": config.build.targets,
-         "cmake.args": [
-             *config.cmake_generator,
-             *config.get_cmake_args(is_editable),
diff --git a/contrib/guix/patches/oscrypto-hard-code-openssl.patch b/contrib/guix/patches/oscrypto-hard-code-openssl.patch
deleted file mode 100644
index 32027f2d09af..000000000000
--- a/contrib/guix/patches/oscrypto-hard-code-openssl.patch
+++ /dev/null
@@ -1,13 +0,0 @@
-diff --git a/oscrypto/__init__.py b/oscrypto/__init__.py
-index eb27313..371ab24 100644
---- a/oscrypto/__init__.py
-+++ b/oscrypto/__init__.py
-@@ -302,3 +302,8 @@ def load_order():
-         'oscrypto._win.tls',
-         'oscrypto.tls',
-     ]
-+
-+
-+paths = '@GUIX_OSCRYPTO_USE_OPENSSL@'.split(',')
-+assert len(paths) == 2, 'Value for OSCRYPTO_USE_OPENSSL env var must be two paths separated by a comma'
-+use_openssl(*paths)
diff --git a/contrib/guix/patches/winpthreads-remap-guix-store.patch b/contrib/guix/patches/winpthreads-remap-guix-store.patch
index e1f1a6eba531..4530e5f3eea0 100644
--- a/contrib/guix/patches/winpthreads-remap-guix-store.patch
+++ b/contrib/guix/patches/winpthreads-remap-guix-store.patch
@@ -6,12 +6,12 @@ the package, map all guix store prefixes to something fixed, e.g. /usr.
 
 --- a/mingw-w64-libraries/winpthreads/Makefile.in
 +++ b/mingw-w64-libraries/winpthreads/Makefile.in
-@@ -478,7 +478,7 @@ top_build_prefix = @top_build_prefix@
+@@ -465,7 +465,7 @@ top_build_prefix = @top_build_prefix@
  top_builddir = @top_builddir@
  top_srcdir = @top_srcdir@
  SUBDIRS = . tests
--AM_CFLAGS = -Wall -DWIN32_LEAN_AND_MEAN $(am__append_1)
-+AM_CFLAGS = -Wall -DWIN32_LEAN_AND_MEAN $(am__append_1) $(shell find /gnu/store -maxdepth 1 -mindepth 1 -type d -exec echo -n " -ffile-prefix-map={}=/usr" \;)
+-AM_CFLAGS = $(am__append_1) $(am__append_3)
++AM_CFLAGS = $(am__append_1) $(am__append_3) $(shell find /gnu/store -maxdepth 1 -mindepth 1 -type d -exec echo -n " -ffile-prefix-map={}=/usr" \;)
  ACLOCAL_AMFLAGS = -I m4
  lib_LTLIBRARIES = libwinpthread.la
- include_HEADERS = include/pthread.h include/sched.h include/semaphore.h include/pthread_unistd.h include/pthread_time.h include/pthread_compat.h include/pthread_signal.h
+ include_HEADERS = \
diff --git a/contrib/guix/symbol-check.py b/contrib/guix/symbol-check.py
index 93002ddce798..86b7965277c9 100755
--- a/contrib/guix/symbol-check.py
+++ b/contrib/guix/symbol-check.py
@@ -202,7 +202,7 @@ def check_exported_symbols(binary) -> bool:
         if not symbol.exported:
             continue
         name = symbol.name
-        if binary.header.machine_type == lief.ELF.ARCH.RISCV or name in IGNORE_EXPORTS:
+        if name in IGNORE_EXPORTS:
             continue
         print(f'{filename}: export of symbol {name} not allowed!')
         ok = False
@@ -241,7 +241,7 @@ def check_MACHO_sdk(binary) -> bool:
     return False
 
 def check_MACHO_lld(binary) -> bool:
-    if binary.build_version.tools[0].version == [19, 1, 4]:
+    if binary.build_version.tools[0].version == [19, 1, 7]:
         return True
     return False
 
diff --git a/contrib/init/bitcoind.openrc b/contrib/init/bitcoind.openrc
index 013a1a607027..30e7be36fcf4 100644
--- a/contrib/init/bitcoind.openrc
+++ b/contrib/init/bitcoind.openrc
@@ -1,6 +1,6 @@
 #!/sbin/openrc-run
 
-# backward compatibility for existing gentoo layout 
+# backward compatibility for existing gentoo layout
 #
 if [ -d "/var/lib/bitcoin/.bitcoin" ]; then
 	BITCOIND_DEFAULT_DATADIR="/var/lib/bitcoin/.bitcoin"
diff --git a/contrib/macdeploy/macdeployqtplus b/contrib/macdeploy/macdeployqtplus
index 476ac133ebf4..c8244af1532f 100755
--- a/contrib/macdeploy/macdeployqtplus
+++ b/contrib/macdeploy/macdeployqtplus
@@ -42,13 +42,13 @@ class FrameworkInfo(object):
         self.sourceContentsDirectory = ""
         self.destinationResourcesDirectory = ""
         self.destinationVersionContentsDirectory = ""
-    
+
     def __eq__(self, other):
         if self.__class__ == other.__class__:
             return self.__dict__ == other.__dict__
         else:
             return False
-    
+
     def __str__(self):
         return f""" Framework name: {self.frameworkName}
  Framework directory: {self.frameworkDirectory}
@@ -62,51 +62,51 @@ class FrameworkInfo(object):
  Source file Path: {self.sourceFilePath}
  Deployed Directory (relative to bundle): {self.destinationDirectory}
 """
-    
+
     def isDylib(self):
         return self.frameworkName.endswith(".dylib")
-    
+
     def isQtFramework(self):
         if self.isDylib():
             return self.frameworkName.startswith("libQt")
         else:
             return self.frameworkName.startswith("Qt")
-    
+
     reOLine = re.compile(r'^(.+) \(compatibility version [0-9.]+, current version [0-9.]+\)$')
     bundleFrameworkDirectory = "Contents/Frameworks"
     bundleBinaryDirectory = "Contents/MacOS"
-    
+
     @classmethod
     def fromLibraryLine(cls, line: str) -> Optional['FrameworkInfo']:
         # Note: line must be trimmed
         if line == "":
             return None
-        
+
         # Don't deploy system libraries
         if line.startswith("/System/Library/") or line.startswith("@executable_path") or line.startswith("/usr/lib/"):
             return None
-        
+
         m = cls.reOLine.match(line)
         if m is None:
             raise RuntimeError(f"Line could not be parsed: {line}")
-        
+
         path = m.group(1)
-        
+
         info = cls()
         info.sourceFilePath = path
         info.installName = path
-        
+
         if path.endswith(".dylib"):
             dirname, filename = os.path.split(path)
             info.frameworkName = filename
             info.frameworkDirectory = dirname
             info.frameworkPath = path
-            
+
             info.binaryDirectory = dirname
             info.binaryName = filename
             info.binaryPath = path
             info.version = "-"
-            
+
             info.installName = path
             info.deployedInstallName = f"@executable_path/../Frameworks/{info.binaryName}"
             info.sourceFilePath = path
@@ -121,25 +121,25 @@ class FrameworkInfo(object):
                 i += 1
             if i == len(parts):
                 raise RuntimeError(f"Could not find .framework or .dylib in line: {line}")
-            
+
             info.frameworkName = parts[i]
             info.frameworkDirectory = "/".join(parts[:i])
             info.frameworkPath = os.path.join(info.frameworkDirectory, info.frameworkName)
-            
+
             info.binaryName = parts[i+3]
             info.binaryDirectory = "/".join(parts[i+1:i+3])
             info.binaryPath = os.path.join(info.binaryDirectory, info.binaryName)
             info.version = parts[i+2]
-            
+
             info.deployedInstallName = f"@executable_path/../Frameworks/{os.path.join(info.frameworkName, info.binaryPath)}"
             info.destinationDirectory = os.path.join(cls.bundleFrameworkDirectory, info.frameworkName, info.binaryDirectory)
-            
+
             info.sourceResourcesDirectory = os.path.join(info.frameworkPath, "Resources")
             info.sourceContentsDirectory = os.path.join(info.frameworkPath, "Contents")
             info.sourceVersionContentsDirectory = os.path.join(info.frameworkPath, "Versions", info.version, "Contents")
             info.destinationResourcesDirectory = os.path.join(cls.bundleFrameworkDirectory, info.frameworkName, "Resources")
             info.destinationVersionContentsDirectory = os.path.join(cls.bundleFrameworkDirectory, info.frameworkName, "Versions", info.version, "Contents")
-        
+
         return info
 
 class ApplicationBundleInfo(object):
@@ -160,7 +160,7 @@ class DeploymentInfo(object):
 
     def detectQtPath(self, frameworkDirectory: str):
         parentDir = os.path.dirname(frameworkDirectory)
-        if os.path.exists(os.path.join(parentDir, "share", "qt", "translations")):
+        if os.path.exists(os.path.join(parentDir, "share", "qt", "plugins")):
             self.qtPath = parentDir
         else:
             self.qtPath = os.getenv("QTDIR", None)
@@ -289,45 +289,45 @@ def copyFramework(framework: FrameworkInfo, path: str, verbose: int) -> Optional
 def deployFrameworks(frameworks: list[FrameworkInfo], bundlePath: str, binaryPath: str, strip: bool, verbose: int, deploymentInfo: Optional[DeploymentInfo] = None) -> DeploymentInfo:
     if deploymentInfo is None:
         deploymentInfo = DeploymentInfo()
-    
+
     while len(frameworks) > 0:
         framework = frameworks.pop(0)
         deploymentInfo.deployedFrameworks.append(framework.frameworkName)
-        
+
         print("Processing", framework.frameworkName, "...")
-        
+
         # Get the Qt path from one of the Qt frameworks
         if deploymentInfo.qtPath is None and framework.isQtFramework():
             deploymentInfo.detectQtPath(framework.frameworkDirectory)
-        
+
         if framework.installName.startswith("@executable_path") or framework.installName.startswith(bundlePath):
             print(framework.frameworkName, "already deployed, skipping.")
             continue
-        
+
         # install_name_tool the new id into the binary
         changeInstallName(framework.installName, framework.deployedInstallName, binaryPath, verbose)
-        
+
         # Copy framework to app bundle.
         deployedBinaryPath = copyFramework(framework, bundlePath, verbose)
         # Skip the rest if already was deployed.
         if deployedBinaryPath is None:
             continue
-        
+
         if strip:
             runStrip(deployedBinaryPath, verbose)
-        
+
         # install_name_tool it a new id.
         changeIdentification(framework.deployedInstallName, deployedBinaryPath, verbose)
         # Check for framework dependencies
         dependencies = getFrameworks(deployedBinaryPath, verbose, rpath=framework.frameworkDirectory)
-        
+
         for dependency in dependencies:
             changeInstallName(dependency.installName, dependency.deployedInstallName, deployedBinaryPath, verbose)
-            
+
             # Deploy framework if necessary.
             if dependency.frameworkName not in deploymentInfo.deployedFrameworks and dependency not in frameworks:
                 frameworks.append(dependency)
-    
+
     return deploymentInfo
 
 def deployFrameworksForAppBundle(applicationBundle: ApplicationBundleInfo, strip: bool, verbose: int) -> DeploymentInfo:
@@ -355,29 +355,29 @@ def deployPlugins(appBundleInfo: ApplicationBundleInfo, deploymentInfo: Deployme
                 continue
 
             plugins.append((pluginDirectory, pluginName))
-    
+
     for pluginDirectory, pluginName in plugins:
         print("Processing plugin", os.path.join(pluginDirectory, pluginName), "...")
-        
+
         sourcePath = os.path.join(deploymentInfo.pluginPath, pluginDirectory, pluginName)
         destinationDirectory = os.path.join(appBundleInfo.pluginPath, pluginDirectory)
         if not os.path.exists(destinationDirectory):
             os.makedirs(destinationDirectory)
-        
+
         destinationPath = os.path.join(destinationDirectory, pluginName)
         shutil.copy2(sourcePath, destinationPath)
         if verbose:
             print("Copied:", sourcePath)
             print(" to:", destinationPath)
-        
+
         if strip:
             runStrip(destinationPath, verbose)
-        
+
         dependencies = getFrameworks(destinationPath, verbose)
-        
+
         for dependency in dependencies:
             changeInstallName(dependency.installName, dependency.deployedInstallName, destinationPath, verbose)
-            
+
             # Deploy framework if necessary.
             if dependency.frameworkName not in deploymentInfo.deployedFrameworks:
                 deployFrameworks([dependency], appBundleInfo.path, destinationPath, strip, verbose, deploymentInfo)
@@ -446,7 +446,7 @@ except RuntimeError as e:
 
 if config.plugins:
     print("+ Deploying plugins +")
-    
+
     try:
         deployPlugins(applicationBundle, deploymentInfo, config.strip, verbose)
     except RuntimeError as e:
@@ -499,7 +499,7 @@ if config.zip is not None:
         print("+ Removing existing .zip +")
         os.unlink(name + ".zip")
 
-    shutil.make_archive('{}'.format(name), format='zip', root_dir='dist', base_dir='Bitcoin-Qt.app')
+    subprocess.check_call(["zip", "-ry", os.path.abspath(name + ".zip"), 'Bitcoin-Qt.app'], cwd='dist')
 
 # ------------------------------------------------
 
diff --git a/contrib/qos/tc.sh b/contrib/qos/tc.sh
index 2c48fc2a268f..4e4237084e1d 100755
--- a/contrib/qos/tc.sh
+++ b/contrib/qos/tc.sh
@@ -34,9 +34,9 @@ tc filter add dev ${IF} parent 1: protocol ip prio 1 handle 1 fw classid 1:10
 tc filter add dev ${IF} parent 1: protocol ip prio 2 handle 2 fw classid 1:11
 
 if [ -n "${LOCALNET_V6}" ] ; then
-	# v6 cannot have the same priority value as v4
-	tc filter add dev ${IF} parent 1: protocol ipv6 prio 3 handle 1 fw classid 1:10
-	tc filter add dev ${IF} parent 1: protocol ipv6 prio 4 handle 2 fw classid 1:11
+  # v6 cannot have the same priority value as v4
+  tc filter add dev ${IF} parent 1: protocol ipv6 prio 3 handle 1 fw classid 1:10
+  tc filter add dev ${IF} parent 1: protocol ipv6 prio 4 handle 2 fw classid 1:11
 fi
 
 #delete any existing rules
@@ -57,6 +57,6 @@ iptables -t mangle -A OUTPUT -p tcp -m tcp --dport 8333 ! -d ${LOCALNET_V4} -j M
 iptables -t mangle -A OUTPUT -p tcp -m tcp --sport 8333 ! -d ${LOCALNET_V4} -j MARK --set-mark 0x2
 
 if [ -n "${LOCALNET_V6}" ] ; then
-	ip6tables -t mangle -A OUTPUT -p tcp -m tcp --dport 8333 ! -d ${LOCALNET_V6} -j MARK --set-mark 0x4
-	ip6tables -t mangle -A OUTPUT -p tcp -m tcp --sport 8333 ! -d ${LOCALNET_V6} -j MARK --set-mark 0x4
+  ip6tables -t mangle -A OUTPUT -p tcp -m tcp --dport 8333 ! -d ${LOCALNET_V6} -j MARK --set-mark 0x4
+  ip6tables -t mangle -A OUTPUT -p tcp -m tcp --sport 8333 ! -d ${LOCALNET_V6} -j MARK --set-mark 0x4
 fi
diff --git a/contrib/verify-commits/gpg.sh b/contrib/verify-commits/gpg.sh
index 3579a70a699c..bcb117f19a05 100755
--- a/contrib/verify-commits/gpg.sh
+++ b/contrib/verify-commits/gpg.sh
@@ -9,27 +9,27 @@ if [ "$BITCOIN_VERIFY_COMMITS_ALLOW_SHA1" = 1 ]; then
     printf '%s\n' "$INPUT" | gpg --trust-model always "$@" 2>/dev/null
     exit $?
 else
-	# Note how we've disabled SHA1 with the --weak-digest option, disabling
-	# signatures - including selfsigs - that use SHA1. While you might think that
-	# collision attacks shouldn't be an issue as they'd be an attack on yourself,
-	# in fact because what's being signed is a commit object that's
-	# semi-deterministically generated by untrusted input (the pull-req) in theory
-	# an attacker could construct a pull-req that results in a commit object that
-	# they've created a collision for. Not the most likely attack, but preventing
-	# it is pretty easy so we do so as a "belt-and-suspenders" measure.
-	for LINE in $(gpg --version); do
-		case "$LINE" in
-			"gpg (GnuPG) 1.4.1"*|"gpg (GnuPG) 2.0."*)
-				echo "Please upgrade to at least gpg 2.1.10 to check for weak signatures" > /dev/stderr
-                                printf '%s\n' "$INPUT" | gpg --trust-model always "$@" 2>/dev/null
-                                exit $?
-				;;
-			# We assume if you're running 2.1+, you're probably running 2.1.10+
-			# gpg will fail otherwise
-			# We assume if you're running 1.X, it is either 1.4.1X or 1.4.20+
-			# gpg will fail otherwise
-		esac
-	done
-        printf '%s\n' "$INPUT" | gpg --trust-model always --weak-digest sha1 "$@" 2>/dev/null
-        exit $?
+    # Note how we've disabled SHA1 with the --weak-digest option, disabling
+    # signatures - including selfsigs - that use SHA1. While you might think that
+    # collision attacks shouldn't be an issue as they'd be an attack on yourself,
+    # in fact because what's being signed is a commit object that's
+    # semi-deterministically generated by untrusted input (the pull-req) in theory
+    # an attacker could construct a pull-req that results in a commit object that
+    # they've created a collision for. Not the most likely attack, but preventing
+    # it is pretty easy so we do so as a "belt-and-suspenders" measure.
+    for LINE in $(gpg --version); do
+        case "$LINE" in
+            "gpg (GnuPG) 1.4.1"*|"gpg (GnuPG) 2.0."*)
+                echo "Please upgrade to at least gpg 2.1.10 to check for weak signatures" > /dev/stderr
+                printf '%s\n' "$INPUT" | gpg --trust-model always "$@" 2>/dev/null
+                exit $?
+                ;;
+            # We assume if you're running 2.1+, you're probably running 2.1.10+
+            # gpg will fail otherwise
+            # We assume if you're running 1.X, it is either 1.4.1X or 1.4.20+
+            # gpg will fail otherwise
+        esac
+    done
+    printf '%s\n' "$INPUT" | gpg --trust-model always --weak-digest sha1 "$@" 2>/dev/null
+    exit $?
 fi
diff --git a/depends/Makefile b/depends/Makefile
index fde108d2c2c9..c377187b50ac 100644
--- a/depends/Makefile
+++ b/depends/Makefile
@@ -49,7 +49,7 @@ FALLBACK_DOWNLOAD_PATH ?= https://bitcoincore.org/depends-sources
 C_STANDARD ?= c11
 CXX_STANDARD ?= c++20
 
-BUILD = $(shell ./config.guess)
+BUILD = $(shell unset CC && ./config.guess)
 PATCHES_PATH = $(BASEDIR)/patches
 BASEDIR = $(CURDIR)
 HASH_LENGTH:=11
diff --git a/depends/README.md b/depends/README.md
index 706c3db0d956..b12df1354e59 100644
--- a/depends/README.md
+++ b/depends/README.md
@@ -108,6 +108,18 @@ The following can be set when running make: `make FOO=bar`
 If some packages are not built, for example `make NO_WALLET=1`, the appropriate CMake cache
 variables will be set when generating the Bitcoin Core buildsystem. In this case, `-DENABLE_WALLET=OFF`.
 
+## Compiler Configuration
+
+`CC` and `CXX` control target compilers. `build_CC` and `build_CXX` control
+compilers for native build tools (e.g. `native_capnp`, `native_qt`), which
+default to `gcc`/`g++` on Linux and `clang`/`clang++` on macOS/FreeBSD/OpenBSD
+(see `./depends/builders/*.mk`).
+
+On a system where the default build compiler is not available (e.g. Linux
+without gcc/g++), you could use the following to build all packages using clang:
+
+    make -C depends build_CC=clang build_CXX=clang++ CC=clang CXX=clang++
+
 ## Cross compilation
 
 To build for another arch/OS:
diff --git a/depends/builders/darwin.mk b/depends/builders/darwin.mk
index 2b59353e84f3..dba4d1370dbc 100644
--- a/depends/builders/darwin.mk
+++ b/depends/builders/darwin.mk
@@ -5,7 +5,6 @@ build_darwin_RANLIB:=$(shell xcrun -f ranlib)
 build_darwin_STRIP:=$(shell xcrun -f strip)
 build_darwin_OBJDUMP:=$(shell xcrun -f objdump)
 build_darwin_NM:=$(shell xcrun -f nm)
-build_darwin_DSYMUTIL:=$(shell xcrun -f dsymutil)
 build_darwin_SHA256SUM=shasum -a 256
 build_darwin_DOWNLOAD=curl --location --fail --connect-timeout $(DOWNLOAD_CONNECT_TIMEOUT) --retry $(DOWNLOAD_RETRIES) -o
 
@@ -17,7 +16,6 @@ darwin_RANLIB:=$(shell xcrun -f ranlib)
 darwin_STRIP:=$(shell xcrun -f strip)
 darwin_OBJDUMP:=$(shell xcrun -f objdump)
 darwin_NM:=$(shell xcrun -f nm)
-darwin_DSYMUTIL:=$(shell xcrun -f dsymutil)
 
 x86_64_darwin_CFLAGS += -arch x86_64
 x86_64_darwin_CXXFLAGS += -arch x86_64
diff --git a/depends/builders/default.mk b/depends/builders/default.mk
index 2a1709d98ad2..fa7dfbb00530 100644
--- a/depends/builders/default.mk
+++ b/depends/builders/default.mk
@@ -13,7 +13,7 @@ build_$(build_os)_$1 ?= $$(default_build_$1)
 build_$(build_arch)_$(build_os)_$1 ?= $$(build_$(build_os)_$1)
 build_$1=$$(build_$(build_arch)_$(build_os)_$1)
 endef
-$(foreach var,CC CXX AR TAR RANLIB NM STRIP SHA256SUM DOWNLOAD OBJDUMP DSYMUTIL TOUCH,$(eval $(call add_build_tool_func,$(var))))
+$(foreach var,CC CXX AR TAR RANLIB NM STRIP SHA256SUM DOWNLOAD OBJDUMP TOUCH,$(eval $(call add_build_tool_func,$(var))))
 define add_build_flags_func
 build_$(build_arch)_$(build_os)_$1 += $(build_$(build_os)_$1)
 build_$1=$$(build_$(build_arch)_$(build_os)_$1)
diff --git a/depends/builders/freebsd.mk b/depends/builders/freebsd.mk
index 910de28bf36f..f66d3fcdb8c4 100644
--- a/depends/builders/freebsd.mk
+++ b/depends/builders/freebsd.mk
@@ -7,3 +7,9 @@ build_freebsd_DOWNLOAD = curl --location --fail --connect-timeout $(DOWNLOAD_CON
 # freebsd host on freebsd builder: override freebsd host preferences.
 freebsd_CC = clang
 freebsd_CXX = clang++
+
+i686_freebsd_CFLAGS += -m32
+i686_freebsd_CXXFLAGS += -m32
+
+x86_64_freebsd_CFLAGS += -m64
+x86_64_freebsd_CXXFLAGS += -m64
diff --git a/depends/hosts/darwin.mk b/depends/hosts/darwin.mk
index 71fac7cc8909..373ab74e113c 100644
--- a/depends/hosts/darwin.mk
+++ b/depends/hosts/darwin.mk
@@ -6,23 +6,15 @@ LLD_VERSION=711
 
 OSX_SDK=$(SDK_PATH)/Xcode-$(XCODE_VERSION)-$(XCODE_BUILD_ID)-extracted-SDK-with-libcxx-headers
 
-# We can't just use $(shell command -v clang) because GNU Make handles builtins
-# in a special way and doesn't know that `command` is a POSIX-standard builtin
-# prior to 1af314465e5dfe3e8baa839a32a72e83c04f26ef, first released in v4.2.90.
-# At the time of writing, GNU Make v4.2.1 is still being used in supported
-# distro releases.
-#
-# Source: https://lists.gnu.org/archive/html/bug-make/2017-11/msg00017.html
-clang_prog=$(shell $(SHELL) $(.SHELLFLAGS) "command -v clang")
-clangxx_prog=$(shell $(SHELL) $(.SHELLFLAGS) "command -v clang++")
+clang_prog=$(shell command -v clang)
+clangxx_prog=$(shell command -v clang++)
 
-darwin_AR=$(shell $(SHELL) $(.SHELLFLAGS) "command -v llvm-ar")
-darwin_DSYMUTIL=$(shell $(SHELL) $(.SHELLFLAGS) "command -v dsymutil")
-darwin_NM=$(shell $(SHELL) $(.SHELLFLAGS) "command -v llvm-nm")
-darwin_OBJCOPY=$(shell $(SHELL) $(.SHELLFLAGS) "command -v llvm-objcopy")
-darwin_OBJDUMP=$(shell $(SHELL) $(.SHELLFLAGS) "command -v llvm-objdump")
-darwin_RANLIB=$(shell $(SHELL) $(.SHELLFLAGS) "command -v llvm-ranlib")
-darwin_STRIP=$(shell $(SHELL) $(.SHELLFLAGS) "command -v llvm-strip")
+darwin_AR=$(shell command -v llvm-ar)
+darwin_NM=$(shell command -v llvm-nm)
+darwin_OBJCOPY=$(shell command -v llvm-objcopy)
+darwin_OBJDUMP=$(shell command -v llvm-objdump)
+darwin_RANLIB=$(shell command -v llvm-ranlib)
+darwin_STRIP=$(shell command -v llvm-strip)
 
 # Flag explanations:
 #
diff --git a/depends/hosts/default.mk b/depends/hosts/default.mk
index 22409c4004d6..21a9612aea48 100644
--- a/depends/hosts/default.mk
+++ b/depends/hosts/default.mk
@@ -39,5 +39,5 @@ host_$1 = $$($(host_arch)_$(host_os)_$1)
 host_$(release_type)_$1 = $$($(host_arch)_$(host_os)_$(release_type)_$1)
 endef
 
-$(foreach tool,CC CXX AR RANLIB STRIP NM OBJCOPY OBJDUMP DSYMUTIL,$(eval $(call add_host_tool_func,$(tool))))
+$(foreach tool,CC CXX AR RANLIB STRIP NM OBJCOPY OBJDUMP,$(eval $(call add_host_tool_func,$(tool))))
 $(foreach flags,CFLAGS CXXFLAGS CPPFLAGS LDFLAGS, $(eval $(call add_host_flags_func,$(flags))))
diff --git a/depends/hosts/freebsd.mk b/depends/hosts/freebsd.mk
index b69535cc800e..240180f2fd2a 100644
--- a/depends/hosts/freebsd.mk
+++ b/depends/hosts/freebsd.mk
@@ -1,5 +1,26 @@
+FREEBSD_VERSION ?= 15.0
+FREEBSD_SDK=$(SDK_PATH)/freebsd-$(host)-$(FREEBSD_VERSION)/
+
+clang_prog=$(shell command -v clang)
+clangxx_prog=$(shell command -v clang++)
+
+freebsd_AR=$(shell command -v llvm-ar)
+freebsd_NM=$(shell command -v llvm-nm)
+freebsd_OBJCOPY=$(shell command -v llvm-objcopy)
+freebsd_OBJDUMP=$(shell command -v llvm-objdump)
+freebsd_RANLIB=$(shell command -v llvm-ranlib)
+freebsd_STRIP=$(shell command -v llvm-strip)
+
+
+freebsd_CC=$(clang_prog) --target=$(host) \
+              --sysroot=$(FREEBSD_SDK)
+
+freebsd_CXX=$(clangxx_prog) --target=$(host) \
+              --sysroot=$(FREEBSD_SDK) -stdlib=libc++
+
 freebsd_CFLAGS=
 freebsd_CXXFLAGS=
+freebsd_LDFLAGS=-fuse-ld=lld
 
 freebsd_release_CFLAGS=-O2
 freebsd_release_CXXFLAGS=$(freebsd_release_CFLAGS)
@@ -7,25 +28,4 @@ freebsd_release_CXXFLAGS=$(freebsd_release_CFLAGS)
 freebsd_debug_CFLAGS=-O1 -g
 freebsd_debug_CXXFLAGS=$(freebsd_debug_CFLAGS)
 
-ifeq (86,$(findstring 86,$(build_arch)))
-i686_freebsd_CC=clang -m32
-i686_freebsd_CXX=clang++ -m32
-i686_freebsd_AR=ar
-i686_freebsd_RANLIB=ranlib
-i686_freebsd_NM=nm
-i686_freebsd_STRIP=strip
-
-x86_64_freebsd_CC=clang -m64
-x86_64_freebsd_CXX=clang++ -m64
-x86_64_freebsd_AR=ar
-x86_64_freebsd_RANLIB=ranlib
-x86_64_freebsd_NM=nm
-x86_64_freebsd_STRIP=strip
-else
-i686_freebsd_CC=$(default_host_CC) -m32
-i686_freebsd_CXX=$(default_host_CXX) -m32
-x86_64_freebsd_CC=$(default_host_CC) -m64
-x86_64_freebsd_CXX=$(default_host_CXX) -m64
-endif
-
 freebsd_cmake_system_name=FreeBSD
diff --git a/depends/hosts/mingw32.mk b/depends/hosts/mingw32.mk
index 7db6afaef6a1..d433636fa4fb 100644
--- a/depends/hosts/mingw32.mk
+++ b/depends/hosts/mingw32.mk
@@ -1,7 +1,7 @@
-ifneq ($(shell $(SHELL) $(.SHELLFLAGS) "command -v $(host)-gcc-posix"),)
+ifneq ($(shell command -v $(host)-gcc-posix),)
 mingw32_CC := $(host)-gcc-posix
 endif
-ifneq ($(shell $(SHELL) $(.SHELLFLAGS) "command -v $(host)-g++-posix"),)
+ifneq ($(shell command -v $(host)-g++-posix),)
 mingw32_CXX := $(host)-g++-posix
 endif
 
diff --git a/depends/packages/boost.mk b/depends/packages/boost.mk
index 02f59abe4d25..5be0e60b623a 100644
--- a/depends/packages/boost.mk
+++ b/depends/packages/boost.mk
@@ -6,7 +6,7 @@ $(package)_sha256_hash = 913ca43d49e93d1b158c9862009add1518a4c665e7853b349a6492d
 $(package)_build_subdir = build
 
 define $(package)_set_vars
-  $(package)_config_opts = -DBOOST_INCLUDE_LIBRARIES="multi_index;signals2;test"
+  $(package)_config_opts = -DBOOST_INCLUDE_LIBRARIES="multi_index;test"
   $(package)_config_opts += -DBOOST_TEST_HEADERS_ONLY=ON
   $(package)_config_opts += -DBOOST_ENABLE_MPI=OFF
   $(package)_config_opts += -DBOOST_ENABLE_PYTHON=OFF
@@ -24,3 +24,7 @@ endef
 define $(package)_stage_cmds
   $(MAKE) DESTDIR=$($(package)_staging_dir) install
 endef
+
+define $(package)_postprocess_cmds
+  rm -rf share
+endef
diff --git a/depends/packages/native_capnp.mk b/depends/packages/native_capnp.mk
index 0cd0dcdf9d92..d65a8b97cb18 100644
--- a/depends/packages/native_capnp.mk
+++ b/depends/packages/native_capnp.mk
@@ -1,9 +1,9 @@
 package=native_capnp
-$(package)_version=1.3.0
+$(package)_version=1.4.0
 $(package)_download_path=https://capnproto.org/
 $(package)_download_file=capnproto-c++-$($(package)_version).tar.gz
 $(package)_file_name=capnproto-cxx-$($(package)_version).tar.gz
-$(package)_sha256_hash=098f824a495a1a837d56ae17e07b3f721ac86f8dbaf58896a389923458522108
+$(package)_sha256_hash=fa02378ad522b318916b9ad928d1372fc9abd43dd1f4f0392e50450f5c87828f
 
 define $(package)_set_vars
   $(package)_config_opts := -DBUILD_TESTING=OFF
diff --git a/depends/packages/native_qt.mk b/depends/packages/native_qt.mk
index 310c9f1329e6..2bf088c10aca 100644
--- a/depends/packages/native_qt.mk
+++ b/depends/packages/native_qt.mk
@@ -9,6 +9,7 @@ $(package)_patches := dont_hardcode_pwd.patch
 $(package)_patches += qtbase_skip_tools.patch
 $(package)_patches += rcc_hardcode_timestamp.patch
 $(package)_patches += qttools_skip_dependencies.patch
+$(package)_patches += fix-macos26-qyield.patch
 
 $(package)_qttranslations_file_name=$(qt_details_qttranslations_file_name)
 $(package)_qttranslations_sha256_hash=$(qt_details_qttranslations_sha256_hash)
@@ -97,9 +98,9 @@ ifneq ($(V),)
 $(package)_cmake_opts += --log-level=STATUS
 endif
 
-ifeq ($(host_os),darwin)
-$(package)_cmake_opts += -DQT_INTERNAL_XCODE_VERSION=$(XCODE_VERSION)
+ifeq ($(build_os),darwin)
 $(package)_cmake_opts += -DQT_NO_APPLE_SDK_MAX_VERSION_CHECK=ON
+$(package)_cmake_opts += -DQT_NO_XCODE_MIN_VERSION_CHECK=ON
 endif
 endef
 
@@ -137,7 +138,8 @@ define $(package)_preprocess_cmds
   patch -p1 -i $($(package)_patch_dir)/dont_hardcode_pwd.patch && \
   patch -p1 -i $($(package)_patch_dir)/qtbase_skip_tools.patch && \
   patch -p1 -i $($(package)_patch_dir)/rcc_hardcode_timestamp.patch && \
-  patch -p1 -i $($(package)_patch_dir)/qttools_skip_dependencies.patch
+  patch -p1 -i $($(package)_patch_dir)/qttools_skip_dependencies.patch && \
+  patch -p1 -i $($(package)_patch_dir)/fix-macos26-qyield.patch
 endef
 
 define $(package)_config_cmds
diff --git a/depends/packages/packages.mk b/depends/packages/packages.mk
index 4fee4e18a396..22ae4787fe73 100644
--- a/depends/packages/packages.mk
+++ b/depends/packages/packages.mk
@@ -5,6 +5,7 @@ boost_packages = boost
 libevent_packages = libevent
 
 qrencode_linux_packages = qrencode
+qrencode_freebsd_packages = qrencode
 qrencode_darwin_packages = qrencode
 qrencode_mingw32_packages = qrencode
 
diff --git a/depends/packages/qt.mk b/depends/packages/qt.mk
index 8d5ddfb89a89..9b7cec341d60 100644
--- a/depends/packages/qt.mk
+++ b/depends/packages/qt.mk
@@ -24,6 +24,7 @@ $(package)_patches += fix-gcc16-sfinae-qregularexpression.patch
 $(package)_patches += fix-gcc16-sfinae-qchar.patch
 $(package)_patches += fix-gcc16-sfinae-qbitarray.patch
 $(package)_patches += fix-gcc16-sfinae-qanystringview.patch
+$(package)_patches += fix-macos26-qyield.patch
 $(package)_patches += fix-qbytearray-include.patch
 
 $(package)_qttranslations_file_name=$(qt_details_qttranslations_file_name)
@@ -156,6 +157,7 @@ ifneq ($(LTO),)
 $(package)_config_opts_linux += -ltcg
 endif
 $(package)_config_opts_freebsd := $$($(package)_config_opts_linux)
+$(package)_config_opts_freebsd += -no-feature-inotify
 
 $(package)_config_opts_mingw32 := -no-dbus
 $(package)_config_opts_mingw32 += -no-feature-freetype
@@ -169,6 +171,7 @@ $(package)_config_env_darwin += OBJCXX="$$($(package)_cxx)"
 
 $(package)_cmake_opts := -DCMAKE_PREFIX_PATH=$(host_prefix)
 $(package)_cmake_opts += -DQT_FEATURE_cxx20=ON
+$(package)_cmake_opts += -DQT_GENERATE_SBOM=OFF
 ifneq ($(V),)
 $(package)_cmake_opts += --log-level=STATUS
 endif
@@ -206,8 +209,8 @@ $(package)_cmake_opts += -DCMAKE_DISABLE_FIND_PACKAGE_WrapSystemMd4c=TRUE
 $(package)_cmake_opts += -DCMAKE_DISABLE_FIND_PACKAGE_WrapZSTD=TRUE
 endif
 ifeq ($(host_os),linux)
-# For some reason, the `-dbus-runtime` configure
-# option does not work as expected.
+# The `-dbus-runtime` configure option does not work
+# https://qt-project.atlassian.net/browse/QTBUG-144864
 $(package)_cmake_opts += -DINPUT_dbus=runtime
 endif
 ifeq ($(host_os),darwin)
@@ -280,6 +283,7 @@ define $(package)_preprocess_cmds
   patch -p1 -i $($(package)_patch_dir)/fix-gcc16-sfinae-qchar.patch && \
   patch -p1 -i $($(package)_patch_dir)/fix-gcc16-sfinae-qbitarray.patch && \
   patch -p1 -i $($(package)_patch_dir)/fix-gcc16-sfinae-qanystringview.patch && \
+  patch -p1 -i $($(package)_patch_dir)/fix-macos26-qyield.patch && \
   patch -p1 -i $($(package)_patch_dir)/fix-qbytearray-include.patch
 endef
 ifeq ($(host),$(build))
diff --git a/depends/patches/qt/fix-macos26-qyield.patch b/depends/patches/qt/fix-macos26-qyield.patch
new file mode 100644
index 000000000000..65514a01cc82
--- /dev/null
+++ b/depends/patches/qt/fix-macos26-qyield.patch
@@ -0,0 +1,44 @@
+commit a76004f16fdc43e1b7af83bfdf3f1a613491b234
+Author: Paul Wicking <paul.wicking@qt.io>
+Date:   Thu Mar 26 07:09:43 2026 +0100
+
+    qyieldcpu: Fix compilation with macOS 26.4 SDK
+    
+    After updating to the macOS 26.4 SDK, qtbase fails to compile on
+    Apple Silicon with an implicit function declaration error for
+    __yield() in qyieldcpu.h. It appears that the SDK's Clang now
+    reports __has_builtin(__yield) as true, but __yield() requires
+    <arm_acle.h> for its declaration.
+    
+    The compiler's own __builtin_arm_yield intrinsic was already checked
+    further down in the cascade. Moving it above the __yield check resolves
+    the build failure, without unnecessarily pulling in the header.
+    
+    Fixes: QTBUG-145239
+    Change-Id: I94b4d8f72385a4944c272ed7a66d249537a82e7d
+    Reviewed-by: Tor Arne Vestbø <tor.arne.vestbo@qt.io>
+    Reviewed-by: Fabian Kosmale <fabian.kosmale@qt.io>
+
+--- a/qtbase/src/corelib/thread/qyieldcpu.h
++++ b/qtbase/src/corelib/thread/qyieldcpu.h
+@@ -31,7 +31,9 @@ void qYieldCpu(void)
+     noexcept
+ #endif
+ {
+-#if __has_builtin(__yield)
++#if __has_builtin(__builtin_arm_yield)
++    __builtin_arm_yield();
++#elif __has_builtin(__yield)
+     __yield();              // Generic
+ #elif defined(_YIELD_PROCESSOR) && defined(Q_CC_MSVC)
+     _YIELD_PROCESSOR();     // Generic; MSVC's <atomic>
+@@ -45,9 +47,6 @@ void qYieldCpu(void)
+     _mm_pause();
+ #elif defined(Q_PROCESSOR_X86)
+     __asm__("pause");           // hopefully asm() works in this compiler
+-
+-#elif __has_builtin(__builtin_arm_yield)
+-    __builtin_arm_yield();
+ #elif defined(Q_PROCESSOR_ARM) && Q_PROCESSOR_ARM >= 7 && defined(Q_CC_GNU)
+     __asm__("yield");           // this works everywhere
+ 
diff --git a/doc/INSTALL_linux.md b/doc/INSTALL_linux.md
new file mode 100644
index 000000000000..c6bec558feb7
--- /dev/null
+++ b/doc/INSTALL_linux.md
@@ -0,0 +1,29 @@
+Bitcoin Core
+=============
+
+Below are notes on installing Bitcoin Core software on Linux systems.
+
+General Runtime Requirements
+----------------------------
+
+Bitcoin Core requires glibc (GNU C Library) 2.31 or newer.
+
+GUI Runtime Requirements
+------------------------
+
+The GUI executable, `bitcoin-qt`, is based on the Qt 6 framework and uses the `xcb` QPA (Qt Platform Abstraction) platform plugin
+to run on X11. Its runtime library dependencies are as follows:
+- `libfontconfig`
+- `libfreetype`
+
+On Debian, Ubuntu, or their derivatives, you can run the following command to ensure all dependencies are installed:
+```sh
+sudo apt install libfontconfig1 libfreetype6
+```
+
+On Fedora, run:
+```sh
+sudo dnf install fontconfig freetype
+```
+
+For other systems, please consult their documentation.
diff --git a/doc/asmap-data.md b/doc/asmap-data.md
index 09e2f95c9749..e3035e5857e7 100644
--- a/doc/asmap-data.md
+++ b/doc/asmap-data.md
@@ -41,9 +41,9 @@ To overcome this, multiple users can start the download process at the exact
 same time which leads to a high likelihood that their downloaded data will be
 similar enough that they receive the same output at the end of the process.
 This process is regularly coordinated at the [asmap-data](https://github.com/asmap/asmap-data)
-project. If enough participants have joined the effort (5 or more is recommended) and a majority of the
-participants have received the same result, the resulting ASMap file is added
-to the repository for public use. Files will not be merged to the repository
+project. If the result hash that was observed by the most participants is signed
+by 5 participants or more, the resulting ASMap file is added to the repository for
+public use. Files will not be merged to the repository
 without at least two additional reviewers confirming that the process described
 above was followed as expected and that the encoding step yielded the same
 file hash. New files are created on an ongoing basis but without any central planning
diff --git a/doc/bips.md b/doc/bips.md
index c814717a09fe..07e5024864c6 100644
--- a/doc/bips.md
+++ b/doc/bips.md
@@ -51,6 +51,8 @@ BIPs that are implemented by Bitcoin Core:
 * [`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)).
 * [`BIP 324`](https://github.com/bitcoin/bips/blob/master/bip-0324.mediawiki): The v2 transport protocol specified by BIP324 and the associated `NODE_P2P_V2` service bit are supported as of **v26.0**, but off by default ([PR 28331](https://github.com/bitcoin/bitcoin/pull/28331)). On by default as of **v27.0** ([PR 29347](https://github.com/bitcoin/bitcoin/pull/29347)).
 * [`BIP 325`](https://github.com/bitcoin/bips/blob/master/bip-0325.mediawiki): Signet test network is supported as of **v0.21.0** ([PR 18267](https://github.com/bitcoin/bitcoin/pull/18267)).
+* [`BIP 327`](https://github.com/bitcoin/bips/blob/master/bip-0327.mediawiki): Key aggregation via `musig()` descriptors is supported as of **v30.0** ([PR 31244](https://github.com/bitcoin/bitcoin/pull/31244)). Signing is supported as of **v31.0** ([PR 29675](https://github.com/bitcoin/bitcoin/pull/29675))
+* [`BIP 328`](https://github.com/bitcoin/bips/blob/master/bip-0328.mediawiki): MuSig2 derivation via `musig()` descriptors is supported as of **v30.0** ([PR 31244](https://github.com/bitcoin/bitcoin/pull/31244))
 * [`BIP 339`](https://github.com/bitcoin/bips/blob/master/bip-0339.mediawiki): Relay of transactions by wtxid is supported as of **v0.21.0** ([PR 18044](https://github.com/bitcoin/bitcoin/pull/18044)).
 * [`BIP 340`](https://github.com/bitcoin/bips/blob/master/bip-0340.mediawiki)
   [`341`](https://github.com/bitcoin/bips/blob/master/bip-0341.mediawiki)
@@ -62,6 +64,7 @@ BIPs that are implemented by Bitcoin Core:
   always active as of **v24.0** ([PR 23536](https://github.com/bitcoin/bitcoin/pull/23536)).
 * [`BIP 350`](https://github.com/bitcoin/bips/blob/master/bip-0350.mediawiki): Addresses for native v1+ segregated Witness outputs use Bech32m instead of Bech32 as of **v22.0** ([PR 20861](https://github.com/bitcoin/bitcoin/pull/20861)).
 * [`BIP 371`](https://github.com/bitcoin/bips/blob/master/bip-0371.mediawiki): Taproot fields for PSBT as of **v24.0** ([PR 22558](https://github.com/bitcoin/bitcoin/pull/22558)).
+* [`BIP 373`](https://github.com/bitcoin/bips/blob/master/bip-0373.mediawiki): MuSig2 fields for PSBT as of **v30.0** ([PR 31247](https://github.com/bitcoin/bitcoin/pull/31247))
 * [`BIP 379`](https://github.com/bitcoin/bips/blob/master/bip-0379.md): Miniscript was partially implemented in **v24.0** ([PR 24148](https://github.com/bitcoin/bitcoin/pull/24148)), and fully implemented as of **v26.0** ([PR 27255](https://github.com/bitcoin/bitcoin/pull/27255)).
 * [`BIP 380`](https://github.com/bitcoin/bips/blob/master/bip-0380.mediawiki)
   [`381`](https://github.com/bitcoin/bips/blob/master/bip-0381.mediawiki)
@@ -72,5 +75,6 @@ BIPs that are implemented by Bitcoin Core:
   Output Script Descriptors, and most of Script Expressions are implemented as of **v0.17.0** ([PR 13697](https://github.com/bitcoin/bitcoin/pull/13697)).
 * [`BIP 386`](https://github.com/bitcoin/bips/blob/master/bip-0386.mediawiki): tr() Output Script Descriptors are implemented as of **v22.0** ([PR 22051](https://github.com/bitcoin/bitcoin/pull/22051)).
 * [`BIP 387`](https://github.com/bitcoin/bips/blob/master/bip-0387.mediawiki): Tapscript Multisig Output Script Descriptors are implemented as of **v24.0** ([PR 24043](https://github.com/bitcoin/bitcoin/pull/24043)).
+* [`BIP 390`](https://github.com/bitcoin/bips/blob/master/bip-0390.mediawiki): MuSig2 Descriptor parsing is implemented in **v30.0** ([PR 31244](https://github.com/bitcoin/bitcoin/pull/31244)) and signing in **v31.0** ([PR 29675](https://github.com/bitcoin/bitcoin/pull/29675))
 * [`BIP 431`](https://github.com/bitcoin/bips/blob/master/bip-0431.mediawiki): transactions with nVersion=3 are standard and treated as Topologically Restricted Until Confirmation as of **v28.0** ([PR 29496](https://github.com/bitcoin/bitcoin/pull/29496)).
 * [`BIP 433`](https://github.com/bitcoin/bips/blob/master/bip-0433.mediawiki): Spending of Pay to Anchor (P2A) outputs is standard as of **v28.0** ([PR 30352](https://github.com/bitcoin/bitcoin/pull/30352)).
diff --git a/doc/bitcoin-conf.md b/doc/bitcoin-conf.md
index daa7fcba0003..e768961de3ee 100644
--- a/doc/bitcoin-conf.md
+++ b/doc/bitcoin-conf.md
@@ -65,7 +65,7 @@ Almost all options can be negated by being specified with a `no` prefix. For exa
 
 In general, negating an option is like setting it to `0` if it is a boolean or integer option, and setting it to an empty string or path or list if it is a string or path or list option.
 
-However, there are exceptions to this general rule. For example, it is an error to negate some options (e.g. `-nodatadir` is disallowed), and some negated strings are treated like `"0"` instead of `""` (e.g. `-noproxy` is treated like `-proxy=0`), and some negating some lists can have side effects in addition to clearing the lists (e.g. `-noconnect` disables automatic connections in addition to dropping any manual connections specified previously with `-connect=<host>`). When there are exceptions to the rule, they should either be obvious from context, or should be mentioned in usage documentation. Nonobvious, undocumented exceptions should be reported as bugs.
+However, there are exceptions to this general rule. For example, it is an error to negate some options (e.g. `-nodatadir` is disallowed), and some negated strings are treated like `"0"` instead of `""` (e.g. `-noproxy` is treated like `-proxy=0`), and some negating lists can have side effects in addition to clearing the lists (e.g. `-noconnect` disables automatic connections in addition to dropping any manual connections specified previously with `-connect=<host>`). When there are exceptions to the rule, they should either be obvious from context, or should be mentioned in usage documentation. Nonobvious, undocumented exceptions should be reported as bugs.
 
 ## Configuration File Path
 
diff --git a/doc/build-freebsd.md b/doc/build-freebsd.md
index b5940c0f7ce5..de373d1ecb15 100644
--- a/doc/build-freebsd.md
+++ b/doc/build-freebsd.md
@@ -1,6 +1,6 @@
 # FreeBSD Build Guide
 
-**Updated for FreeBSD [14.3](https://www.freebsd.org/releases/14.3R/announce/)**
+**Updated for FreeBSD [15.0](https://www.freebsd.org/releases/15.0R/announce/)**
 
 This guide describes how to build bitcoind, command-line utilities, and GUI on FreeBSD.
 
diff --git a/doc/build-osx.md b/doc/build-osx.md
index 001c0188e8a3..3c2b0f3a2d97 100644
--- a/doc/build-osx.md
+++ b/doc/build-osx.md
@@ -1,6 +1,6 @@
 # macOS Build Guide
 
-**Updated for MacOS [15](https://www.apple.com/macos/macos-sequoia/)**
+**Updated for MacOS [26](https://www.apple.com/os/macos/)**
 
 This guide describes how to build bitcoind, command-line utilities, and GUI on macOS.
 
diff --git a/doc/cjdns.md b/doc/cjdns.md
index 00db83dce7ec..9bdcec732db0 100644
--- a/doc/cjdns.md
+++ b/doc/cjdns.md
@@ -10,8 +10,8 @@ CJDNS is like a distributed, shared VPN with multiple entry points where every
 participant can reach any other participant. All participants use addresses from
 the `fc00::/8` network (reserved IPv6 range). Installation and configuration is
 done outside of Bitcoin Core, similarly to a VPN (either in the host/OS or on
-the network router). See https://github.com/cjdelisle/cjdns#readme and
-https://github.com/hyperboria/docs#hyperboriadocs for more information.
+the network router). See https://github.com/cjdelisle/cjdns#readme for more
+information.
 
 Compared to IPv4/IPv6, CJDNS provides end-to-end encryption and protects nodes
 from traffic analysis and filtering.
@@ -24,46 +24,25 @@ somewhat centralized. I2P connections have a source address and I2P is slow.
 CJDNS is fast but does not hide the sender and the recipient from intermediate
 routers.
 
-## Installing CJDNS and finding a peer to connect to the network
+## Installing CJDNS
 
 To install and set up CJDNS, follow the instructions at
 https://github.com/cjdelisle/cjdns#how-to-install-cjdns.
 
-You need to initiate an outbound connection to a peer on the CJDNS network
-before it will work with your Bitcoin Core node. This is described in steps
-["2. Find a friend"](https://github.com/cjdelisle/cjdns#2-find-a-friend) and
-["3. Connect your node to your friend's
-node"](https://github.com/cjdelisle/cjdns#3-connect-your-node-to-your-friends-node)
-in the CJDNS documentation.
+## Connecting to the CJDNS network
 
-One quick way to accomplish these two steps is to query for available public
-peers on [Hyperboria](https://github.com/hyperboria) by running the following:
+As of CJDNS v22, nodes automatically discover and connect to peers via DNS
+seeding. After installation, you can verify that your node has peers:
 
-```
-git clone https://github.com/hyperboria/peers hyperboria-peers
-cd hyperboria-peers
-./testAvailable.py
-```
-
-For each peer, the `./testAvailable.py` script prints the filename of the peer's
-credentials followed by the ping result.
-
-Choose one or several peers, copy their credentials from their respective files,
-paste them into the relevant IPv4 or IPv6 "connectTo" JSON object in the
-`cjdroute.conf` file you created in step ["1. Generate a new configuration
-file"](https://github.com/cjdelisle/cjdns#1-generate-a-new-configuration-file),
-and save the file.
-
-## Launching CJDNS
+    cjdnstool peers show
 
-Typically, CJDNS might be launched from its directory with
-`sudo ./cjdroute < cjdroute.conf` and it sheds permissions after setting up the
-[TUN](https://en.wikipedia.org/wiki/TUN/TAP) interface. You may also [launch it as an
-unprivileged user](https://github.com/cjdelisle/cjdns/blob/master/doc/non-root-user.md)
-with some additional setup.
+If you see peers with status `ESTABLISHED`, your node is connected and no
+further peering setup is needed.
 
-The network connection can be checked by running `./tools/peerStats` from the
-CJDNS directory.
+Manual peering may be useful if you want to guarantee a connection to a
+specific node, or if you have disabled DNS seeding for privacy reasons. See
+[doc/peering.md](https://github.com/cjdelisle/cjdns/blob/master/doc/peering.md)
+in the CJDNS repository for details.
 
 ## Run Bitcoin Core with CJDNS
 
diff --git a/doc/design/multiprocess.md b/doc/design/multiprocess.md
index e72f2a031371..ad045cbba668 100644
--- a/doc/design/multiprocess.md
+++ b/doc/design/multiprocess.md
@@ -175,7 +175,7 @@ sequenceDiagram
 4. **Handling in bitcoin-node**
    - Upon receiving the request, the Cap'n Proto dispatching code in the `bitcoin-node` process calls the `getBlockHash` method of the `Chain` [server class](#c-server-classes-in-generated-code).
    - The server class is automatically generated by the `mpgen` tool from the [`chain.capnp`](https://github.com/ryanofsky/bitcoin/blob/pr/ipc/src/ipc/capnp/chain.capnp) file in [`src/ipc/capnp/`](../../src/ipc/capnp/).
-   - The `getBlockHash` method of the generated `Chain` server subclass in `bitcoin-wallet` receives a Cap’n Proto request object with the `height` parameter, and calls the `getBlockHash` method on its local `Chain` object with the provided `height`.
+   - The `getBlockHash` method of the generated `Chain` server subclass in `bitcoin-node` receives a Cap’n Proto request object with the `height` parameter, and calls the `getBlockHash` method on its local `Chain` object with the provided `height`.
    - When the call returns, it encapsulates the return value in a Cap’n Proto response, which it sends back to the `bitcoin-wallet` process.
 
 5. **Response and Return**
diff --git a/doc/developer-notes.md b/doc/developer-notes.md
index 31ffd370c2f9..18691811aa4d 100644
--- a/doc/developer-notes.md
+++ b/doc/developer-notes.md
@@ -225,16 +225,15 @@ To describe a class, use the same construct above the class definition:
 class CAlert
 ```
 
-To describe a member or variable use:
+To describe a member or variable, place the comment on the line(s) before it, using `/**` and `*/`, `//!`, or `///`:
 ```c++
 //! Description before the member
 int var;
 ```
 
-or
-```c++
-int var; //!< Description after the member
-```
+Avoid trailing (inline) member comments like `int var; //!< Description after the member`.
+
+  - *Rationale*: Forgetting the `<` silently breaks Doxygen output.
 
 Also OK:
 ```c++
@@ -542,6 +541,13 @@ to a function that accepts a `std::string` parameter. An implicit conversion occ
 Use `IWYU pragma: export` very sparingly, as this enforces transitive inclusion of headers
 and undermines the specific purpose of IWYU.
 
+The acceptable cases for using `IWYU pragma: export` are:
+1. Facade headers. For example, see [`compat/compat.h`](/src/compat/compat.h).
+2. Drop-in replacement headers. For example, see [`util/time.h`](/src/util/time.h).
+3. Presenting a complete interface across multiple headers.
+
+A comment explaining the rationale is required for every use of `IWYU pragma: export`.
+
 ### Performance profiling with perf
 
 Profiling is a good way to get a precise idea of where time is being spent in
@@ -672,7 +678,7 @@ and its `cs_KeyStore` lock for example).
 - [ThreadHTTP (`b-http`)](https://doxygen.bitcoincore.org/httpserver_8cpp.html#abb9f6ea8819672bd9a62d3695070709c)
   : Libevent thread to listen for RPC and REST connections.
 
-- [HTTP worker threads(`b-httpworker.x`)](https://doxygen.bitcoincore.org/httpserver_8cpp.html#aa6a7bc27265043bc0193220c5ae3a55f)
+- [HTTP worker threads (`b-http_pool_x`)](https://doxygen.bitcoincore.org/httpserver_8cpp.html#a2ad0a49dc9b5e8117c0dee98c24187d8)
   : Threads to service RPC and REST requests.
 
 - [Indexer threads (`b-txindex`, etc)](https://doxygen.bitcoincore.org/class_base_index.html#a96a7407421fbf877509248bbe64f8d87)
@@ -790,7 +796,7 @@ Common misconceptions are clarified in those sections:
 - Do not compare an iterator from one data structure with an iterator of
   another data structure (even if of the same type).
 
-  - *Rationale*: Behavior is undefined. In C++ parlor this means "may reformat
+  - *Rationale*: Behavior is undefined. In C++ parlance this means "may reformat
     the universe", in practice this has resulted in at least one hard-to-debug crash bug.
 
 - Watch out for out-of-bounds vector access. `&vch[vch.size()]` is illegal,
@@ -854,19 +860,19 @@ Foo(vec);
 enum class Tabs {
     info,
     console,
-    network_graph,
-    peers
 };
 
 int GetInt(Tabs tab)
 {
-    switch (tab) {
-    case Tabs::info: return 0;
-    case Tabs::console: return 1;
-    case Tabs::network_graph: return 2;
-    case Tabs::peers: return 3;
-    } // no default case, so the compiler can warn about missing cases
-    assert(false);
+    int ret = [&]() {
+        switch (tab) {
+        case Tabs::info: return 0;
+        case Tabs::console: return 1;
+        } // no default case, so the compiler can warn about missing cases
+        assert(false);
+    }();
+    LogInfo("Tab %s", ret);
+    return ret;
 }
 ```
 
@@ -1411,9 +1417,9 @@ communication:
   using TipChangedFn = std::function<void(int block_height, int64_t block_time)>;
   virtual std::unique_ptr<interfaces::Handler> handleTipChanged(TipChangedFn fn) = 0;
 
-  // Bad: returns boost connection specific to local process
+  // Bad: returns btcsignals connection specific to local process
   using TipChangedFn = std::function<void(int block_height, int64_t block_time)>;
-  virtual boost::signals2::scoped_connection connectTipChanged(TipChangedFn fn) = 0;
+  virtual btcsignals::scoped_connection connectTipChanged(TipChangedFn fn) = 0;
   ```
 
 - Interface methods should not be overloaded.
diff --git a/doc/files.md b/doc/files.md
index 8a11e08913cd..e8f286929264 100644
--- a/doc/files.md
+++ b/doc/files.md
@@ -165,5 +165,5 @@ This table describes the files installed by Bitcoin Core across different platfo
 
 ## Filesystem recommendations
 
-When choosing a filesystem for the data directory (`datadir`) or blocks directory (`blocksdir`) on **macOS**,the `exFAT` filesystem should be avoided.
+When choosing a filesystem for the data directory (`datadir`) or blocks directory (`blocksdir`) on **macOS**, the `exFAT` filesystem should be avoided.
 There have been multiple reports of database corruption and data loss when using this filesystem with Bitcoin Core, see [Issue #31454](https://github.com/bitcoin/bitcoin/issues/31454) for more details.
diff --git a/doc/i2p.md b/doc/i2p.md
index 624b651f62a9..2877c1e570ec 100644
--- a/doc/i2p.md
+++ b/doc/i2p.md
@@ -86,7 +86,7 @@ address is used for making outbound connections and accepting inbound
 connections.
 
 In the I2P network, the receiver of an inbound connection sees the address of
-the initiator.  This is unlike the Tor network, where the recipient does not
+the initiator. This is unlike the Tor network, where the recipient does not
 know who is connecting to it.
 
 If your node is configured by setting `-i2pacceptincoming=0` to not accept
diff --git a/doc/release-notes-24539.md b/doc/release-notes-24539.md
deleted file mode 100644
index 63b4d70eafd7..000000000000
--- a/doc/release-notes-24539.md
+++ /dev/null
@@ -1,14 +0,0 @@
-New settings
-------------
-- `-txospenderindex` enables the creation of a transaction output spender
-  index that, if present, will be scanned by `gettxspendingprevout` if a
-  spending transaction was not found in the mempool.
-  (#24539)
-
-Updated RPCs
-------------
-- `gettxspendingprevout` has 2 new optional arguments: `mempool_only` and `return_spending_tx`.
-  If `mempool_only` is true it will limit scans to the mempool even if `txospenderindex` is available.
-  If `return_spending_tx` is true, the full spending tx will be returned.
-  In addition if `txospenderindex` is available and a confirmed spending transaction is found,
-  its block hash will be returned. (#24539)
diff --git a/doc/release-notes-26201.md b/doc/release-notes-26201.md
new file mode 100644
index 000000000000..66c9da540611
--- /dev/null
+++ b/doc/release-notes-26201.md
@@ -0,0 +1,4 @@
+RPC
+---
+
+- 'taproot' has been removed from 'getdeploymentinfo' because its historical activation height is no longer used anywhere in the codebase. (#26201)
diff --git a/doc/release-notes-26988.md b/doc/release-notes-26988.md
new file mode 100644
index 000000000000..7cd8f41a404c
--- /dev/null
+++ b/doc/release-notes-26988.md
@@ -0,0 +1,8 @@
+Tools and Utilities
+--------
+
+- CLI -addrinfo now returns the full set of known addresses. In previous versions (v22.0 - v30.0) the set of returned
+  addresses was filtered for quality and recency. This was changed since it does not match the logic for selecting peers
+  to connect to, which does not filter. Note: CLI -addrinfo now requires bitcoind v26.0 or later, as it uses the
+  getaddrmaninfo RPC internally. Users querying older, unmaintained node versions would need to use an older bitcoin-cli
+  version. (#26988)
diff --git a/doc/release-notes-29060.md b/doc/release-notes-29060.md
new file mode 100644
index 000000000000..bb11dc91365f
--- /dev/null
+++ b/doc/release-notes-29060.md
@@ -0,0 +1,10 @@
+- Logging and RPC
+
+  - Bitcoin Core now reports a debug message explaining why transaction inputs are non-standard.
+
+  - This information is now returned in the responses of the transaction-sending RPCs `submitpackage`,
+   `sendrawtransaction`, and `testmempoolaccept`, and is also logged to `debug.log` (if `mempoolrej`
++   debug category is enabled) when such transactions are received over the P2P network.
+
+  - This does not change the existing error code `bad-txns-nonstandard-inputs`, but instead adds additional debug information to it.
+
diff --git a/doc/release-notes-29415.md b/doc/release-notes-29415.md
deleted file mode 100644
index c0e0f3dc8881..000000000000
--- a/doc/release-notes-29415.md
+++ /dev/null
@@ -1,19 +0,0 @@
-P2P and network changes
------------------------
-
-- Normally local transactions are broadcast to all connected peers with
-  which we do transaction relay. Now, for the `sendrawtransaction` RPC
-  this behavior can be changed to only do the broadcast via the Tor or
-  I2P networks. A new boolean option `-privatebroadcast` has been added
-  to enable this behavior. This improves the privacy of the transaction
-  originator in two aspects:
-  1. Their IP address (and thus geolocation) is never known to the
-     recipients.
-  2. If the originator sends two otherwise unrelated transactions, they
-     will not be linkable. This is because a separate connection is used
-     for broadcasting each transaction. (#29415)
-
-- New RPCs have been added to introspect and control private broadcast:
-  `getprivatebroadcastinfo` reports transactions currently being privately
-  broadcast, and `abortprivatebroadcast` removes matching
-  transactions from the private broadcast queue.
diff --git a/doc/release-notes-31560.md b/doc/release-notes-31560.md
new file mode 100644
index 000000000000..07a8f7798ed7
--- /dev/null
+++ b/doc/release-notes-31560.md
@@ -0,0 +1,8 @@
+Updated RPCs
+------------
+
+- The `dumptxoutset` RPC now supports writing to a named pipe
+  on UNIX-like systems (see mkfifo(1) and mkfifo(3) man pages).
+  This allows the raw UTXO set data to be consumed directly by
+  another process (e.g., the `contrib/utxo-tools/utxo_to_sqlite.py`
+  conversion script) without first writing it to disk. (#31560)
diff --git a/doc/release-notes-32138.md b/doc/release-notes-32138.md
deleted file mode 100644
index 566998508806..000000000000
--- a/doc/release-notes-32138.md
+++ /dev/null
@@ -1,3 +0,0 @@
-RPC and Startup Option
----
-The `-paytxfee` startup option and the `settxfee` RPC are now deleted after being deprecated in Bitcoin Core 30.0. They used to allow the user to set a static fee rate for wallet transactions, which could potentially lead to overpaying or underpaying. Users should instead rely on fee estimation or specify a fee rate per transaction using the `fee_rate` argument in RPCs such as `fundrawtransaction`, `sendtoaddress`, `send`, `sendall`, and `sendmany`. (#32138)
diff --git a/doc/release-notes-33199.md b/doc/release-notes-33199.md
deleted file mode 100644
index 90246d782730..000000000000
--- a/doc/release-notes-33199.md
+++ /dev/null
@@ -1,9 +0,0 @@
-Fee Estimation
-========================
-
-- The Bitcoin Core fee estimator minimum fee rate bucket was updated from **1 sat/vB** to **0.1 sat/vB**,
-  which matches the node’s default `minrelayfee`.
-  This means that for a given confirmation target, if a sub-1 sat/vB fee rate bucket is the minimum tracked
-  with sufficient data, its average value will be returned as the fee rate estimate.
-
-- Note: Restarting a node with this change invalidates previously saved estimates in `fee_estimates.dat`, the fee estimator will start tracking fresh stats.
diff --git a/doc/release-notes-33259.md b/doc/release-notes-33259.md
new file mode 100644
index 000000000000..46f339fe7b5c
--- /dev/null
+++ b/doc/release-notes-33259.md
@@ -0,0 +1,4 @@
+RPC
+---
+
+The `getblockchaininfo` RPC now exposes progress for background validation if the `assumeutxo` feature is used. Once a node has synced from snapshot to tip, `verificationprogress` returns 1.0 and `initialblockdownload` false even though the node may still be validating blocks in the background. A new object, `backgroundvalidation`, provides details about the snapshot being validated, including snapshot height, number of blocks processed, best block hash, chainwork, median time, and verification progress.
diff --git a/doc/release-notes-33414.md b/doc/release-notes-33414.md
new file mode 100644
index 000000000000..977b88d7977d
--- /dev/null
+++ b/doc/release-notes-33414.md
@@ -0,0 +1,9 @@
+Notable changes
+===============
+
+P2P and network changes
+-----------------------
+
+Tor hidden services that are created automatically by Bitcoin Core will have
+[PoW defenses](https://tpo.pages.torproject.net/onion-services/ecosystem/technology/security/pow/)
+enabled if the Tor daemon supports that. (#33414)
diff --git a/doc/release-notes-33555.md b/doc/release-notes-33555.md
deleted file mode 100644
index a11af34fdfc6..000000000000
--- a/doc/release-notes-33555.md
+++ /dev/null
@@ -1,5 +0,0 @@
-Build System
-------------
-
-- The minimum supported Clang compiler version has been raised to 17.0
-  (#33555).
diff --git a/doc/release-notes-33629.md b/doc/release-notes-33629.md
deleted file mode 100644
index 46adf220f5e5..000000000000
--- a/doc/release-notes-33629.md
+++ /dev/null
@@ -1,51 +0,0 @@
-Mempool
-=======
-
-The mempool has been reimplemented with a new design ("cluster mempool"), to
-facilitate better decision-making when constructing block templates, evicting
-transactions, relaying transactions, and validating replacement transactions
-(RBF). Most changes should be transparent to users, but some behavior changes
-are noted:
-
-- The mempool no longer enforces ancestor or descendant size/count limits.
-  Instead, two new default policy limits are introduced governing connected
-  components, or clusters, in the mempool, limiting clusters to 64 transactions
-  and up to 101 kB in virtual size.  Transactions are considered to be in the
-  same cluster if they are connected to each other via any combination of
-  parent/child relationships in the mempool. These limits can be overridden
-  using command line arguments; see the extended help (`-help-debug`)
-  for more information.
-
-- Within the mempool, transactions are ordered based on the feerate at which
-  they are expected to be mined, which takes into account the full set, or
-  "chunk", of transactions that would be included together (e.g., a parent and
-  its child, or more complicated subsets of transactions). This ordering is
-  utilized by the algorithms that implement transaction selection for
-  constructing block templates; eviction from the mempool when it is full; and
-  transaction relay announcements to peers.
-
-- The replace-by-fee validation logic has been updated so that transaction
-  replacements are only accepted if the resulting mempool's feerate diagram is
-  strictly better than before the replacement. This eliminates all known cases
-  of replacements occurring that make the mempool worse off, which was possible
-  under previous RBF rules. For singleton transactions (that are in clusters by
-  themselves) it's sufficient for a replacement to have a higher fee and
-  feerate than the original. See
-  [delvingbitcoin.org post](https://delvingbitcoin.org/t/an-overview-of-the-cluster-mempool-proposal/393#rbf-can-now-be-made-incentive-compatible-for-miners-11)
-  for more information.
-
-- Two new RPCs have been added: `getmempoolcluster` will provide the set of
-  transactions in the same cluster as the given transaction, along with the
-  ordering of those transactions and grouping into chunks; and
-  `getmempoolfeeratediagram` will return the feerate diagram of the entire
-  mempool.
-
-- Chunk size and chunk fees are now also included in the output of `getmempoolentry`.
-
-- The "CPFP Carveout" has been removed from the mempool logic. The CPFP carveout
-  allowed one additional child transaction to be added to a package that's already
-  at its descendant limit, but only if that child has exactly one ancestor
-  (the package's root) and is small (no larger than 10kvB). Nothing is allowed to
-  bypass the cluster count limit. It is expected that smart contracting use-cases
-  requiring similar functionality employ TRUC transactions and sibling eviction
-  instead going forward.
diff --git a/doc/release-notes-33657.md b/doc/release-notes-33657.md
deleted file mode 100644
index a9821323356b..000000000000
--- a/doc/release-notes-33657.md
+++ /dev/null
@@ -1,5 +0,0 @@
-New REST API
-------------
-
-- A new REST API endpoint (`/rest/blockpart/<BLOCK-HASH>.<bin|hex>?offset=<OFFSET>&size=<SIZE>`) has been introduced
-  for efficiently fetching a range of bytes from block `<BLOCK-HASH>`.
diff --git a/doc/release-notes-33770.md b/doc/release-notes-33770.md
deleted file mode 100644
index 58e118635fdd..000000000000
--- a/doc/release-notes-33770.md
+++ /dev/null
@@ -1,4 +0,0 @@
-`-asmap` requires explicit filename
------------------------------------
-
-In previous releases, if `-asmap` was specified without a filename, this would try to load an `ip_asn.map` data file. Now loading an asmap file requires an explicit filename like `-asmap=ip_asn.map`. This change was made to make the option easier to understand, because it was confusing for there to be a default filename not actually loaded by default (https://github.com/bitcoin/bitcoin/issues/33386). Also this change makes the option more future-proof, because in upcoming releases, specifying `-asmap` will load embedded asmap data instead of an external file (https://github.com/bitcoin/bitcoin/pull/28792).
diff --git a/doc/release-notes-33842.md b/doc/release-notes-33842.md
deleted file mode 100644
index ad15f50b28bb..000000000000
--- a/doc/release-notes-33842.md
+++ /dev/null
@@ -1,4 +0,0 @@
-Build System
-------------
-
-- The minimum supported GCC compiler version has been raised to 12.1 (#33842).
diff --git a/doc/release-notes-33872.md b/doc/release-notes-33872.md
deleted file mode 100644
index 486a3b268786..000000000000
--- a/doc/release-notes-33872.md
+++ /dev/null
@@ -1,5 +0,0 @@
-P2P and network changes
------------------------
-
-- The `-maxorphantx` startup option has been removed. It was
-  previously deprecated and has no effect anymore since v30.0. (#33872)
diff --git a/doc/release-notes-33892.md b/doc/release-notes-33892.md
deleted file mode 100644
index e9d41b801228..000000000000
--- a/doc/release-notes-33892.md
+++ /dev/null
@@ -1,8 +0,0 @@
-P2P and network changes
------------------------
-
-- Transactions participating in one-parent-one-child package relay can now have the parent
-    with a feerate lower than the `-minrelaytxfee` feerate, even 0 fee. This expands the change
-    from 28.0 to also cover packages of non-TRUC transactions. Note that in general the
-    package child can have additional unconfirmed parents, but they must already be
-    in-mempool for the new package to be relayed. (#33892)
diff --git a/doc/release-notes-34031.md b/doc/release-notes-34031.md
deleted file mode 100644
index c0f29a9a803c..000000000000
--- a/doc/release-notes-34031.md
+++ /dev/null
@@ -1,4 +0,0 @@
-Net
----
-- `tor` has been removed as a network specification. It
-  was deprecated in favour of `onion` in v0.17.0. (#34031)
diff --git a/doc/release-notes-34088.md b/doc/release-notes-34088.md
deleted file mode 100644
index 5aa8a9d992f4..000000000000
--- a/doc/release-notes-34088.md
+++ /dev/null
@@ -1,2 +0,0 @@
-- When `-logsourcelocations` is enabled, the log output now contains just the
-  function name instead of the entire function signature. (#34088)
diff --git a/doc/release-notes-34184.md b/doc/release-notes-34184.md
deleted file mode 100644
index c582023eea2a..000000000000
--- a/doc/release-notes-34184.md
+++ /dev/null
@@ -1,8 +0,0 @@
-Mining IPC
-----------
-
-- `Mining.createNewBlock` now has a `cooldown` behavior (enabled by default)
-  that waits for IBD to finish and for the tip to catch up. This usually
-  prevents a flood of templates during startup, but is not guaranteed. (#34184)
-- `Mining.interrupt()` can be used to interrupt `Mining.waitTipChanged` and
-  `Mining.createNewBlock`. (#34184)
diff --git a/doc/release-notes-34197.md b/doc/release-notes-34197.md
deleted file mode 100644
index 377ca9cc43a9..000000000000
--- a/doc/release-notes-34197.md
+++ /dev/null
@@ -1,7 +0,0 @@
-Updated RPCs
-------------
-
-- The `getpeerinfo` RPC no longer returns the `startingheight` field unless
-  the configuration option `-deprecatedrpc=startingheight` is used. The
-  `startingheight` field will be fully removed in the next major release.
-  (#34197)
diff --git a/doc/release-notes-34512.md b/doc/release-notes-34512.md
deleted file mode 100644
index b863448853f6..000000000000
--- a/doc/release-notes-34512.md
+++ /dev/null
@@ -1,8 +0,0 @@
-Updated RPCs
-------------
-
-- The `getblock` RPC now returns a `coinbase_tx` object at verbosity levels 1, 2,
-  and 3. It contains `version`, `locktime`, `sequence`, `coinbase` and
-  `witness`. This allows for efficiently querying coinbase
-  transaction properties without fetching the full transaction data at
-  verbosity 2+. (#34512)
diff --git a/doc/release-notes-34568.md b/doc/release-notes-34568.md
deleted file mode 100644
index e48772330c1e..000000000000
--- a/doc/release-notes-34568.md
+++ /dev/null
@@ -1,11 +0,0 @@
-Mining IPC
-----------
-
-The IPC mining interface now requires mining clients to use the latest `mining.capnp` schema. Clients built against older schemas will fail when calling `Init.makeMining` and receive an RPC error indicating the old mining interface is no longer supported. Mining clients must update to the latest schema and regenerate bindings to continue working. (#34568)
-
-Notable IPC mining interface changes since the last release:
-- `Mining.createNewBlock` and `Mining.checkBlock` now require a `context` parameter.
-- `Mining.waitTipChanged` now has a default `timeout` (effectively infinite / `maxDouble`) if the client omits it.
-- `BlockTemplate.getCoinbaseTx()` now returns a structured `CoinbaseTx` instead of raw bytes.
-- Removed `BlockTemplate.getCoinbaseCommitment()` and `BlockTemplate.getWitnessCommitmentIndex()`.
-- Cap’n Proto default values were updated to match the corresponding C++ defaults for mining-related option structs (e.g. `BlockCreateOptions`, `BlockWaitOptions`, `BlockCheckOptions`).
diff --git a/doc/release-notes-34692.md b/doc/release-notes-34692.md
deleted file mode 100644
index 0336dfaf99e9..000000000000
--- a/doc/release-notes-34692.md
+++ /dev/null
@@ -1,6 +0,0 @@
-## Updated settings
-
-- The default `-dbcache` value has been increased to `1024` MiB from `450` MiB
-  on systems where at least `4096` MiB of RAM is detected.
-  This is a performance increase, but will use more memory.
-  To maintain the previous behaviour, set `-dbcache=450`.
diff --git a/doc/release-notes-34796.md b/doc/release-notes-34796.md
new file mode 100644
index 000000000000..a09786bfb9b0
--- /dev/null
+++ b/doc/release-notes-34796.md
@@ -0,0 +1,6 @@
+Updated RPCs
+------------
+
+- The `-deprecatedrpc=startingheight` configuration option has been removed.
+  The `getpeerinfo` RPC no longer returns the `startingheight` field, which
+  was previously deprecated in v31.0. (#34796)
diff --git a/doc/release-notes/release-notes-28.4.md b/doc/release-notes/release-notes-28.4.md
new file mode 100644
index 000000000000..b6af01a4b742
--- /dev/null
+++ b/doc/release-notes/release-notes-28.4.md
@@ -0,0 +1,81 @@
+Bitcoin Core version 28.4 is now available from:
+
+  <https://bitcoincore.org/bin/bitcoin-core-28.4/>
+
+This release includes various bug fixes and performance
+improvements, as well as updated translations.
+
+Please report bugs using the issue tracker at GitHub:
+
+  <https://github.com/bitcoin/bitcoin/issues>
+
+To receive security and update notifications, please subscribe to:
+
+  <https://bitcoincore.org/en/list/announcements/join/>
+
+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 in some cases), then run the
+installer (on Windows) or just copy over `/Applications/Bitcoin-Qt` (on macOS)
+or `bitcoind`/`bitcoin-qt` (on Linux).
+
+Upgrading directly from a version of Bitcoin Core that has reached its EOL is
+possible, but it might take some time if the data directory needs to be migrated. Old
+wallet versions of Bitcoin Core are generally supported.
+
+Compatibility
+==============
+
+Bitcoin Core is supported and extensively tested on operating systems
+using the Linux Kernel 3.17+, macOS 11.0+, and Windows 7 and newer. Bitcoin
+Core should also work on most other UNIX-like systems but is not as
+frequently tested on them. It is not recommended to use Bitcoin Core on
+unsupported systems.
+
+Notable changes
+===============
+
+### Wallet
+
+- #34156 wallet: fix unnamed legacy wallet migration failure
+- #34215 wallettool: fix unnamed createfromdump failure walletsdir deletion
+- #34226 wallet: test: Relative wallet failed migration cleanup
+- #34370 Fix #34222 backport bugs
+
+### P2P
+
+- #33723 chainparams: remove dnsseed.bitcoin.dashjr-list-of-p2p-nodes.us
+
+### Build
+
+- #34227 guix: Fix `osslsigncode` tests
+
+### CI
+
+- #32513 ci: remove 3rd party js from windows dll gha job
+- #34344 ci: update GitHub Actions versions
+- #34463 ci: use macos-14 image
+
+### Misc
+
+- #34174 doc: update copyright year to 2026
+
+Credits
+=======
+
+Thanks to everyone who directly contributed to this release:
+
+- achow101
+- davidgumberg
+- fanquake
+- furszy
+- Hennadii Stepanov
+- Luke Dashjr
+- m3dwards
+- Padraic Slattery
+- SatsAndSports
+
+As well as to everyone that helped with translations on
+[Transifex](https://explore.transifex.com/bitcoin/bitcoin/).
diff --git a/doc/tor.md b/doc/tor.md
index e9db555fc98a..7003fcfe3000 100644
--- a/doc/tor.md
+++ b/doc/tor.md
@@ -181,6 +181,10 @@ Add these lines to your `/etc/tor/torrc` (or equivalent config file):
 
     HiddenServiceDir /var/lib/tor/bitcoin-service/
     HiddenServicePort 8333 127.0.0.1:8334
+    # If `tor --list-modules` shows "pow: yes", then enable PoW protection.
+    # It is available in tor-0.4.8.1-alpha and newer when configured with
+    # `./configure --enable-gpl`.
+    HiddenServicePoWDefensesEnabled 1
 
 The directory can be different of course, but virtual port numbers should be equal to
 your bitcoind's P2P listen port (8333 by default), and target addresses and ports
diff --git a/src/CMakeLists.txt b/src/CMakeLists.txt
index ad18115bbc5f..b37f3c8ca5cf 100644
--- a/src/CMakeLists.txt
+++ b/src/CMakeLists.txt
@@ -56,6 +56,8 @@ add_subdirectory(crypto)
 add_subdirectory(util)
 if(ENABLE_IPC)
   add_subdirectory(ipc)
+else()
+  add_library(bitcoin_ipc STATIC EXCLUDE_FROM_ALL ipc/stub.cpp)
 endif()
 
 add_library(bitcoin_consensus STATIC EXCLUDE_FROM_ALL
@@ -97,6 +99,7 @@ add_library(bitcoin_common STATIC EXCLUDE_FROM_ALL
   common/config.cpp
   common/init.cpp
   common/interfaces.cpp
+  common/license_info.cpp
   common/messages.cpp
   common/netif.cpp
   common/pcp.cpp
@@ -143,7 +146,6 @@ target_link_libraries(bitcoin_common
     bitcoin_util
     univalue
     secp256k1
-    Boost::headers
     $<TARGET_NAME_IF_EXISTS:USDT::headers>
     $<$<PLATFORM_ID:Windows>:ws2_32>
 )
@@ -166,7 +168,6 @@ if(ENABLE_WALLET)
       bitcoin_wallet
       bitcoin_common
       bitcoin_util
-      Boost::headers
     )
     install_binary_component(bitcoin-wallet HAS_MANPAGE)
   endif()
@@ -347,13 +348,14 @@ target_link_libraries(bitcoin_cli
 
 # Bitcoin Core RPC client
 if(BUILD_CLI)
-  add_executable(bitcoin-cli bitcoin-cli.cpp)
+  add_executable(bitcoin-cli bitcoin-cli.cpp init/basic.cpp)
   add_windows_resources(bitcoin-cli bitcoin-cli-res.rc)
   add_windows_application_manifest(bitcoin-cli)
   target_link_libraries(bitcoin-cli
     core_interface
     bitcoin_cli
     bitcoin_common
+    bitcoin_ipc
     bitcoin_util
     libevent::core
     libevent::extra
diff --git a/src/addrdb.cpp b/src/addrdb.cpp
index 129bbf215430..5db632c7e1ed 100644
--- a/src/addrdb.cpp
+++ b/src/addrdb.cpp
@@ -204,7 +204,7 @@ util::Result<std::unique_ptr<AddrMan>> LoadAddrman(const NetGroupManager& netgro
     const auto path_addr{args.GetDataDirNet() / "peers.dat"};
     try {
         DeserializeFileDB(path_addr, *addrman);
-        LogInfo("Loaded %i addresses from peers.dat  %dms", addrman->Size(), Ticks<std::chrono::milliseconds>(SteadyClock::now() - start));
+        LogInfo("Loaded %i addresses from peers.dat %dms", addrman->Size(), Ticks<std::chrono::milliseconds>(SteadyClock::now() - start));
     } catch (const DbNotFoundError&) {
         // Addrman can be in an inconsistent state after failure, reset it
         addrman = std::make_unique<AddrMan>(netgroupman, deterministic, /*consistency_check_ratio=*/check_addrman);
diff --git a/src/addrman.cpp b/src/addrman.cpp
index 2e5149093c42..d3dae59ae790 100644
--- a/src/addrman.cpp
+++ b/src/addrman.cpp
@@ -24,26 +24,6 @@
 #include <cmath>
 #include <optional>
 
-/** Over how many buckets entries with tried addresses from a single group (/16 for IPv4) are spread */
-static constexpr uint32_t ADDRMAN_TRIED_BUCKETS_PER_GROUP{8};
-/** Over how many buckets entries with new addresses originating from a single group are spread */
-static constexpr uint32_t ADDRMAN_NEW_BUCKETS_PER_SOURCE_GROUP{64};
-/** Maximum number of times an address can occur in the new table */
-static constexpr int32_t ADDRMAN_NEW_BUCKETS_PER_ADDRESS{8};
-/** How old addresses can maximally be */
-static constexpr auto ADDRMAN_HORIZON{30 * 24h};
-/** After how many failed attempts we give up on a new node */
-static constexpr int32_t ADDRMAN_RETRIES{3};
-/** How many successive failures are allowed ... */
-static constexpr int32_t ADDRMAN_MAX_FAILURES{10};
-/** ... in at least this duration */
-static constexpr auto ADDRMAN_MIN_FAIL{7 * 24h};
-/** How recent a successful connection should be before we allow an address to be evicted from tried */
-static constexpr auto ADDRMAN_REPLACEMENT{4h};
-/** The maximum number of tried addr collisions to store */
-static constexpr size_t ADDRMAN_SET_TRIED_COLLISION_SIZE{10};
-/** The maximum time we'll spend trying to resolve a tried table collision */
-static constexpr auto ADDRMAN_TEST_WINDOW{40min};
 
 int AddrInfo::GetTriedBucket(const uint256& nKey, const NetGroupManager& netgroupman) const
 {
@@ -663,8 +643,8 @@ bool AddrManImpl::Good_(const CService& addr, bool test_before_evict, NodeSecond
         }
         // Output the entry we'd be colliding with, for debugging purposes
         auto colliding_entry = mapInfo.find(vvTried[tried_bucket][tried_bucket_pos]);
-        LogDebug(BCLog::ADDRMAN, "Collision with %s while attempting to move %s to tried table. Collisions=%d\n",
-                 colliding_entry != mapInfo.end() ? colliding_entry->second.ToStringAddrPort() : "",
+        LogDebug(BCLog::ADDRMAN, "Collision with %s while attempting to move %s to tried table. Collisions=%d",
+                 colliding_entry != mapInfo.end() ? colliding_entry->second.ToStringAddrPort() : "<unknown-addr>",
                  addr.ToStringAddrPort(),
                  m_tried_collisions.size());
         return false;
diff --git a/src/addrman.h b/src/addrman.h
index 8368e30b7b76..94e7d3e65379 100644
--- a/src/addrman.h
+++ b/src/addrman.h
@@ -19,6 +19,27 @@
 #include <utility>
 #include <vector>
 
+/** Over how many buckets entries with tried addresses from a single group (/16 for IPv4) are spread */
+static constexpr uint32_t ADDRMAN_TRIED_BUCKETS_PER_GROUP{8};
+/** Over how many buckets entries with new addresses originating from a single group are spread */
+static constexpr uint32_t ADDRMAN_NEW_BUCKETS_PER_SOURCE_GROUP{64};
+/** Maximum number of times an address can occur in the new table */
+static constexpr int32_t ADDRMAN_NEW_BUCKETS_PER_ADDRESS{8};
+/** How old addresses can maximally be */
+static constexpr auto ADDRMAN_HORIZON{30 * 24h};
+/** After how many failed attempts we give up on a new node */
+static constexpr int32_t ADDRMAN_RETRIES{3};
+/** How many successive failures are allowed ... */
+static constexpr int32_t ADDRMAN_MAX_FAILURES{10};
+/** ... in at least this duration */
+static constexpr auto ADDRMAN_MIN_FAIL{7 * 24h};
+/** How recent a successful connection should be before we allow an address to be evicted from tried */
+static constexpr auto ADDRMAN_REPLACEMENT{4h};
+/** The maximum number of tried addr collisions to store */
+static constexpr size_t ADDRMAN_SET_TRIED_COLLISION_SIZE{10};
+/** The maximum time we'll spend trying to resolve a tried table collision */
+static constexpr auto ADDRMAN_TEST_WINDOW{40min};
+
 class InvalidAddrManVersionError : public std::ios_base::failure
 {
 public:
diff --git a/src/arith_uint256.cpp b/src/arith_uint256.cpp
index 392f052c0afa..545139900a54 100644
--- a/src/arith_uint256.cpp
+++ b/src/arith_uint256.cpp
@@ -5,8 +5,9 @@
 
 #include <arith_uint256.h>
 
-#include <uint256.h>
 #include <crypto/common.h>
+#include <uint256.h>
+#include <util/overflow.h>
 
 #include <cassert>
 
@@ -194,7 +195,7 @@ arith_uint256& arith_uint256::SetCompact(uint32_t nCompact, bool* pfNegative, bo
 
 uint32_t arith_uint256::GetCompact(bool fNegative) const
 {
-    int nSize = (bits() + 7) / 8;
+    int nSize = CeilDiv(bits(), 8u);
     uint32_t nCompact = 0;
     if (nSize <= 3) {
         nCompact = GetLow64() << 8 * (3 - nSize);
diff --git a/src/banman.cpp b/src/banman.cpp
index 499595a458ca..3c1f64e2263c 100644
--- a/src/banman.cpp
+++ b/src/banman.cpp
@@ -36,7 +36,7 @@ void BanMan::LoadBanlist()
     if (m_ban_db.Read(m_banned)) {
         SweepBanned(); // sweep out unused entries
 
-        LogDebug(BCLog::NET, "Loaded %d banned node addresses/subnets  %dms\n", m_banned.size(),
+        LogDebug(BCLog::NET, "Loaded %d banned node addresses/subnets %dms", m_banned.size(),
                  Ticks<std::chrono::milliseconds>(SteadyClock::now() - start));
     } else {
         LogInfo("Recreating the banlist database");
@@ -65,7 +65,7 @@ void BanMan::DumpBanlist()
         m_is_dirty = true;
     }
 
-    LogDebug(BCLog::NET, "Flushed %d banned node addresses/subnets to disk  %dms\n", banmap.size(),
+    LogDebug(BCLog::NET, "Flushed %d banned node addresses/subnets to disk %dms", banmap.size(),
              Ticks<std::chrono::milliseconds>(SteadyClock::now() - start));
 }
 
diff --git a/src/bench/CMakeLists.txt b/src/bench/CMakeLists.txt
index 50b29a14667d..e1d5e4097ff4 100644
--- a/src/bench/CMakeLists.txt
+++ b/src/bench/CMakeLists.txt
@@ -77,6 +77,7 @@ if(ENABLE_WALLET)
       wallet_balance.cpp
       wallet_create.cpp
       wallet_create_tx.cpp
+      wallet_encrypt.cpp
       wallet_loading.cpp
       wallet_ismine.cpp
       wallet_migration.cpp
diff --git a/src/bench/addrman.cpp b/src/bench/addrman.cpp
index d28030e4baaa..fc081d9ff4b0 100644
--- a/src/bench/addrman.cpp
+++ b/src/bench/addrman.cpp
@@ -161,18 +161,13 @@ static void AddrManAddThenGood(benchmark::Bench& bench)
 
     CreateAddresses();
 
-    bench.run([&] {
-        // To make the benchmark independent of the number of evaluations, we always prepare a new addrman.
-        // This is necessary because AddrMan::Good() method modifies the object, affecting the timing of subsequent calls
-        // to the same method and we want to do the same amount of work in every loop iteration.
-        //
-        // This has some overhead (exactly the result of AddrManAdd benchmark), but that overhead is constant so improvements in
-        // AddrMan::Good() will still be noticeable.
-        AddrMan addrman{EMPTY_NETGROUPMAN, /*deterministic=*/false, ADDRMAN_CONSISTENCY_CHECK_RATIO};
-        AddAddressesToAddrMan(addrman);
-
-        markSomeAsGood(addrman);
-    });
+    std::optional<AddrMan> addrman;
+    bench.epochIterations(1)
+        .setup([&] {
+            addrman.emplace(EMPTY_NETGROUPMAN, /*deterministic=*/false, ADDRMAN_CONSISTENCY_CHECK_RATIO);
+            AddAddressesToAddrMan(*addrman);
+        })
+        .run([&] { markSomeAsGood(*addrman); });
 }
 
 BENCHMARK(AddrManAdd);
diff --git a/src/bench/bench.cpp b/src/bench/bench.cpp
index 0b2ee6e30d18..45d1b360f659 100644
--- a/src/bench/bench.cpp
+++ b/src/bench/bench.cpp
@@ -20,8 +20,6 @@
 
 using namespace std::chrono_literals;
 
-const std::function<void(const std::string&)> G_TEST_LOG_FUN{};
-
 /**
  * Retrieves the available test setup command line arguments that may be used
  * in the benchmark. They will be used only if the benchmark utilizes a
diff --git a/src/bench/ccoins_caching.cpp b/src/bench/ccoins_caching.cpp
index 2b7315f4c169..12ea07608010 100644
--- a/src/bench/ccoins_caching.cpp
+++ b/src/bench/ccoins_caching.cpp
@@ -26,8 +26,7 @@ static void CCoinsCaching(benchmark::Bench& bench)
     ECC_Context ecc_context{};
 
     FillableSigningProvider keystore;
-    CCoinsView coinsDummy;
-    CCoinsViewCache coins(&coinsDummy);
+    CCoinsViewCache coins{&CoinsViewEmpty::Get()};
     std::vector<CMutableTransaction> dummyTransactions =
         SetupDummyInputs(keystore, coins, {11 * COIN, 50 * COIN, 21 * COIN, 22 * COIN});
 
@@ -49,8 +48,7 @@ static void CCoinsCaching(benchmark::Bench& bench)
     // Benchmark.
     const CTransaction tx_1(t1);
     bench.run([&] {
-        bool success{AreInputsStandard(tx_1, coins)};
-        assert(success);
+        assert(ValidateInputsStandardness(tx_1, coins).IsValid());
     });
 }
 
diff --git a/src/bench/checkblock.cpp b/src/bench/checkblock.cpp
index 765b8b0dadcd..cbba543f2d8e 100644
--- a/src/bench/checkblock.cpp
+++ b/src/bench/checkblock.cpp
@@ -27,38 +27,30 @@
 
 static void DeserializeBlockTest(benchmark::Bench& bench)
 {
-    DataStream stream(benchmark::data::block413567);
-    std::byte a{0};
-    stream.write({&a, 1}); // Prevent compaction
-
-    bench.unit("block").run([&] {
-        CBlock block;
-        stream >> TX_WITH_WITNESS(block);
-        bool rewound = stream.Rewind(benchmark::data::block413567.size());
-        assert(rewound);
-    });
+    DataStream stream;
+    bench.unit("block").epochIterations(1)
+        .setup([&] { stream = DataStream{benchmark::data::block413567}; })
+        .run([&] { CBlock block; stream >> TX_WITH_WITNESS(block); });
 }
 
-static void DeserializeAndCheckBlockTest(benchmark::Bench& bench)
+static void CheckBlockTest(benchmark::Bench& bench)
 {
-    DataStream stream(benchmark::data::block413567);
-    std::byte a{0};
-    stream.write({&a, 1}); // Prevent compaction
-
     ArgsManager bench_args;
     const auto chainParams = CreateChainParams(bench_args, ChainType::MAIN);
 
-    bench.unit("block").run([&] {
-        CBlock block; // Note that CBlock caches its checked state, so we need to recreate it here
-        stream >> TX_WITH_WITNESS(block);
-        bool rewound = stream.Rewind(benchmark::data::block413567.size());
-        assert(rewound);
-
-        BlockValidationState validationState;
-        bool checked = CheckBlock(block, validationState, chainParams->GetConsensus());
-        assert(checked);
-    });
+    CBlock block;
+    bench.unit("block").epochIterations(1)
+        .setup([&] {
+            block = CBlock{};
+            DataStream stream{benchmark::data::block413567};
+            stream >> TX_WITH_WITNESS(block);
+        })
+        .run([&] {
+            BlockValidationState validationState;
+            bool checked = CheckBlock(block, validationState, chainParams->GetConsensus());
+            assert(checked);
+        });
 }
 
 BENCHMARK(DeserializeBlockTest);
-BENCHMARK(DeserializeAndCheckBlockTest);
+BENCHMARK(CheckBlockTest);
diff --git a/src/bench/coin_selection.cpp b/src/bench/coin_selection.cpp
index 2f108a310b4a..74d8e4b6006c 100644
--- a/src/bench/coin_selection.cpp
+++ b/src/bench/coin_selection.cpp
@@ -124,17 +124,14 @@ static CAmount make_hard_case(int utxos, std::vector<OutputGroup>& utxo_pool)
 
 static void BnBExhaustion(benchmark::Bench& bench)
 {
-    // Setup
     std::vector<OutputGroup> utxo_pool;
-
-    bench.run([&] {
-        // Benchmark
-        CAmount target = make_hard_case(17, utxo_pool);
-        (void)SelectCoinsBnB(utxo_pool, target, /*cost_of_change=*/0, MAX_STANDARD_TX_WEIGHT); // Should exhaust
-
-        // Cleanup
-        utxo_pool.clear();
-    });
+    CAmount target;
+    bench.epochIterations(1)
+        .setup([&] { target = make_hard_case(17, utxo_pool); })
+        .run([&] {
+            auto res{SelectCoinsBnB(utxo_pool, target, /*cost_of_change=*/0, MAX_STANDARD_TX_WEIGHT)}; // Should exhaust
+            ankerl::nanobench::doNotOptimizeAway(res);
+        });
 }
 
 BENCHMARK(CoinSelection);
diff --git a/src/bench/load_external.cpp b/src/bench/load_external.cpp
index 3350d16ac020..128d531f97c0 100644
--- a/src/bench/load_external.cpp
+++ b/src/bench/load_external.cpp
@@ -62,12 +62,17 @@ static void LoadExternalBlockFile(benchmark::Bench& bench)
 
     std::multimap<uint256, FlatFilePos> blocks_with_unknown_parent;
     FlatFilePos pos;
-    bench.run([&] {
-        // "rb" is "binary, O_RDONLY", positioned to the start of the file.
-        // The file will be closed by LoadExternalBlockFile().
-        AutoFile file{fsbridge::fopen(blkfile, "rb")};
-        testing_setup->m_node.chainman->LoadExternalBlockFile(file, &pos, &blocks_with_unknown_parent);
-    });
+    bench.epochIterations(1)
+        .setup([&] {
+            blocks_with_unknown_parent.clear();
+            pos = FlatFilePos{};
+        })
+        .run([&] {
+            // "rb" is "binary, O_RDONLY", positioned to the start of the file.
+            // The file will be closed by LoadExternalBlockFile().
+            AutoFile file{fsbridge::fopen(blkfile, "rb")};
+            testing_setup->m_node.chainman->LoadExternalBlockFile(file, &pos, &blocks_with_unknown_parent);
+        });
     fs::remove(blkfile);
 }
 
diff --git a/src/bench/nanobench.h b/src/bench/nanobench.h
index 127240d3c7ea..1f798b848b3d 100644
--- a/src/bench/nanobench.h
+++ b/src/bench/nanobench.h
@@ -137,6 +137,11 @@ class Result;
 class Rng;
 class BigO;
 
+namespace detail {
+template <typename SetupOp>
+class SetupRunner;
+} // namespace detail
+
 /**
  * @brief Renders output from a mustache-like template and benchmark results.
  *
@@ -819,7 +824,7 @@ class Bench {
     /**
      * @brief Minimum time each epoch should take.
      *
-     * Default is zero, so we are fully relying on clockResolutionMultiple(). In most cases this is exactly what you want. If you see
+     * Default is 1ms, so we are mostly relying on clockResolutionMultiple(). In most cases this is exactly what you want. If you see
      * that the evaluation is unreliable with a high `err%`, you can increase either minEpochTime() or minEpochIterations().
      *
      * @see maxEpochTime, minEpochIterations
@@ -1007,7 +1012,21 @@ class Bench {
     Bench& config(Config const& benchmarkConfig);
     ANKERL_NANOBENCH(NODISCARD) Config const& config() const noexcept;
 
+    /**
+     * @brief Configure an untimed setup step per epoch (fluent API).
+     *
+     * Example: `bench.setup(...).run(...);`
+     */
+    template <typename SetupOp>
+    detail::SetupRunner<SetupOp> setup(SetupOp setupOp);
+
 private:
+    template <typename SetupOp, typename Op>
+    Bench& runImpl(SetupOp& setupOp, Op&& op);
+
+    template <typename SetupOp>
+    friend class detail::SetupRunner;
+
     Config mConfig{};
     std::vector<Result> mResults{};
 };
@@ -1207,14 +1226,44 @@ constexpr uint64_t Rng::rotl(uint64_t x, unsigned k) noexcept {
     return (x << k) | (x >> (64U - k));
 }
 
+namespace detail {
+
+template <typename SetupOp>
+class SetupRunner {
+public:
+    explicit SetupRunner(SetupOp setupOp, Bench& bench)
+        : mSetupOp(std::move(setupOp))
+        , mBench(bench) {}
+
+    template <typename Op>
+    ANKERL_NANOBENCH_NO_SANITIZE("integer")
+    Bench& run(Op&& op) {
+        return mBench.runImpl(mSetupOp, std::forward<Op>(op));
+    }
+
+private:
+    SetupOp mSetupOp;
+    Bench& mBench;
+};
+} // namespace detail
+
 template <typename Op>
 ANKERL_NANOBENCH_NO_SANITIZE("integer")
 Bench& Bench::run(Op&& op) {
+    auto setupOp = [] {};
+    return runImpl(setupOp, std::forward<Op>(op));
+}
+
+template <typename SetupOp, typename Op>
+ANKERL_NANOBENCH_NO_SANITIZE("integer")
+Bench& Bench::runImpl(SetupOp& setupOp, Op&& op) {
     // It is important that this method is kept short so the compiler can do better optimizations/ inlining of op()
     detail::IterationLogic iterationLogic(*this);
     auto& pc = detail::performanceCounters();
 
     while (auto n = iterationLogic.numIters()) {
+        setupOp();
+
         pc.beginMeasure();
         Clock::time_point const before = Clock::now();
         while (n-- > 0) {
@@ -1229,6 +1278,11 @@ Bench& Bench::run(Op&& op) {
     return *this;
 }
 
+template <typename SetupOp>
+detail::SetupRunner<SetupOp> Bench::setup(SetupOp setupOp) {
+    return detail::SetupRunner<SetupOp>(std::move(setupOp), *this);
+}
+
 // Performs all evaluations.
 template <typename Op>
 Bench& Bench::run(char const* benchmarkName, Op&& op) {
diff --git a/src/bench/sign_transaction.cpp b/src/bench/sign_transaction.cpp
index 96af48c57248..5405265b230e 100644
--- a/src/bench/sign_transaction.cpp
+++ b/src/bench/sign_transaction.cpp
@@ -42,12 +42,15 @@ static void SignTransactionSingleInput(benchmark::Bench& bench, InputType input_
         keystore.pubkeys.emplace(key_id, pubkey);
 
         // Create specified locking script type
-        CScript prev_spk;
-        switch (input_type) {
-        case InputType::P2WPKH: prev_spk = GetScriptForDestination(WitnessV0KeyHash(pubkey)); break;
-        case InputType::P2TR:   prev_spk = GetScriptForDestination(WitnessV1Taproot(XOnlyPubKey{pubkey})); break;
-        default: assert(false);
-        }
+        CScript prev_spk = [&]() {
+            switch (input_type) {
+            case InputType::P2WPKH:
+                return GetScriptForDestination(WitnessV0KeyHash(pubkey));
+            case InputType::P2TR:
+                return GetScriptForDestination(WitnessV1Taproot(XOnlyPubKey{pubkey}));
+            } // no default case, so the compiler can warn about missing cases
+            assert(false);
+        }();
         prev_spks.push_back(prev_spk);
     }
 
diff --git a/src/bench/streams_findbyte.cpp b/src/bench/streams_findbyte.cpp
index 45e93d777d87..47b2ad740cac 100644
--- a/src/bench/streams_findbyte.cpp
+++ b/src/bench/streams_findbyte.cpp
@@ -22,10 +22,9 @@ static void FindByte(benchmark::Bench& bench)
     file.seek(0, SEEK_SET);
     BufferedFile bf{file, /*nBufSize=*/file_size + 1, /*nRewindIn=*/file_size};
 
-    bench.run([&] {
-        bf.SetPos(0);
-        bf.FindByte(std::byte(1));
-    });
+    bench.epochIterations(1)
+        .setup([&] { bf.SetPos(0); })
+        .run([&] { bf.FindByte(std::byte(1)); });
 
     assert(file.fclose() == 0);
 }
diff --git a/src/bench/strencodings.cpp b/src/bench/strencodings.cpp
index a0767b495fe3..c00de181b544 100644
--- a/src/bench/strencodings.cpp
+++ b/src/bench/strencodings.cpp
@@ -3,7 +3,9 @@
 // file COPYING or http://www.opensource.org/licenses/mit-license.php.
 
 #include <bench/bench.h>
-#include <bench/data/block413567.raw.h>
+#include <consensus/consensus.h>
+#include <crypto/hex_base.h>
+#include <random.h>
 #include <span.h>
 #include <util/strencodings.h>
 
@@ -11,7 +13,8 @@
 
 static void HexStrBench(benchmark::Bench& bench)
 {
-    auto const& data = benchmark::data::block413567;
+    FastRandomContext rng{/*fDeterministic=*/true};
+    auto data{rng.randbytes<std::byte>(MAX_BLOCK_WEIGHT)};
     bench.batch(data.size()).unit("byte").run([&] {
         auto hex = HexStr(data);
         ankerl::nanobench::doNotOptimizeAway(hex);
diff --git a/src/bench/util_time.cpp b/src/bench/util_time.cpp
index bc3e3892f1fe..19ffd0e04985 100644
--- a/src/bench/util_time.cpp
+++ b/src/bench/util_time.cpp
@@ -3,7 +3,7 @@
 // file COPYING or http://www.opensource.org/licenses/mit-license.php.
 
 #include <bench/bench.h>
-
+#include <test/util/time.h>
 #include <util/time.h>
 
 static void BenchTimeDeprecated(benchmark::Bench& bench)
@@ -15,11 +15,10 @@ static void BenchTimeDeprecated(benchmark::Bench& bench)
 
 static void BenchTimeMock(benchmark::Bench& bench)
 {
-    SetMockTime(111);
+    NodeClockContext clock_ctx{111s};
     bench.run([&] {
         (void)GetTime<std::chrono::seconds>();
     });
-    SetMockTime(0);
 }
 
 static void BenchTimeMillis(benchmark::Bench& bench)
diff --git a/src/bench/verify_script.cpp b/src/bench/verify_script.cpp
index e740f86ce036..b0ef4988ce11 100644
--- a/src/bench/verify_script.cpp
+++ b/src/bench/verify_script.cpp
@@ -2,9 +2,10 @@
 // Distributed under the MIT software license, see the accompanying
 // file COPYING or http://www.opensource.org/licenses/mit-license.php.
 
+#include <addresstype.h>
 #include <bench/bench.h>
-#include <hash.h>
 #include <key.h>
+#include <policy/policy.h>
 #include <primitives/transaction.h>
 #include <pubkey.h>
 #include <script/interpreter.h>
@@ -12,44 +13,54 @@
 #include <span.h>
 #include <test/util/transaction_utils.h>
 #include <uint256.h>
+#include <util/translation.h>
 
 #include <array>
 #include <cassert>
 #include <cstdint>
 #include <vector>
 
-// Microbenchmark for verification of a basic P2WPKH script. Can be easily
-// modified to measure performance of other types of scripts.
-static void VerifyScriptBench(benchmark::Bench& bench)
+enum class ScriptType {
+    P2WPKH, // segwitv0, witness-pubkey-hash (ECDSA signature)
+    P2TR,   // segwitv1, taproot key-path spend (Schnorr signature)
+};
+
+// Microbenchmark for verification of standard scripts.
+static void VerifyScriptBench(benchmark::Bench& bench, ScriptType script_type)
 {
     ECC_Context ecc_context{};
 
-    const script_verify_flags flags{SCRIPT_VERIFY_WITNESS | SCRIPT_VERIFY_P2SH};
-    const int witnessversion = 0;
+    // Create deterministic key material needed for output script creation / signing
+    CKey privkey;
+    privkey.Set(uint256::ONE.begin(), uint256::ONE.end(), /*fCompressedIn=*/true);
+    CPubKey pubkey = privkey.GetPubKey();
+    CKeyID key_id = pubkey.GetID();
+
+    FlatSigningProvider keystore;
+    keystore.keys.emplace(key_id, privkey);
+    keystore.pubkeys.emplace(key_id, pubkey);
 
-    // Key pair.
-    CKey key;
-    static const std::array<unsigned char, 32> vchKey = {
-        {
-            0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 1
-        }
-    };
-    key.Set(vchKey.begin(), vchKey.end(), false);
-    CPubKey pubkey = key.GetPubKey();
-    uint160 pubkeyHash;
-    CHash160().Write(pubkey).Finalize(pubkeyHash);
+    // Create crediting and spending transactions with provided input type
+    const auto dest{[&]() -> CTxDestination {
+        switch (script_type) {
+        case ScriptType::P2WPKH: return WitnessV0KeyHash(pubkey);
+        case ScriptType::P2TR: return WitnessV1Taproot(XOnlyPubKey{pubkey});
+        } // no default case, so the compiler can warn about missing cases
+        assert(false);
+    }()};
+    const CMutableTransaction& txCredit = BuildCreditingTransaction(GetScriptForDestination(dest), 1);
+    CMutableTransaction txSpend = BuildSpendingTransaction(/*scriptSig=*/{}, /*scriptWitness=*/{}, CTransaction(txCredit));
 
-    // Script.
-    CScript scriptPubKey = CScript() << witnessversion << ToByteVector(pubkeyHash);
-    CScript scriptSig;
-    CScript witScriptPubkey = CScript() << OP_DUP << OP_HASH160 << ToByteVector(pubkeyHash) << OP_EQUALVERIFY << OP_CHECKSIG;
-    const CMutableTransaction& txCredit = BuildCreditingTransaction(scriptPubKey, 1);
-    CMutableTransaction txSpend = BuildSpendingTransaction(scriptSig, CScriptWitness(), CTransaction(txCredit));
-    CScriptWitness& witness = txSpend.vin[0].scriptWitness;
-    witness.stack.emplace_back();
-    key.Sign(SignatureHash(witScriptPubkey, txSpend, 0, SIGHASH_ALL, txCredit.vout[0].nValue, SigVersion::WITNESS_V0), witness.stack.back());
-    witness.stack.back().push_back(static_cast<unsigned char>(SIGHASH_ALL));
-    witness.stack.push_back(ToByteVector(pubkey));
+    // Sign spending transaction, precompute transaction data
+    PrecomputedTransactionData txdata;
+    {
+        std::map<COutPoint, Coin> coins;
+        coins[txSpend.vin[0].prevout] = Coin(txCredit.vout[0], /*nHeightIn=*/100, /*fCoinBaseIn=*/false);
+        std::map<int, bilingual_str> input_errors;
+        bool complete = SignTransaction(txSpend, &keystore, coins, SIGHASH_ALL, input_errors);
+        assert(complete);
+        txdata.Init(txSpend, /*spent_outputs=*/{txCredit.vout[0]});
+    }
 
     // Benchmark.
     bench.run([&] {
@@ -58,14 +69,17 @@ static void VerifyScriptBench(benchmark::Bench& bench)
             txSpend.vin[0].scriptSig,
             txCredit.vout[0].scriptPubKey,
             &txSpend.vin[0].scriptWitness,
-            flags,
-            MutableTransactionSignatureChecker(&txSpend, 0, txCredit.vout[0].nValue, MissingDataBehavior::ASSERT_FAIL),
+            STANDARD_SCRIPT_VERIFY_FLAGS,
+            MutableTransactionSignatureChecker(&txSpend, 0, txCredit.vout[0].nValue, txdata, MissingDataBehavior::ASSERT_FAIL),
             &err);
         assert(err == SCRIPT_ERR_OK);
         assert(success);
     });
 }
 
+static void VerifyScriptP2WPKH(benchmark::Bench& bench) { VerifyScriptBench(bench, ScriptType::P2WPKH); }
+static void VerifyScriptP2TR(benchmark::Bench& bench)   { VerifyScriptBench(bench, ScriptType::P2TR);   }
+
 static void VerifyNestedIfScript(benchmark::Bench& bench)
 {
     std::vector<std::vector<unsigned char>> stack;
@@ -87,5 +101,6 @@ static void VerifyNestedIfScript(benchmark::Bench& bench)
     });
 }
 
-BENCHMARK(VerifyScriptBench);
+BENCHMARK(VerifyScriptP2WPKH);
+BENCHMARK(VerifyScriptP2TR);
 BENCHMARK(VerifyNestedIfScript);
diff --git a/src/bench/wallet_balance.cpp b/src/bench/wallet_balance.cpp
index 03774ef54acd..45f23494280a 100644
--- a/src/bench/wallet_balance.cpp
+++ b/src/bench/wallet_balance.cpp
@@ -10,6 +10,7 @@
 #include <sync.h>
 #include <test/util/mining.h>
 #include <test/util/setup_common.h>
+#include <test/util/time.h>
 #include <uint256.h>
 #include <util/time.h>
 #include <validation.h>
@@ -32,7 +33,7 @@ static void WalletBalance(benchmark::Bench& bench, const bool set_dirty, const b
 
     // Set clock to genesis block, so the descriptors/keys creation time don't interfere with the blocks scanning process.
     // The reason is 'generatetoaddress', which creates a chain with deterministic timestamps in the past.
-    SetMockTime(test_setup->m_node.chainman->GetParams().GenesisBlock().nTime);
+    NodeClockContext clock_ctx{test_setup->m_node.chainman->GetParams().GenesisBlock().Time()};
     CWallet wallet{test_setup->m_node.chain.get(), "", CreateMockableWalletDatabase()};
     {
         LOCK(wallet.cs_wallet);
diff --git a/src/bench/wallet_create.cpp b/src/bench/wallet_create.cpp
index 1c92beddec29..d29ef339d126 100644
--- a/src/bench/wallet_create.cpp
+++ b/src/bench/wallet_create.cpp
@@ -44,16 +44,19 @@ static void WalletCreate(benchmark::Bench& bench, bool encrypted)
     bilingual_str error_string;
     std::vector<bilingual_str> warnings;
 
-    auto wallet_path = fs::PathToString(test_setup->m_path_root / "test_wallet");
+    const auto wallet_path = test_setup->m_path_root / "test_wallet";
+    const auto wallet_name = fs::PathToString(wallet_path);
+
     bench.run([&] {
-        auto wallet = CreateWallet(context, wallet_path, /*load_on_start=*/std::nullopt, options, status, error_string, warnings);
+        auto wallet = CreateWallet(context, wallet_name, /*load_on_start=*/std::nullopt, options, status, error_string, warnings);
         assert(status == DatabaseStatus::SUCCESS);
         assert(wallet != nullptr);
 
         // Release wallet
         RemoveWallet(context, wallet, /*load_on_start=*/ std::nullopt);
         WaitForDeleteWallet(std::move(wallet));
-        fs::remove_all(wallet_path);
+        fs::remove(wallet_path / "wallet.dat");
+        fs::remove(wallet_path);
     });
 }
 
diff --git a/src/bench/wallet_create_tx.cpp b/src/bench/wallet_create_tx.cpp
index 8ff1e39a2f83..11125e26fed0 100644
--- a/src/bench/wallet_create_tx.cpp
+++ b/src/bench/wallet_create_tx.cpp
@@ -20,6 +20,7 @@
 #include <script/script.h>
 #include <sync.h>
 #include <test/util/setup_common.h>
+#include <test/util/time.h>
 #include <uint256.h>
 #include <util/result.h>
 #include <util/time.h>
@@ -117,7 +118,7 @@ static void WalletCreateTx(benchmark::Bench& bench, const OutputType output_type
     const auto test_setup = MakeNoLogFileContext<const TestingSetup>();
 
     // Set clock to genesis block, so the descriptors/keys creation time don't interfere with the blocks scanning process.
-    SetMockTime(test_setup->m_node.chainman->GetParams().GenesisBlock().nTime);
+    NodeClockContext clock_ctx{test_setup->m_node.chainman->GetParams().GenesisBlock().Time()};
     CWallet wallet{test_setup->m_node.chain.get(), "", CreateMockableWalletDatabase()};
     {
         LOCK(wallet.cs_wallet);
@@ -172,7 +173,7 @@ static void AvailableCoins(benchmark::Bench& bench, const std::vector<OutputType
 {
     const auto test_setup = MakeNoLogFileContext<const TestingSetup>();
     // Set clock to genesis block, so the descriptors/keys creation time don't interfere with the blocks scanning process.
-    SetMockTime(test_setup->m_node.chainman->GetParams().GenesisBlock().nTime);
+    NodeClockContext clock_ctx{test_setup->m_node.chainman->GetParams().GenesisBlock().Time()};
     CWallet wallet{test_setup->m_node.chain.get(), "", CreateMockableWalletDatabase()};
     {
         LOCK(wallet.cs_wallet);
diff --git a/src/bench/wallet_encrypt.cpp b/src/bench/wallet_encrypt.cpp
new file mode 100644
index 000000000000..3d73081c7cc7
--- /dev/null
+++ b/src/bench/wallet_encrypt.cpp
@@ -0,0 +1,82 @@
+// Copyright (c) 2025-present The Bitcoin Core developers
+// Distributed under the MIT software license, see the accompanying
+// file COPYING or https://www.opensource.org/licenses/mit-license.php.
+
+#include <bench/bench.h>
+#include <key_io.h>
+#include <outputtype.h>
+#include <random.h>
+#include <support/allocators/secure.h>
+#include <test/util/setup_common.h>
+#include <util/time.h>
+#include <wallet/context.h>
+#include <wallet/test/util.h>
+#include <wallet/wallet.h>
+#include <wallet/walletutil.h>
+
+#include <cassert>
+
+namespace wallet {
+static void WalletEncrypt(benchmark::Bench& bench, unsigned int key_count)
+{
+    auto test_setup = MakeNoLogFileContext<TestingSetup>();
+    FastRandomContext rand{/*fDeterministic=*/true};
+
+    auto password{rand.randbytes(20)};
+    SecureString secure_pass{password.begin(), password.end()};
+
+    WalletContext context;
+    context.args = &test_setup->m_args;
+    context.chain = test_setup->m_node.chain.get();
+
+    uint64_t create_flags = WALLET_FLAG_DESCRIPTORS;
+    auto database = CreateMockableWalletDatabase();
+    auto wallet = TestCreateWallet(std::move(database), context, create_flags);
+
+    {
+        LOCK(wallet->cs_wallet);
+        for (unsigned int i = 0; i < key_count; i++) {
+            CKey key = GenerateRandomKey();
+            FlatSigningProvider keys;
+            std::string error;
+            std::vector<std::unique_ptr<Descriptor>> desc = Parse("combo(" + EncodeSecret(key) + ")", keys, error, /*require_checksum=*/false);
+            WalletDescriptor w_desc(std::move(desc.at(0)), /*creation_time=*/0, /*range_start=*/0, /*range_end=*/0, /*next_index=*/0);
+            Assert(wallet->AddWalletDescriptor(w_desc, keys, /*label=*/"", /*internal=*/false));
+        }
+    }
+
+    database = DuplicateMockDatabase(wallet->GetDatabase());
+
+    // reload the wallet for the actual benchmark
+    TestUnloadWallet(std::move(wallet));
+
+    // Setting a mock time is necessary to force default derive iteration count during
+    // wallet encryption.
+    SetMockTime(1);
+
+    // This benchmark has a lot of overhead, this should be good enough to catch
+    // any regressions, but for an accurate measurement of how long wallet
+    // encryption takes, this should be reworked after something like
+    // https://github.com/bitcoin/bitcoin/pull/34208 is merged.
+    bench.batch(key_count).unit("key").run([&] {
+        wallet = TestLoadWallet(std::move(database), context);
+
+        // Save a copy of the db before encrypting
+        database = DuplicateMockDatabase(wallet->GetDatabase());
+
+        wallet->EncryptWallet(secure_pass);
+
+        for (const auto& [_, key] : wallet->mapMasterKeys){
+            assert(key.nDeriveIterations == CMasterKey::DEFAULT_DERIVE_ITERATIONS);
+        }
+
+        TestUnloadWallet(std::move(wallet));
+    });
+}
+
+constexpr unsigned int KEY_COUNT = 2000;
+
+static void WalletEncryptDescriptors(benchmark::Bench& bench) { WalletEncrypt(bench, /*key_count=*/KEY_COUNT); }
+BENCHMARK(WalletEncryptDescriptors);
+
+} // namespace wallet
diff --git a/src/bitcoin-cli.cpp b/src/bitcoin-cli.cpp
index 909ed09faaca..cc195226e9e1 100644
--- a/src/bitcoin-cli.cpp
+++ b/src/bitcoin-cli.cpp
@@ -8,9 +8,13 @@
 #include <chainparamsbase.h>
 #include <clientversion.h>
 #include <common/args.h>
+#include <common/license_info.h>
 #include <common/system.h>
 #include <compat/compat.h>
 #include <compat/stdin.h>
+#include <interfaces/init.h>
+#include <interfaces/ipc.h>
+#include <interfaces/rpc.h>
 #include <policy/feerate.h>
 #include <rpc/client.h>
 #include <rpc/mining.h>
@@ -89,7 +93,7 @@ static void SetupCliArgs(ArgsManager& argsman)
                              "RPC generatetoaddress nblocks and maxtries arguments. Example: bitcoin-cli -generate 4 1000",
                              DEFAULT_NBLOCKS, DEFAULT_MAX_TRIES),
                    ArgsManager::ALLOW_ANY, OptionsCategory::CLI_COMMANDS);
-    argsman.AddArg("-addrinfo", "Get the number of addresses known to the node, per network and total, after filtering for quality and recency. The total number of addresses known to the node may be higher.", ArgsManager::ALLOW_ANY, OptionsCategory::CLI_COMMANDS);
+    argsman.AddArg("-addrinfo", "Get the number of addresses known to the node, per network and total.", ArgsManager::ALLOW_ANY, OptionsCategory::CLI_COMMANDS);
     argsman.AddArg("-getinfo", "Get general information from the remote server. Note that unlike server-side RPC calls, the output of -getinfo is the result of multiple non-atomic requests. Some entries in the output may represent results from different states (e.g. wallet balance may be as of a different block from the chain state reported)", ArgsManager::ALLOW_ANY, OptionsCategory::CLI_COMMANDS);
     argsman.AddArg("-netinfo", strprintf("Get network peer connection information from the remote server. An optional argument from 0 to %d can be passed for different peers listings (default: 0). If a non-zero value is passed, an additional \"outonly\" (or \"o\") argument can be passed to see outbound peers only. Pass \"help\" (or \"h\") for detailed help documentation.", NETINFO_MAX_LEVEL), ArgsManager::ALLOW_ANY, OptionsCategory::CLI_COMMANDS);
 
@@ -108,6 +112,7 @@ static void SetupCliArgs(ArgsManager& argsman)
     argsman.AddArg("-stdin", "Read extra arguments from standard input, one per line until EOF/Ctrl-D (recommended for sensitive information such as passphrases). When combined with -stdinrpcpass, the first line from standard input is used for the RPC password.", ArgsManager::ALLOW_ANY, OptionsCategory::OPTIONS);
     argsman.AddArg("-stdinrpcpass", "Read RPC password from standard input as a single line. When combined with -stdin, the first line from standard input is used for the RPC password. When combined with -stdinwalletpassphrase, -stdinrpcpass consumes the first line, and -stdinwalletpassphrase consumes the second.", ArgsManager::ALLOW_ANY, OptionsCategory::OPTIONS);
     argsman.AddArg("-stdinwalletpassphrase", "Read wallet passphrase from standard input as a single line. When combined with -stdin, the first line from standard input is used for the wallet passphrase.", ArgsManager::ALLOW_ANY, OptionsCategory::OPTIONS);
+    argsman.AddArg("-ipcconnect=<address>", "Connect to bitcoin-node through IPC socket instead of TCP socket to execute requests. Valid <address> values are 'auto' to try to connect to default socket path at <datadir>/node.sock but fall back to TCP if it is not available, 'unix' to connect to the default socket and fail if it isn't available, or 'unix:<socket path>' to connect to a socket at a nonstandard path. -noipcconnect can be specified to avoid attempting to use IPC at all. Default value: auto", ArgsManager::ALLOW_ANY, OptionsCategory::IPC);
 }
 
 std::optional<std::string> RpcWalletName(const ArgsManager& args)
@@ -279,33 +284,32 @@ struct AddrinfoRequestHandler : BaseRequestHandler {
         if (!args.empty()) {
             throw std::runtime_error("-addrinfo takes no arguments");
         }
-        UniValue params{RPCConvertValues("getnodeaddresses", std::vector<std::string>{{"0"}})};
-        return JSONRPCRequestObj("getnodeaddresses", params, 1);
+        return JSONRPCRequestObj("getaddrmaninfo", NullUniValue, 1);
     }
 
     UniValue ProcessReply(const UniValue& reply) override
     {
-        if (!reply["error"].isNull()) return reply;
-        const std::vector<UniValue>& nodes{reply["result"].getValues()};
-        if (!nodes.empty() && nodes.at(0)["network"].isNull()) {
-            throw std::runtime_error("-addrinfo requires bitcoind server to be running v22.0 and up");
-        }
-        // Count the number of peers known to our node, by network.
-        std::array<uint64_t, NETWORKS.size()> counts{{}};
-        for (const UniValue& node : nodes) {
-            std::string network_name{node["network"].get_str()};
-            const int8_t network_id{NetworkStringToId(network_name)};
-            if (network_id == UNKNOWN_NETWORK) continue;
-            ++counts.at(network_id);
+        if (!reply["error"].isNull()) {
+            if (reply["error"]["code"].getInt<int>() == RPC_METHOD_NOT_FOUND) {
+                throw std::runtime_error("-addrinfo requires bitcoind v26.0 or later which supports getaddrmaninfo RPC. Please upgrade your node or use bitcoin-cli from the same version.");
+            }
+            return reply;
         }
+        // Process getaddrmaninfo reply
+        const std::vector<std::string>& network_types{reply["result"].getKeys()};
+        const std::vector<UniValue>& addrman_counts{reply["result"].getValues()};
+
         // Prepare result to return to user.
         UniValue result{UniValue::VOBJ}, addresses{UniValue::VOBJ};
-        uint64_t total{0}; // Total address count
-        for (size_t i = 1; i < NETWORKS.size() - 1; ++i) {
-            addresses.pushKV(NETWORKS[i], counts.at(i));
-            total += counts.at(i);
+
+        for (size_t i = 0; i < network_types.size(); ++i) {
+            int addr_count = addrman_counts[i]["total"].getInt<int>();
+            if (network_types[i] == "all_networks") {
+                addresses.pushKV("total", addr_count);
+            } else {
+                addresses.pushKV(network_types[i], addr_count);
+            }
         }
-        addresses.pushKV("total", total);
         result.pushKV("addresses_known", std::move(addresses));
         return JSONRPCReplyObj(std::move(result), NullUniValue, /*id=*/1, JSONRPCVersion::V2);
     }
@@ -792,7 +796,40 @@ struct DefaultRequestHandler : BaseRequestHandler {
     }
 };
 
-static UniValue CallRPC(BaseRequestHandler* rh, const std::string& strMethod, const std::vector<std::string>& args, const std::optional<std::string>& rpcwallet = {})
+static std::optional<UniValue> CallIPC(BaseRequestHandler* rh, const std::string& strMethod, const std::vector<std::string>& args, const std::string& endpoint, const std::string& username)
+{
+    auto ipcconnect{gArgs.GetArg("-ipcconnect", "auto")};
+    if (ipcconnect == "0") return {}; // Do not attempt IPC if -ipcconnect is disabled.
+    if (gArgs.IsArgSet("-rpcconnect") && !gArgs.IsArgNegated("-rpcconnect")) {
+        if (ipcconnect == "auto") return {}; // Use HTTP if -ipcconnect=auto is set and -rpcconnect is enabled.
+        throw std::runtime_error("-rpcconnect and -ipcconnect options cannot both be enabled");
+    }
+
+    std::unique_ptr<interfaces::Init> local_init{interfaces::MakeBasicInit("bitcoin-cli")};
+    if (!local_init || !local_init->ipc()) {
+        if (ipcconnect == "auto") return {}; // Use HTTP if -ipcconnect=auto is set and there is no IPC support.
+        throw std::runtime_error("bitcoin-cli was not built with IPC support");
+    }
+
+    std::unique_ptr<interfaces::Init> node_init;
+    try {
+        node_init = local_init->ipc()->connectAddress(ipcconnect);
+        if (!node_init) return {}; // Fall back to HTTP if -ipcconnect=auto connect failed.
+    } catch (const std::exception& e) {
+        // Catch connect error if -ipcconnect=unix was specified
+        throw CConnectionFailed{strprintf("%s\n\n"
+            "Probably bitcoin-node is not running or not listening on a unix socket. Can be started with:\n\n"
+            "    bitcoin-node -chain=%s -ipcbind=unix", e.what(), gArgs.GetChainTypeString())};
+    }
+
+    std::unique_ptr<interfaces::Rpc> rpc{node_init->makeRpc()};
+    assert(rpc);
+    UniValue request{rh->PrepareRequest(strMethod, args)};
+    UniValue reply{rpc->executeRpc(std::move(request), endpoint, username)};
+    return rh->ProcessReply(reply);
+}
+
+static UniValue CallRPC(BaseRequestHandler* rh, const std::string& strMethod, const std::vector<std::string>& args, const std::string& endpoint, const std::string& username)
 {
     std::string host;
     // In preference order, we choose the following for the port:
@@ -865,15 +902,13 @@ static UniValue CallRPC(BaseRequestHandler* rh, const std::string& strMethod, co
     evhttp_request_set_error_cb(req.get(), http_error_cb);
 
     // Get credentials
-    std::string strRPCUserColonPass;
-    bool failedToGetAuthCookie = false;
+    std::string rpc_credentials;
+    std::optional<AuthCookieResult> auth_cookie_result;
     if (gArgs.GetArg("-rpcpassword", "") == "") {
         // Try fall back to cookie-based authentication if no password is provided
-        if (!GetAuthCookie(&strRPCUserColonPass)) {
-            failedToGetAuthCookie = true;
-        }
+        auth_cookie_result = GetAuthCookie(rpc_credentials);
     } else {
-        strRPCUserColonPass = gArgs.GetArg("-rpcuser", "") + ":" + gArgs.GetArg("-rpcpassword", "");
+        rpc_credentials = username + ":" + gArgs.GetArg("-rpcpassword", "");
     }
 
     struct evkeyvalq* output_headers = evhttp_request_get_output_headers(req.get());
@@ -881,7 +916,7 @@ static UniValue CallRPC(BaseRequestHandler* rh, const std::string& strMethod, co
     evhttp_add_header(output_headers, "Host", host.c_str());
     evhttp_add_header(output_headers, "Connection", "close");
     evhttp_add_header(output_headers, "Content-Type", "application/json");
-    evhttp_add_header(output_headers, "Authorization", (std::string("Basic ") + EncodeBase64(strRPCUserColonPass)).c_str());
+    evhttp_add_header(output_headers, "Authorization", (std::string("Basic ") + EncodeBase64(rpc_credentials)).c_str());
 
     // Attach request data
     std::string strRequest = rh->PrepareRequest(strMethod, args).write() + "\n";
@@ -889,17 +924,6 @@ static UniValue CallRPC(BaseRequestHandler* rh, const std::string& strMethod, co
     assert(output_buffer);
     evbuffer_add(output_buffer, strRequest.data(), strRequest.size());
 
-    // check if we should use a special wallet endpoint
-    std::string endpoint = "/";
-    if (rpcwallet) {
-        char* encodedURI = evhttp_uriencode(rpcwallet->data(), rpcwallet->size(), false);
-        if (encodedURI) {
-            endpoint = "/wallet/" + std::string(encodedURI);
-            free(encodedURI);
-        } else {
-            throw CConnectionFailed("uri-encode failed");
-        }
-    }
     int r = evhttp_make_request(evcon.get(), req.release(), EVHTTP_REQ_POST, endpoint.c_str());
     if (r != 0) {
         throw CConnectionFailed("send http request failed");
@@ -917,13 +941,24 @@ static UniValue CallRPC(BaseRequestHandler* rh, const std::string& strMethod, co
                     "Use \"bitcoin-cli -help\" for more info.",
                     host, port, responseErrorMessage));
     } else if (response.status == HTTP_UNAUTHORIZED) {
-        if (failedToGetAuthCookie) {
-            throw std::runtime_error(strprintf(
-                "Could not locate RPC credentials. No authentication cookie could be found, and RPC password is not set.  See -rpcpassword and -stdinrpcpass.  Configuration file: (%s)",
-                fs::PathToString(gArgs.GetConfigFilePath())));
+        std::string error{"Authorization failed: "};
+        if (auth_cookie_result.has_value()) {
+            switch (*auth_cookie_result) {
+            case AuthCookieResult::Error:
+                error += "Failed to read cookie file and no rpcpassword was specified.";
+                break;
+            case AuthCookieResult::Disabled:
+                error += "Cookie file was disabled via -norpccookiefile and no rpcpassword was specified.";
+                break;
+            case AuthCookieResult::Ok:
+                error += "Cookie file credentials were invalid and no rpcpassword was specified.";
+                break;
+            }
         } else {
-            throw std::runtime_error("Authorization failed: Incorrect rpcuser or rpcpassword");
+            error += "Incorrect rpcuser or rpcpassword were specified.";
         }
+        error += strprintf(" Configuration file: (%s)", fs::PathToString(gArgs.GetConfigFilePath()));
+        throw std::runtime_error(error);
     } else if (response.status == HTTP_SERVICE_UNAVAILABLE) {
         throw std::runtime_error(strprintf("Server response: %s", response.body));
     } else if (response.status >= 400 && response.status != HTTP_BAD_REQUEST && response.status != HTTP_NOT_FOUND && response.status != HTTP_INTERNAL_SERVER_ERROR)
@@ -959,9 +994,26 @@ static UniValue ConnectAndCallRPC(BaseRequestHandler* rh, const std::string& str
     const int timeout = gArgs.GetIntArg("-rpcwaittimeout", DEFAULT_WAIT_CLIENT_TIMEOUT);
     const auto deadline{std::chrono::steady_clock::now() + 1s * timeout};
 
+    // check if we should use a special wallet endpoint
+    std::string endpoint = "/";
+    if (rpcwallet) {
+        char* encodedURI = evhttp_uriencode(rpcwallet->data(), rpcwallet->size(), false);
+        if (encodedURI) {
+            endpoint = "/wallet/" + std::string(encodedURI);
+            free(encodedURI);
+        } else {
+            throw CConnectionFailed("uri-encode failed");
+        }
+    }
+
+    std::string username{gArgs.GetArg("-rpcuser", "")};
     do {
         try {
-            response = CallRPC(rh, strMethod, args, rpcwallet);
+            if (auto ipc_response{CallIPC(rh, strMethod, args, endpoint, username)}) {
+                response = std::move(*ipc_response);
+            } else {
+                response = CallRPC(rh, strMethod, args, endpoint, username);
+            }
             if (fWait) {
                 const UniValue& error = response.find_value("error");
                 if (!error.isNull() && error["code"].getInt<int>() == RPC_IN_WARMUP) {
diff --git a/src/bitcoin-tx.cpp b/src/bitcoin-tx.cpp
index fdff656f6008..4a891ad8f187 100644
--- a/src/bitcoin-tx.cpp
+++ b/src/bitcoin-tx.cpp
@@ -8,6 +8,7 @@
 #include <clientversion.h>
 #include <coins.h>
 #include <common/args.h>
+#include <common/license_info.h>
 #include <common/system.h>
 #include <compat/compat.h>
 #include <consensus/amount.h>
@@ -585,8 +586,7 @@ static void MutateTxSign(CMutableTransaction& tx, const std::string& flagStr)
     // starts as a clone of the raw tx:
     CMutableTransaction mergedTx{tx};
     const CMutableTransaction txv{tx};
-    CCoinsView viewDummy;
-    CCoinsViewCache view(&viewDummy);
+    CCoinsViewCache view{&CoinsViewEmpty::Get()};
 
     if (!registers.contains("privatekeys"))
         throw std::runtime_error("privatekeys register variable must be set.");
diff --git a/src/bitcoin-util.cpp b/src/bitcoin-util.cpp
index a6fd026b1470..aa3fd3066792 100644
--- a/src/bitcoin-util.cpp
+++ b/src/bitcoin-util.cpp
@@ -10,6 +10,7 @@
 #include <chainparamsbase.h>
 #include <clientversion.h>
 #include <common/args.h>
+#include <common/license_info.h>
 #include <common/system.h>
 #include <compat/compat.h>
 #include <core_io.h>
diff --git a/src/bitcoin-wallet.cpp b/src/bitcoin-wallet.cpp
index 6811f8c5ea19..9b0136da4c48 100644
--- a/src/bitcoin-wallet.cpp
+++ b/src/bitcoin-wallet.cpp
@@ -8,6 +8,7 @@
 #include <chainparamsbase.h>
 #include <clientversion.h>
 #include <common/args.h>
+#include <common/license_info.h>
 #include <common/system.h>
 #include <compat/compat.h>
 #include <interfaces/init.h>
diff --git a/src/bitcoin.cpp b/src/bitcoin.cpp
index 5d42bb0472c1..827f6cf101e2 100644
--- a/src/bitcoin.cpp
+++ b/src/bitcoin.cpp
@@ -6,6 +6,7 @@
 
 #include <clientversion.h>
 #include <common/args.h>
+#include <common/license_info.h>
 #include <common/system.h>
 #include <util/fs.h>
 #include <util/exec.h>
diff --git a/src/bitcoind.cpp b/src/bitcoind.cpp
index 323e7577a4db..ac7315876830 100644
--- a/src/bitcoind.cpp
+++ b/src/bitcoind.cpp
@@ -9,6 +9,7 @@
 #include <clientversion.h>
 #include <common/args.h>
 #include <common/init.h>
+#include <common/license_info.h>
 #include <common/system.h>
 #include <compat/compat.h>
 #include <init.h>
@@ -224,7 +225,7 @@ static bool AppInit(NodeContext& node)
                 if (token) { // Success
                     exit(EXIT_SUCCESS);
                 } else { // fRet = false or token read error (premature exit).
-                    tfm::format(std::cerr, "Error during initialization - check debug.log for details\n");
+                    tfm::format(std::cerr, "Error during initialization - check %s for details\n", fs::PathToString(LogInstance().m_file_path.filename()));
                     exit(EXIT_FAILURE);
                 }
             }
diff --git a/src/blockencodings.cpp b/src/blockencodings.cpp
index fd5283099027..18799cd80833 100644
--- a/src/blockencodings.cpp
+++ b/src/blockencodings.cpp
@@ -110,8 +110,6 @@ ReadStatus PartiallyDownloadedBlock::InitData(const CBlockHeaderAndShortTxIDs& c
         if (shorttxids.bucket_size(shorttxids.bucket(cmpctblock.shorttxids[i])) > 12)
             return READ_STATUS_FAILED;
     }
-    // TODO: in the shortid-collision case, we should instead request both transactions
-    // which collided. Falling back to full-block-request here is overkill.
     if (shorttxids.size() != cmpctblock.shorttxids.size())
         return READ_STATUS_FAILED; // Short ID collision
 
diff --git a/src/btcsignals.h b/src/btcsignals.h
new file mode 100644
index 000000000000..ebe7a5acb783
--- /dev/null
+++ b/src/btcsignals.h
@@ -0,0 +1,257 @@
+// Copyright (c) The Bitcoin Core developers
+// Distributed under the MIT software license, see the accompanying
+// file COPYING or http://www.opensource.org/licenses/mit-license.php.
+
+#ifndef BITCOIN_BTCSIGNALS_H
+#define BITCOIN_BTCSIGNALS_H
+
+#include <sync.h>
+
+#include <algorithm>
+#include <atomic>
+#include <functional>
+#include <memory>
+#include <optional>
+#include <type_traits>
+#include <utility>
+#include <vector>
+
+/**
+ * btcsignals is a simple mechanism for signaling events to multiple subscribers.
+ * It is api-compatible with a minimal subset of boost::signals2.
+ *
+ * Rather than using a custom slot type, and the features/complexity that they
+ * imply, std::function is used to store the callbacks. Lifetime management of
+ * the callbacks is left up to the user.
+ *
+ * All usage is thread-safe except for interacting with a connection while
+ * copying/moving it on another thread.
+ */
+
+namespace btcsignals {
+
+/*
+ * optional_last_value is the default and only supported combiner.
+ * As such, its behavior is embedded into the signal functor.
+ *
+ * Because optional<void> is undefined, void must be special-cased.
+ */
+
+template <typename T>
+class optional_last_value
+{
+public:
+    using result_type = std::conditional_t<std::is_void_v<T>, void, std::optional<T>>;
+};
+
+template <typename Signature, typename Combiner = optional_last_value<typename std::function<Signature>::result_type>>
+class signal;
+
+/*
+ * State object representing the liveness of a registered callback.
+ * signal::connect() returns an enabled connection which can be held and
+ * disabled in the future.
+ */
+class connection
+{
+    template <typename Signature, typename Combiner>
+    friend class signal;
+    /**
+     * Track liveness. Also serves as a tag for the constructor used by signal.
+     */
+    class liveness
+    {
+        friend class connection;
+        std::atomic_bool m_connected{true};
+
+        void disconnect() { m_connected.store(false); }
+    public:
+        bool connected() const { return m_connected.load(); }
+    };
+
+    /**
+     * connections have shared_ptr-like copy and move semantics.
+     */
+    std::shared_ptr<liveness> m_state{};
+
+    /**
+     * Only a signal can create an enabled connection.
+     */
+    explicit connection(std::shared_ptr<liveness>&& state) : m_state{std::move(state)}{}
+
+public:
+    /**
+     * The default constructor creates a connection with no associated signal
+     */
+    constexpr connection() noexcept = default;
+
+    /**
+     * If a callback is associated with this connection, prevent it from being
+     * called in the future.
+     *
+     * If a connection is disabled as part of a signal's callback function, it
+     * will _not_ be executed in the current signal invocation.
+     *
+     * Note that disconnected callbacks are not removed from their owning
+     * signals here. They are garbage collected in signal::connect().
+     */
+    void disconnect()
+    {
+        if (m_state) {
+            m_state->disconnect();
+        }
+    }
+
+    /**
+     * Returns true if this connection was created by a signal and has not been
+     * disabled.
+     */
+    bool connected() const
+    {
+        return m_state && m_state->connected();
+    }
+};
+
+/*
+ * RAII-style connection management
+ */
+class scoped_connection
+{
+    connection m_conn;
+
+public:
+    scoped_connection(connection rhs) noexcept : m_conn{std::move(rhs)} {}
+
+    scoped_connection(scoped_connection&&) noexcept = default;
+    scoped_connection& operator=(scoped_connection&&) noexcept = default;
+
+    /**
+     * For simplicity, disable copy assignment and construction.
+     */
+    scoped_connection& operator=(const scoped_connection&) = delete;
+    scoped_connection(const scoped_connection&) = delete;
+
+    void disconnect()
+    {
+        m_conn.disconnect();
+    }
+
+    ~scoped_connection()
+    {
+        disconnect();
+    }
+};
+
+/*
+ * Functor for calling zero or more connected callbacks
+ */
+template <typename Signature, typename Combiner>
+class signal
+{
+    using function_type = std::function<Signature>;
+
+    static_assert(std::is_same_v<Combiner, optional_last_value<typename function_type::result_type>>, "only the optional_last_value combiner is supported");
+
+    /*
+     * Helper struct for maintaining a callback and its associated connection liveness
+     */
+    struct connection_holder : connection::liveness {
+        template <typename Callable>
+        connection_holder(Callable&& callback) : m_callback{std::forward<Callable>(callback)}
+        {
+        }
+
+        const function_type m_callback;
+    };
+
+    mutable Mutex m_mutex;
+
+    std::vector<std::shared_ptr<connection_holder>> m_connections GUARDED_BY(m_mutex){};
+
+public:
+    using result_type = Combiner::result_type;
+
+    constexpr signal() noexcept = default;
+    ~signal() = default;
+
+    /*
+     * For simplicity, disable all moving/copying/assigning.
+     */
+    signal(const signal&) = delete;
+    signal(signal&&) = delete;
+    signal& operator=(const signal&) = delete;
+    signal& operator=(signal&&) = delete;
+
+    /*
+     * Execute all enabled callbacks for the signal. Rather than allowing for
+     * custom combiners, the behavior of optional_last_value is hard-coded
+     * here. Return the value of the last executed callback, or nullopt if none
+     * were executed.
+     *
+     * Callbacks which return void require special handling.
+     *
+     * In order to avoid locking during the callbacks, the list of callbacks is
+     * cached before they are called. This allows a callback to call connect(),
+     * but the newly connected callback will not be run during the current
+     * signal invocation.
+     *
+     * Note that the parameters are accepted as universal references, though
+     * they are not perfectly forwarded as that could cause a use-after-move if
+     * more than one callback is enabled.
+     */
+    template <typename... Args>
+    result_type operator()(Args&&... args) const EXCLUSIVE_LOCKS_REQUIRED(!m_mutex)
+    {
+        std::vector<std::shared_ptr<connection_holder>> connections;
+        {
+            LOCK(m_mutex);
+            connections = m_connections;
+        }
+        if constexpr (std::is_void_v<result_type>) {
+            for (const auto& connection : connections) {
+                if (connection->connected()) {
+                    connection->m_callback(args...);
+                }
+            }
+        } else {
+            result_type ret{std::nullopt};
+            for (const auto& connection : connections) {
+                if (connection->connected()) {
+                    ret.emplace(connection->m_callback(args...));
+                }
+            }
+            return ret;
+        }
+    }
+
+    /*
+     * Connect a new callback to the signal. A forwarding callable accepts
+     * anything that can be stored in a std::function.
+     */
+    template <typename Callable>
+    connection connect(Callable&& func) EXCLUSIVE_LOCKS_REQUIRED(!m_mutex)
+    {
+        LOCK(m_mutex);
+
+        // Garbage-collect disconnected connections to prevent unbounded growth
+        std::erase_if(m_connections, [](const auto& holder) { return !holder->connected(); });
+
+        const auto& entry = m_connections.emplace_back(std::make_shared<connection_holder>(std::forward<Callable>(func)));
+        return connection(entry);
+    }
+
+    /*
+     * Returns true if there are no enabled callbacks
+     */
+    [[nodiscard]] bool empty() const EXCLUSIVE_LOCKS_REQUIRED(!m_mutex)
+    {
+        LOCK(m_mutex);
+        return std::ranges::none_of(m_connections, [](const auto& holder) {
+            return holder->connected();
+        });
+    }
+};
+
+} // namespace btcsignals
+
+#endif // BITCOIN_BTCSIGNALS_H
diff --git a/src/clientversion.cpp b/src/clientversion.cpp
index 86610112ba0a..222dafb329c6 100644
--- a/src/clientversion.cpp
+++ b/src/clientversion.cpp
@@ -6,10 +6,8 @@
 
 #include <clientversion.h>
 
-#include <util/string.h>
-#include <util/translation.h>
-
 #include <tinyformat.h>
+#include <util/string.h>
 
 #include <string>
 #include <vector>
@@ -70,34 +68,3 @@ std::string FormatSubVersion(const std::string& name, int nClientVersion, const
     if (!comments.empty()) comments_str = strprintf("(%s)", Join(comments, "; "));
     return strprintf("/%s:%s%s/", name, FormatVersion(nClientVersion), comments_str);
 }
-
-std::string CopyrightHolders(const std::string& strPrefix)
-{
-    const auto copyright_devs = strprintf(_(COPYRIGHT_HOLDERS), COPYRIGHT_HOLDERS_SUBSTITUTION).translated;
-    std::string strCopyrightHolders = strPrefix + copyright_devs;
-
-    // Make sure Bitcoin Core copyright is not removed by accident
-    if (copyright_devs.find("Bitcoin Core") == std::string::npos) {
-        strCopyrightHolders += "\n" + strPrefix + "The Bitcoin Core developers";
-    }
-    return strCopyrightHolders;
-}
-
-std::string LicenseInfo()
-{
-    const std::string URL_SOURCE_CODE = "<https://github.com/bitcoin/bitcoin>";
-
-    return CopyrightHolders(strprintf(_("Copyright (C) %i-%i"), 2009, COPYRIGHT_YEAR).translated + " ") + "\n" +
-           "\n" +
-           strprintf(_("Please contribute if you find %s useful. "
-                       "Visit %s for further information about the software."),
-                     CLIENT_NAME, "<" CLIENT_URL ">")
-               .translated +
-           "\n" +
-           strprintf(_("The source code is available from %s."), URL_SOURCE_CODE).translated +
-           "\n" +
-           "\n" +
-           _("This is experimental software.") + "\n" +
-           strprintf(_("Distributed under the MIT software license, see the accompanying file %s or %s"), "COPYING", "<https://opensource.org/license/MIT>").translated +
-           "\n";
-}
diff --git a/src/clientversion.h b/src/clientversion.h
index 9d09e502accc..f4822a12b69a 100644
--- a/src/clientversion.h
+++ b/src/clientversion.h
@@ -34,11 +34,6 @@ extern const std::string UA_NAME;
 std::string FormatFullVersion();
 std::string FormatSubVersion(const std::string& name, int nClientVersion, const std::vector<std::string>& comments);
 
-std::string CopyrightHolders(const std::string& strPrefix);
-
-/** Returns licensing information (for -version) */
-std::string LicenseInfo();
-
 #endif // RC_INVOKED
 
 #endif // BITCOIN_CLIENTVERSION_H
diff --git a/src/cluster_linearize.h b/src/cluster_linearize.h
index 774bc61734f0..237efd89fee8 100644
--- a/src/cluster_linearize.h
+++ b/src/cluster_linearize.h
@@ -709,10 +709,14 @@ class SFLDefaultCostModel
  *     feerate diagram increases by at least gain/2), while self-merges do not change it.
  *
  * - How to decide the exact output linearization:
- *   - When there are multiple equal-feerate chunks with no dependencies between them, output a
- *     uniformly random one among the ones with no missing dependent chunks first.
- *   - Within chunks, repeatedly pick a uniformly random transaction among those with no missing
- *     dependencies.
+ *   - When there are multiple equal-feerate chunks with no dependencies between them, pick the
+ *     smallest one first. If there are multiple smallest ones, pick the one that contains the
+ *     last transaction (according to the provided fallback order) last (note that this is not the
+ *     same as picking the chunk with the first transaction first).
+ *   - Within chunks, pick among all transactions without missing dependencies the one with the
+ *     highest individual feerate. If there are multiple ones with the same individual feerate,
+ *     pick the smallest first. If there are multiple with the same fee and size, pick the one
+ *     that sorts first according to the fallback order first.
  */
 template<typename SetType, typename CostModel = SFLDefaultCostModel>
 class SpanningForestState
diff --git a/src/coins.cpp b/src/coins.cpp
index 25b1ead0c1dd..c403e006c85c 100644
--- a/src/coins.cpp
+++ b/src/coins.cpp
@@ -14,33 +14,12 @@ TRACEPOINT_SEMAPHORE(utxocache, add);
 TRACEPOINT_SEMAPHORE(utxocache, spent);
 TRACEPOINT_SEMAPHORE(utxocache, uncache);
 
-std::optional<Coin> CCoinsView::GetCoin(const COutPoint& outpoint) const { return std::nullopt; }
-std::optional<Coin> CCoinsView::PeekCoin(const COutPoint& outpoint) const { return GetCoin(outpoint); }
-uint256 CCoinsView::GetBestBlock() const { return uint256(); }
-std::vector<uint256> CCoinsView::GetHeadBlocks() const { return std::vector<uint256>(); }
-void CCoinsView::BatchWrite(CoinsViewCacheCursor& cursor, const uint256& hashBlock)
+CoinsViewEmpty& CoinsViewEmpty::Get()
 {
-    for (auto it{cursor.Begin()}; it != cursor.End(); it = cursor.NextAndMaybeErase(*it)) { }
+    static CoinsViewEmpty instance;
+    return instance;
 }
 
-std::unique_ptr<CCoinsViewCursor> CCoinsView::Cursor() const { return nullptr; }
-
-bool CCoinsView::HaveCoin(const COutPoint &outpoint) const
-{
-    return GetCoin(outpoint).has_value();
-}
-
-CCoinsViewBacked::CCoinsViewBacked(CCoinsView *viewIn) : base(viewIn) { }
-std::optional<Coin> CCoinsViewBacked::GetCoin(const COutPoint& outpoint) const { return base->GetCoin(outpoint); }
-std::optional<Coin> CCoinsViewBacked::PeekCoin(const COutPoint& outpoint) const { return base->PeekCoin(outpoint); }
-bool CCoinsViewBacked::HaveCoin(const COutPoint &outpoint) const { return base->HaveCoin(outpoint); }
-uint256 CCoinsViewBacked::GetBestBlock() const { return base->GetBestBlock(); }
-std::vector<uint256> CCoinsViewBacked::GetHeadBlocks() const { return base->GetHeadBlocks(); }
-void CCoinsViewBacked::SetBackend(CCoinsView &viewIn) { base = &viewIn; }
-void CCoinsViewBacked::BatchWrite(CoinsViewCacheCursor& cursor, const uint256& hashBlock) { base->BatchWrite(cursor, hashBlock); }
-std::unique_ptr<CCoinsViewCursor> CCoinsViewBacked::Cursor() const { return base->Cursor(); }
-size_t CCoinsViewBacked::EstimateSize() const { return base->EstimateSize(); }
-
 std::optional<Coin> CCoinsViewCache::PeekCoin(const COutPoint& outpoint) const
 {
     if (auto it{cacheCoins.find(outpoint)}; it != cacheCoins.end()) {
@@ -49,8 +28,8 @@ std::optional<Coin> CCoinsViewCache::PeekCoin(const COutPoint& outpoint) const
     return base->PeekCoin(outpoint);
 }
 
-CCoinsViewCache::CCoinsViewCache(CCoinsView* baseIn, bool deterministic) :
-    CCoinsViewBacked(baseIn), m_deterministic(deterministic),
+CCoinsViewCache::CCoinsViewCache(CCoinsView* in_base, bool deterministic) :
+    CCoinsViewBacked(in_base), m_deterministic(deterministic),
     cacheCoins(0, SaltedOutpointHasher(/*deterministic=*/deterministic), CCoinsMap::key_equal{}, &m_cache_coins_memory_resource)
 {
     m_sentinel.second.SelfRef(m_sentinel);
@@ -185,7 +164,8 @@ const Coin& CCoinsViewCache::AccessCoin(const COutPoint &outpoint) const {
     }
 }
 
-bool CCoinsViewCache::HaveCoin(const COutPoint &outpoint) const {
+bool CCoinsViewCache::HaveCoin(const COutPoint& outpoint) const
+{
     CCoinsMap::const_iterator it = FetchCoin(outpoint);
     return (it != cacheCoins.end() && !it->second.coin.IsSpent());
 }
@@ -196,16 +176,17 @@ bool CCoinsViewCache::HaveCoinInCache(const COutPoint &outpoint) const {
 }
 
 uint256 CCoinsViewCache::GetBestBlock() const {
-    if (hashBlock.IsNull())
-        hashBlock = base->GetBestBlock();
-    return hashBlock;
+    if (m_block_hash.IsNull())
+        m_block_hash = base->GetBestBlock();
+    return m_block_hash;
 }
 
-void CCoinsViewCache::SetBestBlock(const uint256 &hashBlockIn) {
-    hashBlock = hashBlockIn;
+void CCoinsViewCache::SetBestBlock(const uint256& in_block_hash)
+{
+    m_block_hash = in_block_hash;
 }
 
-void CCoinsViewCache::BatchWrite(CoinsViewCacheCursor& cursor, const uint256& hashBlockIn)
+void CCoinsViewCache::BatchWrite(CoinsViewCacheCursor& cursor, const uint256& in_block_hash)
 {
     for (auto it{cursor.Begin()}; it != cursor.End(); it = cursor.NextAndMaybeErase(*it)) {
         if (!it->second.IsDirty()) { // TODO a cursor can only contain dirty entries
@@ -273,13 +254,13 @@ void CCoinsViewCache::BatchWrite(CoinsViewCacheCursor& cursor, const uint256& ha
             }
         }
     }
-    SetBestBlock(hashBlockIn);
+    SetBestBlock(in_block_hash);
 }
 
 void CCoinsViewCache::Flush(bool reallocate_cache)
 {
     auto cursor{CoinsViewCacheCursor(m_dirty_count, m_sentinel, cacheCoins, /*will_erase=*/true)};
-    base->BatchWrite(cursor, hashBlock);
+    base->BatchWrite(cursor, m_block_hash);
     Assume(m_dirty_count == 0);
     cacheCoins.clear();
     if (reallocate_cache) {
@@ -291,7 +272,7 @@ void CCoinsViewCache::Flush(bool reallocate_cache)
 void CCoinsViewCache::Sync()
 {
     auto cursor{CoinsViewCacheCursor(m_dirty_count, m_sentinel, cacheCoins, /*will_erase=*/false)};
-    base->BatchWrite(cursor, hashBlock);
+    base->BatchWrite(cursor, m_block_hash);
     Assume(m_dirty_count == 0);
     if (m_sentinel.second.Next() != &m_sentinel) {
         /* BatchWrite must clear flags of all entries */
diff --git a/src/coins.h b/src/coins.h
index 08c1886f9307..e1f1bee757c2 100644
--- a/src/coins.h
+++ b/src/coins.h
@@ -229,7 +229,7 @@ using CCoinsMapMemoryResource = CCoinsMap::allocator_type::ResourceType;
 class CCoinsViewCursor
 {
 public:
-    CCoinsViewCursor(const uint256 &hashBlockIn): hashBlock(hashBlockIn) {}
+    CCoinsViewCursor(const uint256& in_block_hash) : block_hash(in_block_hash) {}
     virtual ~CCoinsViewCursor() = default;
 
     virtual bool GetKey(COutPoint &key) const = 0;
@@ -239,9 +239,9 @@ class CCoinsViewCursor
     virtual void Next() = 0;
 
     //! Get best block at the time this cursor was created
-    const uint256 &GetBestBlock() const { return hashBlock; }
+    const uint256& GetBestBlock() const { return block_hash; }
 private:
-    uint256 hashBlock;
+    uint256 block_hash;
 };
 
 /**
@@ -303,63 +303,89 @@ struct CoinsViewCacheCursor
     bool m_will_erase;
 };
 
-/** Abstract view on the open txout dataset. */
+/** Pure abstract view on the open txout dataset. */
 class CCoinsView
 {
 public:
+    //! As we use CCoinsViews polymorphically, have a virtual destructor
+    virtual ~CCoinsView() = default;
+
     //! Retrieve the Coin (unspent transaction output) for a given outpoint.
     //! May populate the cache. Use PeekCoin() to perform a non-caching lookup.
-    virtual std::optional<Coin> GetCoin(const COutPoint& outpoint) const;
+    virtual std::optional<Coin> GetCoin(const COutPoint& outpoint) const = 0;
 
     //! Retrieve the Coin (unspent transaction output) for a given outpoint, without caching results.
     //! Does not populate the cache. Use GetCoin() to cache the result.
-    virtual std::optional<Coin> PeekCoin(const COutPoint& outpoint) const;
+    virtual std::optional<Coin> PeekCoin(const COutPoint& outpoint) const = 0;
 
     //! Just check whether a given outpoint is unspent.
     //! May populate the cache. Use PeekCoin() to perform a non-caching lookup.
-    virtual bool HaveCoin(const COutPoint &outpoint) const;
+    virtual bool HaveCoin(const COutPoint& outpoint) const = 0;
 
     //! Retrieve the block hash whose state this CCoinsView currently represents
-    virtual uint256 GetBestBlock() const;
+    virtual uint256 GetBestBlock() const = 0;
 
     //! Retrieve the range of blocks that may have been only partially written.
     //! If the database is in a consistent state, the result is the empty vector.
     //! Otherwise, a two-element vector is returned consisting of the new and
     //! the old block hash, in that order.
-    virtual std::vector<uint256> GetHeadBlocks() const;
+    virtual std::vector<uint256> GetHeadBlocks() const = 0;
 
     //! Do a bulk modification (multiple Coin changes + BestBlock change).
     //! The passed cursor is used to iterate through the coins.
-    virtual void BatchWrite(CoinsViewCacheCursor& cursor, const uint256& hashBlock);
+    virtual void BatchWrite(CoinsViewCacheCursor& cursor, const uint256& block_hash) = 0;
 
-    //! Get a cursor to iterate over the whole state
-    virtual std::unique_ptr<CCoinsViewCursor> Cursor() const;
+    //! Get a cursor to iterate over the whole state. Implementations may return nullptr.
+    virtual std::unique_ptr<CCoinsViewCursor> Cursor() const = 0;
 
-    //! As we use CCoinsViews polymorphically, have a virtual destructor
-    virtual ~CCoinsView() = default;
-
-    //! Estimate database size (0 if not implemented)
-    virtual size_t EstimateSize() const { return 0; }
+    //! Estimate database size
+    virtual size_t EstimateSize() const = 0;
 };
 
+/** Noop coins view. */
+class CoinsViewEmpty : public CCoinsView
+{
+protected:
+    CoinsViewEmpty() = default;
+
+public:
+    static CoinsViewEmpty& Get();
+
+    CoinsViewEmpty(const CoinsViewEmpty&) = delete;
+    CoinsViewEmpty& operator=(const CoinsViewEmpty&) = delete;
+
+    std::optional<Coin> GetCoin(const COutPoint&) const override { return {}; }
+    std::optional<Coin> PeekCoin(const COutPoint& outpoint) const override { return GetCoin(outpoint); }
+    bool HaveCoin(const COutPoint& outpoint) const override { return !!GetCoin(outpoint); }
+    uint256 GetBestBlock() const override { return {}; }
+    std::vector<uint256> GetHeadBlocks() const override { return {}; }
+    void BatchWrite(CoinsViewCacheCursor& cursor, const uint256&) override
+    {
+        for (auto it{cursor.Begin()}; it != cursor.End(); it = cursor.NextAndMaybeErase(*it)) { }
+    }
+    std::unique_ptr<CCoinsViewCursor> Cursor() const override { return {}; }
+    size_t EstimateSize() const override { return 0; }
+};
 
 /** CCoinsView backed by another CCoinsView */
 class CCoinsViewBacked : public CCoinsView
 {
 protected:
-    CCoinsView *base;
+    CCoinsView* base;
 
 public:
-    CCoinsViewBacked(CCoinsView *viewIn);
-    std::optional<Coin> GetCoin(const COutPoint& outpoint) const override;
-    std::optional<Coin> PeekCoin(const COutPoint& outpoint) const override;
-    bool HaveCoin(const COutPoint &outpoint) const override;
-    uint256 GetBestBlock() const override;
-    std::vector<uint256> GetHeadBlocks() const override;
-    void SetBackend(CCoinsView &viewIn);
-    void BatchWrite(CoinsViewCacheCursor& cursor, const uint256& hashBlock) override;
-    std::unique_ptr<CCoinsViewCursor> Cursor() const override;
-    size_t EstimateSize() const override;
+    explicit CCoinsViewBacked(CCoinsView* in_view) : base{Assert(in_view)} {}
+
+    void SetBackend(CCoinsView& in_view) { base = &in_view; }
+
+    std::optional<Coin> GetCoin(const COutPoint& outpoint) const override { return base->GetCoin(outpoint); }
+    std::optional<Coin> PeekCoin(const COutPoint& outpoint) const override { return base->PeekCoin(outpoint); }
+    bool HaveCoin(const COutPoint& outpoint) const override { return base->HaveCoin(outpoint); }
+    uint256 GetBestBlock() const override { return base->GetBestBlock(); }
+    std::vector<uint256> GetHeadBlocks() const override { return base->GetHeadBlocks(); }
+    void BatchWrite(CoinsViewCacheCursor& cursor, const uint256& block_hash) override { base->BatchWrite(cursor, block_hash); }
+    std::unique_ptr<CCoinsViewCursor> Cursor() const override { return base->Cursor(); }
+    size_t EstimateSize() const override { return base->EstimateSize(); }
 };
 
 
@@ -374,7 +400,7 @@ class CCoinsViewCache : public CCoinsViewBacked
      * Make mutable so that we can "fill the cache" even from Get-methods
      * declared as "const".
      */
-    mutable uint256 hashBlock;
+    mutable uint256 m_block_hash;
     mutable CCoinsMapMemoryResource m_cache_coins_memory_resource{};
     /* The starting sentinel of the flagged entry circular doubly linked list. */
     mutable CoinsCachePair m_sentinel;
@@ -395,7 +421,7 @@ class CCoinsViewCache : public CCoinsViewBacked
     virtual std::optional<Coin> FetchCoinFromBase(const COutPoint& outpoint) const;
 
 public:
-    CCoinsViewCache(CCoinsView *baseIn, bool deterministic = false);
+    CCoinsViewCache(CCoinsView* in_base, bool deterministic = false);
 
     /**
      * By deleting the copy constructor, we prevent accidentally using it when one intends to create a cache on top of a base cache.
@@ -405,10 +431,10 @@ class CCoinsViewCache : public CCoinsViewBacked
     // Standard CCoinsView methods
     std::optional<Coin> GetCoin(const COutPoint& outpoint) const override;
     std::optional<Coin> PeekCoin(const COutPoint& outpoint) const override;
-    bool HaveCoin(const COutPoint &outpoint) const override;
+    bool HaveCoin(const COutPoint& outpoint) const override;
     uint256 GetBestBlock() const override;
-    void SetBestBlock(const uint256 &hashBlock);
-    void BatchWrite(CoinsViewCacheCursor& cursor, const uint256& hashBlock) override;
+    void SetBestBlock(const uint256& block_hash);
+    void BatchWrite(CoinsViewCacheCursor& cursor, const uint256& block_hash) override;
     std::unique_ptr<CCoinsViewCursor> Cursor() const override {
         throw std::logic_error("CCoinsViewCache cursor iteration not supported.");
     }
@@ -578,7 +604,7 @@ class CCoinsViewErrorCatcher final : public CCoinsViewBacked
     }
 
     std::optional<Coin> GetCoin(const COutPoint& outpoint) const override;
-    bool HaveCoin(const COutPoint &outpoint) const override;
+    bool HaveCoin(const COutPoint& outpoint) const override;
     std::optional<Coin> PeekCoin(const COutPoint& outpoint) const override;
 
 private:
diff --git a/src/common/args.cpp b/src/common/args.cpp
index 5c8589cf4402..12e0f26ed214 100644
--- a/src/common/args.cpp
+++ b/src/common/args.cpp
@@ -206,7 +206,7 @@ bool ArgsManager::ParseParameters(int argc, const char* const argv[], std::strin
         if (key[0] != '-') {
             if (!m_accept_any_command && m_command.empty()) {
                 // The first non-dash arg is a registered command
-                std::optional<unsigned int> flags = GetArgFlags(key);
+                std::optional<unsigned int> flags = GetArgFlags_(key);
                 if (!flags || !(*flags & ArgsManager::COMMAND)) {
                     error = strprintf("Invalid command '%s'", argv[i]);
                     return false;
@@ -227,7 +227,7 @@ bool ArgsManager::ParseParameters(int argc, const char* const argv[], std::strin
         // Transform -foo to foo
         key.erase(0, 1);
         KeyInfo keyinfo = InterpretKey(key);
-        std::optional<unsigned int> flags = GetArgFlags('-' + keyinfo.name);
+        std::optional<unsigned int> flags = GetArgFlags_('-' + keyinfo.name);
 
         // Unknown command line options and command line options with dot
         // characters (which are returned from InterpretKey with nonempty
@@ -255,9 +255,9 @@ bool ArgsManager::ParseParameters(int argc, const char* const argv[], std::strin
     return true;
 }
 
-std::optional<unsigned int> ArgsManager::GetArgFlags(const std::string& name) const
+std::optional<unsigned int> ArgsManager::GetArgFlags_(const std::string& name) const
 {
-    LOCK(cs_args);
+    AssertLockHeld(cs_args);
     for (const auto& arg_map : m_available_args) {
         const auto search = arg_map.second.find(name);
         if (search != arg_map.second.end()) {
@@ -267,22 +267,36 @@ std::optional<unsigned int> ArgsManager::GetArgFlags(const std::string& name) co
     return m_default_flags;
 }
 
+std::optional<unsigned int> ArgsManager::GetArgFlags(const std::string& name) const
+{
+    LOCK(cs_args);
+    return GetArgFlags_(name);
+}
+
 void ArgsManager::SetDefaultFlags(std::optional<unsigned int> flags)
 {
     LOCK(cs_args);
     m_default_flags = flags;
 }
 
-fs::path ArgsManager::GetPathArg(std::string arg, const fs::path& default_value) const
+fs::path ArgsManager::GetPathArg_(std::string arg, const fs::path& default_value) const
 {
-    if (IsArgNegated(arg)) return fs::path{};
-    std::string path_str = GetArg(arg, "");
+    AssertLockHeld(cs_args);
+    const auto value = GetSetting_(arg);
+    if (value.isFalse()) return {};
+    std::string path_str = SettingToString(value, "");
     if (path_str.empty()) return default_value;
     fs::path result = fs::PathFromString(path_str).lexically_normal();
     // Remove trailing slash, if present.
     return result.has_filename() ? result : result.parent_path();
 }
 
+fs::path ArgsManager::GetPathArg(std::string arg, const fs::path& default_value) const
+{
+    LOCK(cs_args);
+    return GetPathArg_(std::move(arg), default_value);
+}
+
 fs::path ArgsManager::GetBlocksDirPath() const
 {
     LOCK(cs_args);
@@ -292,14 +306,14 @@ fs::path ArgsManager::GetBlocksDirPath() const
     // this function
     if (!path.empty()) return path;
 
-    if (IsArgSet("-blocksdir")) {
-        path = fs::absolute(GetPathArg("-blocksdir"));
+    if (!GetSetting_("-blocksdir").isNull()) {
+        path = fs::absolute(GetPathArg_("-blocksdir"));
         if (!fs::is_directory(path)) {
             path = "";
             return path;
         }
     } else {
-        path = GetDataDirBase();
+        path = GetDataDir(/*net_specific=*/false);
     }
 
     path /= fs::PathFromString(BaseParams().DataDir());
@@ -308,15 +322,25 @@ fs::path ArgsManager::GetBlocksDirPath() const
     return path;
 }
 
+fs::path ArgsManager::GetDataDirBase() const {
+    LOCK(cs_args);
+    return GetDataDir(/*net_specific=*/false);
+}
+
+fs::path ArgsManager::GetDataDirNet() const {
+    LOCK(cs_args);
+    return GetDataDir(/*net_specific=*/true);
+}
+
 fs::path ArgsManager::GetDataDir(bool net_specific) const
 {
-    LOCK(cs_args);
+    AssertLockHeld(cs_args);
     fs::path& path = net_specific ? m_cached_network_datadir_path : m_cached_datadir_path;
 
     // Used cached path if available
     if (!path.empty()) return path;
 
-    const fs::path datadir{GetPathArg("-datadir")};
+    const fs::path datadir{GetPathArg_("-datadir")};
     if (!datadir.empty()) {
         path = fs::absolute(datadir);
         if (!fs::is_directory(path)) {
@@ -419,7 +443,7 @@ bool ArgsManager::ReadSettingsFile(std::vector<std::string>* errors)
     }
     for (const auto& setting : m_settings.rw_settings) {
         KeyInfo key = InterpretKey(setting.first); // Split setting key into section and argname
-        if (!GetArgFlags('-' + key.name)) {
+        if (!GetArgFlags_('-' + key.name)) {
             LogWarning("Ignoring unknown rw_settings value %s", setting.first);
         }
     }
@@ -555,8 +579,8 @@ INSTANTIATE_INT_TYPE(uint64_t);
 bool ArgsManager::SoftSetArg(const std::string& strArg, const std::string& strValue)
 {
     LOCK(cs_args);
-    if (IsArgSet(strArg)) return false;
-    ForceSetArg(strArg, strValue);
+    if (!GetSetting_(strArg).isNull()) return false;
+    m_settings.forced_settings[SettingName(strArg)] = strValue;
     return true;
 }
 
@@ -620,6 +644,7 @@ void ArgsManager::ClearArgs()
     m_settings = {};
     m_available_args.clear();
     m_network_only_args.clear();
+    m_config_sections.clear();
 }
 
 void ArgsManager::CheckMultipleCLIArgs() const
@@ -629,7 +654,7 @@ void ArgsManager::CheckMultipleCLIArgs() const
     auto cmds = m_available_args.find(OptionsCategory::CLI_COMMANDS);
     if (cmds != m_available_args.end()) {
         for (const auto& [cmd, argspec] : cmds->second) {
-            if (IsArgSet(cmd)) {
+            if (!GetSetting_(cmd).isNull()) {
                 found.push_back(cmd);
             }
         }
@@ -692,9 +717,9 @@ std::string ArgsManager::GetHelpMessage() const
             case OptionsCategory::CLI_COMMANDS:
                 usage += HelpMessageGroup("CLI Commands:");
                 break;
-            default:
+            case OptionsCategory::HIDDEN:
                 break;
-        }
+        } // no default case, so the compiler can warn about missing cases
 
         // When we get to the hidden options, stop
         if (arg_map.first == OptionsCategory::HIDDEN) break;
@@ -853,17 +878,24 @@ std::variant<ChainType, std::string> ArgsManager::GetChainArg() const
 
 bool ArgsManager::UseDefaultSection(const std::string& arg) const
 {
+    AssertLockHeld(cs_args);
     return m_network == ChainTypeToString(ChainType::MAIN) || !m_network_only_args.contains(arg);
 }
 
-common::SettingsValue ArgsManager::GetSetting(const std::string& arg) const
+common::SettingsValue ArgsManager::GetSetting_(const std::string& arg) const
 {
-    LOCK(cs_args);
+    AssertLockHeld(cs_args);
     return common::GetSetting(
         m_settings, m_network, SettingName(arg), !UseDefaultSection(arg),
         /*ignore_nonpersistent=*/false, /*get_chain_type=*/false);
 }
 
+common::SettingsValue ArgsManager::GetSetting(const std::string& arg) const
+{
+    LOCK(cs_args);
+    return GetSetting_(arg);
+}
+
 std::vector<common::SettingsValue> ArgsManager::GetSettingsList(const std::string& arg) const
 {
     LOCK(cs_args);
@@ -875,10 +907,11 @@ void ArgsManager::logArgsPrefix(
     const std::string& section,
     const std::map<std::string, std::vector<common::SettingsValue>>& args) const
 {
+    AssertLockHeld(cs_args);
     std::string section_str = section.empty() ? "" : "[" + section + "] ";
     for (const auto& arg : args) {
         for (const auto& value : arg.second) {
-            std::optional<unsigned int> flags = GetArgFlags('-' + arg.first);
+            std::optional<unsigned int> flags = GetArgFlags_('-' + arg.first);
             if (flags) {
                 std::string value_str = (*flags & SENSITIVE) ? "****" : value.write();
                 LogInfo("%s %s%s=%s\n", prefix, section_str, arg.first, value_str);
diff --git a/src/common/args.h b/src/common/args.h
index ea4e173bf72a..de323d3c4909 100644
--- a/src/common/args.h
+++ b/src/common/args.h
@@ -127,7 +127,7 @@ class ArgsManager
         COMMAND = 0x800,
     };
 
-protected:
+private:
     struct Arg
     {
         std::string m_help_param;
@@ -135,7 +135,7 @@ class ArgsManager
         unsigned int m_flags;
     };
 
-    mutable RecursiveMutex cs_args;
+    mutable Mutex cs_args;
     common::Settings m_settings GUARDED_BY(cs_args);
     std::vector<std::string> m_command GUARDED_BY(cs_args);
     std::string m_network GUARDED_BY(cs_args);
@@ -149,8 +149,6 @@ class ArgsManager
     mutable fs::path m_cached_datadir_path GUARDED_BY(cs_args);
     mutable fs::path m_cached_network_datadir_path GUARDED_BY(cs_args);
 
-    [[nodiscard]] bool ReadConfigStream(std::istream& stream, const std::string& filepath, std::string& error, bool ignore_invalid_keys = false);
-
     /**
      * Returns true if settings values from the default section should be used,
      * depending on the current network and whether the setting is
@@ -158,7 +156,11 @@ class ArgsManager
      */
     bool UseDefaultSection(const std::string& arg) const EXCLUSIVE_LOCKS_REQUIRED(cs_args);
 
- public:
+protected:
+    [[nodiscard]] bool ReadConfigStream(std::istream& stream, const std::string& filepath, std::string& error, bool ignore_invalid_keys = false) EXCLUSIVE_LOCKS_REQUIRED(!cs_args);
+    [[nodiscard]] bool ReadConfigString(const std::string& str_config) EXCLUSIVE_LOCKS_REQUIRED(!cs_args);
+
+public:
     /**
      * Get setting value.
      *
@@ -166,12 +168,12 @@ class ArgsManager
      * false if "-nosetting" argument was passed, and a string if a "-setting=value"
      * argument was passed.
      */
-    common::SettingsValue GetSetting(const std::string& arg) const;
+    common::SettingsValue GetSetting(const std::string& arg) const EXCLUSIVE_LOCKS_REQUIRED(!cs_args);
 
     /**
      * Get list of setting values.
      */
-    std::vector<common::SettingsValue> GetSettingsList(const std::string& arg) const;
+    std::vector<common::SettingsValue> GetSettingsList(const std::string& arg) const EXCLUSIVE_LOCKS_REQUIRED(!cs_args);
 
     ArgsManager();
     ~ArgsManager();
@@ -179,16 +181,16 @@ class ArgsManager
     /**
      * Select the network in use
      */
-    void SelectConfigNetwork(const std::string& network);
+    void SelectConfigNetwork(const std::string& network) EXCLUSIVE_LOCKS_REQUIRED(!cs_args);
 
-    [[nodiscard]] bool ParseParameters(int argc, const char* const argv[], std::string& error);
+    [[nodiscard]] bool ParseParameters(int argc, const char* const argv[], std::string& error) EXCLUSIVE_LOCKS_REQUIRED(!cs_args);
 
     /**
      * Return config file path (read-only)
      */
-    fs::path GetConfigFilePath() const;
-    void SetConfigFilePath(fs::path);
-    [[nodiscard]] bool ReadConfigFiles(std::string& error, bool ignore_invalid_keys = false);
+    fs::path GetConfigFilePath() const EXCLUSIVE_LOCKS_REQUIRED(!cs_args);
+    void SetConfigFilePath(fs::path) EXCLUSIVE_LOCKS_REQUIRED(!cs_args);
+    [[nodiscard]] bool ReadConfigFiles(std::string& error, bool ignore_invalid_keys = false) EXCLUSIVE_LOCKS_REQUIRED(!cs_args);
 
     /**
      * Log warnings for options in m_section_only_args when
@@ -196,12 +198,12 @@ class ArgsManager
      * on the command line or in a network-specific section in the
      * config file.
      */
-    std::set<std::string> GetUnsuitableSectionOnlyArgs() const;
+    std::set<std::string> GetUnsuitableSectionOnlyArgs() const EXCLUSIVE_LOCKS_REQUIRED(!cs_args);
 
     /**
      * Log warnings for unrecognized section names in the config file.
      */
-    std::list<SectionInfo> GetUnrecognizedSections() const;
+    std::list<SectionInfo> GetUnrecognizedSections() const EXCLUSIVE_LOCKS_REQUIRED(!cs_args);
 
     struct Command {
         /** The command (if one has been registered with AddCommand), or empty */
@@ -215,33 +217,33 @@ class ArgsManager
     /**
      * Get the command and command args (returns std::nullopt if no command provided)
      */
-    std::optional<const Command> GetCommand() const;
+    std::optional<const Command> GetCommand() const EXCLUSIVE_LOCKS_REQUIRED(!cs_args);
 
     /**
      * Get blocks directory path
      *
      * @return Blocks path which is network specific
      */
-    fs::path GetBlocksDirPath() const;
+    fs::path GetBlocksDirPath() const EXCLUSIVE_LOCKS_REQUIRED(!cs_args);
 
     /**
      * Get data directory path
      *
      * @return Absolute path on success, otherwise an empty path when a non-directory path would be returned
      */
-    fs::path GetDataDirBase() const { return GetDataDir(false); }
+    fs::path GetDataDirBase() const EXCLUSIVE_LOCKS_REQUIRED(!cs_args);
 
     /**
      * Get data directory path with appended network identifier
      *
      * @return Absolute path on success, otherwise an empty path when a non-directory path would be returned
      */
-    fs::path GetDataDirNet() const { return GetDataDir(true); }
+    fs::path GetDataDirNet() const EXCLUSIVE_LOCKS_REQUIRED(!cs_args);
 
     /**
      * Clear cached directory paths
      */
-    void ClearPathCache();
+    void ClearPathCache() EXCLUSIVE_LOCKS_REQUIRED(!cs_args);
 
     /**
      * Return a vector of strings of the given argument
@@ -249,7 +251,7 @@ class ArgsManager
      * @param strArg Argument to get (e.g. "-foo")
      * @return command-line arguments
      */
-    std::vector<std::string> GetArgs(const std::string& strArg) const;
+    std::vector<std::string> GetArgs(const std::string& strArg) const EXCLUSIVE_LOCKS_REQUIRED(!cs_args);
 
     /**
      * Return true if the given argument has been manually set
@@ -257,7 +259,7 @@ class ArgsManager
      * @param strArg Argument to get (e.g. "-foo")
      * @return true if the argument has been set
      */
-    bool IsArgSet(const std::string& strArg) const;
+    bool IsArgSet(const std::string& strArg) const EXCLUSIVE_LOCKS_REQUIRED(!cs_args);
 
     /**
      * Return true if the argument was originally passed as a negated option,
@@ -266,7 +268,7 @@ class ArgsManager
      * @param strArg Argument to get (e.g. "-foo")
      * @return true if the argument was passed negated
      */
-    bool IsArgNegated(const std::string& strArg) const;
+    bool IsArgNegated(const std::string& strArg) const EXCLUSIVE_LOCKS_REQUIRED(!cs_args);
 
     /**
      * Return string argument or default value
@@ -275,8 +277,8 @@ class ArgsManager
      * @param strDefault (e.g. "1")
      * @return command-line argument or default value
      */
-    std::string GetArg(const std::string& strArg, const std::string& strDefault) const;
-    std::optional<std::string> GetArg(const std::string& strArg) const;
+    std::string GetArg(const std::string& strArg, const std::string& strDefault) const EXCLUSIVE_LOCKS_REQUIRED(!cs_args);
+    std::optional<std::string> GetArg(const std::string& strArg) const EXCLUSIVE_LOCKS_REQUIRED(!cs_args);
 
     /**
      * Return path argument or default value
@@ -288,7 +290,7 @@ class ArgsManager
      * for examples or implementation for details). If argument is empty or not
      * set, default_value is returned unchanged.
      */
-    fs::path GetPathArg(std::string arg, const fs::path& default_value = {}) const;
+    fs::path GetPathArg(std::string arg, const fs::path& default_value = {}) const EXCLUSIVE_LOCKS_REQUIRED(!cs_args);
 
     /**
      * Return integer argument or default value
@@ -298,13 +300,13 @@ class ArgsManager
      * @return command-line argument (0 if invalid number) or default value
      */
     template <std::integral Int>
-    Int GetArg(const std::string& strArg, Int nDefault) const;
+    Int GetArg(const std::string& strArg, Int nDefault) const EXCLUSIVE_LOCKS_REQUIRED(!cs_args);
 
     template <std::integral Int>
-    std::optional<Int> GetArg(const std::string& strArg) const;
+    std::optional<Int> GetArg(const std::string& strArg) const EXCLUSIVE_LOCKS_REQUIRED(!cs_args);
 
-    int64_t GetIntArg(const std::string& strArg, int64_t nDefault) const { return GetArg<int64_t>(strArg, nDefault); }
-    std::optional<int64_t> GetIntArg(const std::string& strArg) const { return GetArg<int64_t>(strArg); }
+    int64_t GetIntArg(const std::string& strArg, int64_t nDefault) const EXCLUSIVE_LOCKS_REQUIRED(!cs_args) { return GetArg<int64_t>(strArg, nDefault); }
+    std::optional<int64_t> GetIntArg(const std::string& strArg) const EXCLUSIVE_LOCKS_REQUIRED(!cs_args) { return GetArg<int64_t>(strArg); }
 
     /**
      * Return boolean argument or default value
@@ -313,8 +315,8 @@ class ArgsManager
      * @param fDefault (true or false)
      * @return command-line argument or default value
      */
-    bool GetBoolArg(const std::string& strArg, bool fDefault) const;
-    std::optional<bool> GetBoolArg(const std::string& strArg) const;
+    bool GetBoolArg(const std::string& strArg, bool fDefault) const EXCLUSIVE_LOCKS_REQUIRED(!cs_args);
+    std::optional<bool> GetBoolArg(const std::string& strArg) const EXCLUSIVE_LOCKS_REQUIRED(!cs_args);
 
     /**
      * Set an argument if it doesn't already have a value
@@ -323,7 +325,7 @@ class ArgsManager
      * @param strValue Value (e.g. "1")
      * @return true if argument gets set, false if it already had a value
      */
-    bool SoftSetArg(const std::string& strArg, const std::string& strValue);
+    bool SoftSetArg(const std::string& strArg, const std::string& strValue) EXCLUSIVE_LOCKS_REQUIRED(!cs_args);
 
     /**
      * Set a boolean argument if it doesn't already have a value
@@ -332,97 +334,97 @@ class ArgsManager
      * @param fValue Value (e.g. false)
      * @return true if argument gets set, false if it already had a value
      */
-    bool SoftSetBoolArg(const std::string& strArg, bool fValue);
+    bool SoftSetBoolArg(const std::string& strArg, bool fValue) EXCLUSIVE_LOCKS_REQUIRED(!cs_args);
 
     // Forces an arg setting. Called by SoftSetArg() if the arg hasn't already
     // been set. Also called directly in testing.
-    void ForceSetArg(const std::string& strArg, const std::string& strValue);
+    void ForceSetArg(const std::string& strArg, const std::string& strValue) EXCLUSIVE_LOCKS_REQUIRED(!cs_args);
 
     /**
      * Returns the appropriate chain type from the program arguments.
      * @return ChainType::MAIN by default; raises runtime error if an invalid
      * combination, or unknown chain is given.
      */
-    ChainType GetChainType() const;
+    ChainType GetChainType() const EXCLUSIVE_LOCKS_REQUIRED(!cs_args);
 
     /**
      * Returns the appropriate chain type string from the program arguments.
      * @return ChainType::MAIN string by default; raises runtime error if an
      * invalid combination is given.
      */
-    std::string GetChainTypeString() const;
+    std::string GetChainTypeString() const EXCLUSIVE_LOCKS_REQUIRED(!cs_args);
 
     /**
      * Add argument
      */
-    void AddArg(const std::string& name, const std::string& help, unsigned int flags, const OptionsCategory& cat);
+    void AddArg(const std::string& name, const std::string& help, unsigned int flags, const OptionsCategory& cat) EXCLUSIVE_LOCKS_REQUIRED(!cs_args);
 
     /**
      * Add subcommand
      */
-    void AddCommand(const std::string& cmd, const std::string& help);
+    void AddCommand(const std::string& cmd, const std::string& help) EXCLUSIVE_LOCKS_REQUIRED(!cs_args);
 
     /**
      * Add many hidden arguments
      */
-    void AddHiddenArgs(const std::vector<std::string>& args);
+    void AddHiddenArgs(const std::vector<std::string>& args) EXCLUSIVE_LOCKS_REQUIRED(!cs_args);
 
     /**
      * Clear available arguments
      */
-    void ClearArgs();
+    void ClearArgs() EXCLUSIVE_LOCKS_REQUIRED(!cs_args);
 
     /**
      * Check CLI command args
      *
      * @throws std::runtime_error when multiple CLI_COMMAND arguments are specified
      */
-    void CheckMultipleCLIArgs() const;
+    void CheckMultipleCLIArgs() const EXCLUSIVE_LOCKS_REQUIRED(!cs_args);
 
     /**
      * Get the help string
      */
-    std::string GetHelpMessage() const;
+    std::string GetHelpMessage() const EXCLUSIVE_LOCKS_REQUIRED(!cs_args);
 
     /**
      * Return Flags for known arg.
      * Return default flags for unknown arg.
      */
-    std::optional<unsigned int> GetArgFlags(const std::string& name) const;
+    std::optional<unsigned int> GetArgFlags(const std::string& name) const EXCLUSIVE_LOCKS_REQUIRED(!cs_args);
 
     /**
      * Set default flags to return for an unknown arg.
      */
-    void SetDefaultFlags(std::optional<unsigned int>);
+    void SetDefaultFlags(std::optional<unsigned int>) EXCLUSIVE_LOCKS_REQUIRED(!cs_args);
 
     /**
      * Get settings file path, or return false if read-write settings were
      * disabled with -nosettings.
      */
-    bool GetSettingsPath(fs::path* filepath = nullptr, bool temp = false, bool backup = false) const;
+    bool GetSettingsPath(fs::path* filepath = nullptr, bool temp = false, bool backup = false) const EXCLUSIVE_LOCKS_REQUIRED(!cs_args);
 
     /**
      * Read settings file. Push errors to vector, or log them if null.
      */
-    bool ReadSettingsFile(std::vector<std::string>* errors = nullptr);
+    bool ReadSettingsFile(std::vector<std::string>* errors = nullptr) EXCLUSIVE_LOCKS_REQUIRED(!cs_args);
 
     /**
      * Write settings file or backup settings file. Push errors to vector, or
      * log them if null.
      */
-    bool WriteSettingsFile(std::vector<std::string>* errors = nullptr, bool backup = false) const;
+    bool WriteSettingsFile(std::vector<std::string>* errors = nullptr, bool backup = false) const EXCLUSIVE_LOCKS_REQUIRED(!cs_args);
 
     /**
      * Get current setting from config file or read/write settings file,
      * ignoring nonpersistent command line or forced settings values.
      */
-    common::SettingsValue GetPersistentSetting(const std::string& name) const;
+    common::SettingsValue GetPersistentSetting(const std::string& name) const EXCLUSIVE_LOCKS_REQUIRED(!cs_args);
 
     /**
      * Access settings with lock held.
      */
     template <typename Fn>
-    void LockSettings(Fn&& fn)
+    void LockSettings(Fn&& fn) EXCLUSIVE_LOCKS_REQUIRED(!cs_args)
     {
         LOCK(cs_args);
         fn(m_settings);
@@ -432,16 +434,21 @@ class ArgsManager
      * Log the config file options and the command line arguments,
      * useful for troubleshooting.
      */
-    void LogArgs() const;
+    void LogArgs() const EXCLUSIVE_LOCKS_REQUIRED(!cs_args);
 
 private:
+    // Internal helpers, for use by callers that already hold `cs_args`.
+    common::SettingsValue GetSetting_(const std::string& arg) const EXCLUSIVE_LOCKS_REQUIRED(cs_args);
+    std::optional<unsigned int> GetArgFlags_(const std::string& name) const EXCLUSIVE_LOCKS_REQUIRED(cs_args);
+    fs::path GetPathArg_(std::string arg, const fs::path& default_value = {}) const EXCLUSIVE_LOCKS_REQUIRED(cs_args);
+
     /**
      * Get data directory path
      *
      * @param net_specific Append network identifier to the returned path
      * @return Absolute path on success, otherwise an empty path when a non-directory path would be returned
      */
-    fs::path GetDataDir(bool net_specific) const;
+    fs::path GetDataDir(bool net_specific) const EXCLUSIVE_LOCKS_REQUIRED(cs_args);
 
     /**
      * Return -regtest/-signet/-testnet/-testnet4/-chain= setting as a ChainType enum if a
@@ -449,13 +456,13 @@ class ArgsManager
      * name was set. Raise an exception if an invalid combination of flags was
      * provided.
      */
-    std::variant<ChainType, std::string> GetChainArg() const;
+    std::variant<ChainType, std::string> GetChainArg() const EXCLUSIVE_LOCKS_REQUIRED(!cs_args);
 
     // Helper function for LogArgs().
     void logArgsPrefix(
         const std::string& prefix,
         const std::string& section,
-        const std::map<std::string, std::vector<common::SettingsValue>>& args) const;
+        const std::map<std::string, std::vector<common::SettingsValue>>& args) const EXCLUSIVE_LOCKS_REQUIRED(cs_args);
 };
 
 extern ArgsManager gArgs;
diff --git a/src/common/bloom.cpp b/src/common/bloom.cpp
index efb4178cab56..3ee78994c14c 100644
--- a/src/common/bloom.cpp
+++ b/src/common/bloom.cpp
@@ -12,6 +12,7 @@
 #include <span.h>
 #include <streams.h>
 #include <util/fastrange.h>
+#include <util/overflow.h>
 
 #include <algorithm>
 #include <cmath>
@@ -166,7 +167,7 @@ CRollingBloomFilter::CRollingBloomFilter(const unsigned int nElements, const dou
      * restrict it to the range 1-50. */
     nHashFuncs = std::max(1, std::min((int)round(logFpRate / log(0.5)), 50));
     /* In this rolling bloom filter, we'll store between 2 and 3 generations of nElements / 2 entries. */
-    nEntriesPerGeneration = (nElements + 1) / 2;
+    nEntriesPerGeneration = CeilDiv(nElements, 2u);
     uint32_t nMaxElements = nEntriesPerGeneration * 3;
     /* The maximum fpRate = pow(1.0 - exp(-nHashFuncs * nMaxElements / nFilterBits), nHashFuncs)
      * =>          pow(fpRate, 1.0 / nHashFuncs) = 1.0 - exp(-nHashFuncs * nMaxElements / nFilterBits)
@@ -182,7 +183,7 @@ CRollingBloomFilter::CRollingBloomFilter(const unsigned int nElements, const dou
      * treated as set in generation 1, 2, or 3 respectively.
      * These bits are stored in separate integers: position P corresponds to bit
      * (P & 63) of the integers data[(P >> 6) * 2] and data[(P >> 6) * 2 + 1]. */
-    data.resize(((nFilterBits + 63) / 64) << 1);
+    data.resize(CeilDiv(nFilterBits, 64u) << 1);
     reset();
 }
 
diff --git a/src/common/config.cpp b/src/common/config.cpp
index a2cf9381af29..a05c20d6f8f6 100644
--- a/src/common/config.cpp
+++ b/src/common/config.cpp
@@ -19,6 +19,7 @@
 #include <filesystem>
 #include <fstream>
 #include <iostream>
+#include <sstream>
 #include <list>
 #include <map>
 #include <memory>
@@ -99,7 +100,7 @@ bool ArgsManager::ReadConfigStream(std::istream& stream, const std::string& file
     }
     for (const std::pair<std::string, std::string>& option : options) {
         KeyInfo key = InterpretKey(option.first);
-        std::optional<unsigned int> flags = GetArgFlags('-' + key.name);
+        std::optional<unsigned int> flags = GetArgFlags_('-' + key.name);
         if (!IsConfSupported(key, error)) return false;
         if (flags) {
             std::optional<common::SettingsValue> value = InterpretValue(key, &option.second, *flags, error);
@@ -119,13 +120,26 @@ bool ArgsManager::ReadConfigStream(std::istream& stream, const std::string& file
     return true;
 }
 
+bool ArgsManager::ReadConfigString(const std::string& str_config)
+{
+    std::istringstream streamConfig(str_config);
+    {
+        LOCK(cs_args);
+        m_settings.ro_config.clear();
+        m_config_sections.clear();
+    }
+    std::string error;
+    return ReadConfigStream(streamConfig, "", error);
+}
+
 bool ArgsManager::ReadConfigFiles(std::string& error, bool ignore_invalid_keys)
 {
     {
         LOCK(cs_args);
         m_settings.ro_config.clear();
         m_config_sections.clear();
-        m_config_path = AbsPathForConfigVal(*this, GetPathArg("-conf", BITCOIN_CONF_FILENAME), /*net_specific=*/false);
+        const auto conf_val = GetPathArg_("-conf", BITCOIN_CONF_FILENAME);
+        m_config_path = (conf_val.is_absolute() || conf_val.empty()) ? conf_val : fsbridge::AbsPathJoin(GetDataDir(/*net_specific=*/false), conf_val);
     }
 
     const auto conf_path{GetConfigFilePath()};
diff --git a/src/common/interfaces.cpp b/src/common/interfaces.cpp
index ffd85e6131fb..de028f9ca257 100644
--- a/src/common/interfaces.cpp
+++ b/src/common/interfaces.cpp
@@ -2,10 +2,10 @@
 // Distributed under the MIT software license, see the accompanying
 // file COPYING or http://www.opensource.org/licenses/mit-license.php.
 
+#include <btcsignals.h>
 #include <interfaces/echo.h>
 #include <interfaces/handler.h>
 
-#include <boost/signals2/connection.hpp>
 #include <memory>
 #include <utility>
 
@@ -23,11 +23,11 @@ class CleanupHandler : public interfaces::Handler
 class SignalHandler : public interfaces::Handler
 {
 public:
-    explicit SignalHandler(boost::signals2::connection connection) : m_connection(std::move(connection)) {}
+    explicit SignalHandler(btcsignals::connection connection) : m_connection(std::move(connection)) {}
 
     void disconnect() override { m_connection.disconnect(); }
 
-    boost::signals2::scoped_connection m_connection;
+    btcsignals::scoped_connection m_connection;
 };
 
 class EchoImpl : public interfaces::Echo
@@ -44,7 +44,7 @@ std::unique_ptr<Handler> MakeCleanupHandler(std::function<void()> cleanup)
     return std::make_unique<common::CleanupHandler>(std::move(cleanup));
 }
 
-std::unique_ptr<Handler> MakeSignalHandler(boost::signals2::connection connection)
+std::unique_ptr<Handler> MakeSignalHandler(btcsignals::connection connection)
 {
     return std::make_unique<common::SignalHandler>(std::move(connection));
 }
diff --git a/src/common/license_info.cpp b/src/common/license_info.cpp
new file mode 100644
index 000000000000..8cf99c2902f8
--- /dev/null
+++ b/src/common/license_info.cpp
@@ -0,0 +1,43 @@
+// Copyright (c) The Bitcoin Core developers
+// Distributed under the MIT software license, see the accompanying
+// file COPYING or https://opensource.org/license/mit/.
+
+#include <bitcoin-build-config.h> // IWYU pragma: keep
+
+#include <common/license_info.h>
+
+#include <tinyformat.h>
+#include <util/translation.h>
+
+#include <string>
+
+std::string CopyrightHolders(const std::string& strPrefix)
+{
+    const auto copyright_devs = strprintf(_(COPYRIGHT_HOLDERS), COPYRIGHT_HOLDERS_SUBSTITUTION).translated;
+    std::string strCopyrightHolders = strPrefix + copyright_devs;
+
+    // Make sure Bitcoin Core copyright is not removed by accident
+    if (copyright_devs.find("Bitcoin Core") == std::string::npos) {
+        strCopyrightHolders += "\n" + strPrefix + "The Bitcoin Core developers";
+    }
+    return strCopyrightHolders;
+}
+
+std::string LicenseInfo()
+{
+    const std::string URL_SOURCE_CODE = "<https://github.com/bitcoin/bitcoin>";
+
+    return CopyrightHolders(strprintf(_("Copyright (C) %i-%i"), 2009, COPYRIGHT_YEAR).translated + " ") + "\n" +
+           "\n" +
+           strprintf(_("Please contribute if you find %s useful. "
+                       "Visit %s for further information about the software."),
+                     CLIENT_NAME, "<" CLIENT_URL ">")
+               .translated +
+           "\n" +
+           strprintf(_("The source code is available from %s."), URL_SOURCE_CODE).translated +
+           "\n" +
+           "\n" +
+           _("This is experimental software.") + "\n" +
+           strprintf(_("Distributed under the MIT software license, see the accompanying file %s or %s"), "COPYING", "<https://opensource.org/license/MIT>").translated +
+           "\n";
+}
diff --git a/src/common/license_info.h b/src/common/license_info.h
new file mode 100644
index 000000000000..aedb1b7f5f64
--- /dev/null
+++ b/src/common/license_info.h
@@ -0,0 +1,15 @@
+// Copyright (c) The Bitcoin Core developers
+// Distributed under the MIT software license, see the accompanying
+// file COPYING or https://opensource.org/license/mit/.
+
+#ifndef BITCOIN_COMMON_LICENSE_INFO_H
+#define BITCOIN_COMMON_LICENSE_INFO_H
+
+#include <string>
+
+std::string CopyrightHolders(const std::string& strPrefix);
+
+/** Returns licensing information (for -version) */
+std::string LicenseInfo();
+
+#endif // BITCOIN_COMMON_LICENSE_INFO_H
diff --git a/src/common/messages.cpp b/src/common/messages.cpp
index 637ec62af895..12e32cae806e 100644
--- a/src/common/messages.cpp
+++ b/src/common/messages.cpp
@@ -66,9 +66,8 @@ std::string FeeModeInfo(const std::pair<std::string, FeeEstimateMode>& mode, std
             return strprintf("%s estimates use a longer time horizon, making them\n"
                    "less responsive to short-term drops in the prevailing fee market. This mode\n"
                    "potentially returns a higher fee rate estimate.\n", mode.first);
-        default:
-            assert(false);
-    }
+    } // no default case, so the compiler can warn about missing cases
+    assert(false);
 }
 
 std::string FeeModesDetail(std::string default_info)
@@ -119,8 +118,7 @@ bilingual_str PSBTErrorString(PSBTError err)
             return Untranslated("Input needs additional signatures or other data");
         case PSBTError::OK:
             return Untranslated("No errors");
-        // no default case, so the compiler can warn about missing cases
-    }
+    } // no default case, so the compiler can warn about missing cases
     assert(false);
 }
 
@@ -143,8 +141,7 @@ bilingual_str TransactionErrorString(const TransactionError err)
             return Untranslated("Unspendable output exceeds maximum configured by user (maxburnamount)");
         case TransactionError::INVALID_PACKAGE:
             return Untranslated("Transaction rejected due to invalid package");
-        // no default case, so the compiler can warn about missing cases
-    }
+    } // no default case, so the compiler can warn about missing cases
     assert(false);
 }
 
diff --git a/src/common/signmessage.cpp b/src/common/signmessage.cpp
index a86310e1d49f..0f9e1f5e30d7 100644
--- a/src/common/signmessage.cpp
+++ b/src/common/signmessage.cpp
@@ -87,7 +87,6 @@ std::string SigningResultString(const SigningResult res)
             return "Private key not available";
         case SigningResult::SIGNING_FAILED:
             return "Sign failed";
-        // no default case, so the compiler can warn about missing cases
-    }
+    } // no default case, so the compiler can warn about missing cases
     assert(false);
 }
diff --git a/src/consensus/params.h b/src/consensus/params.h
index 93ee071fdc16..7f56729455a8 100644
--- a/src/consensus/params.h
+++ b/src/consensus/params.h
@@ -20,6 +20,7 @@ namespace Consensus {
 /**
  * A buried deployment is one where the height of the activation has been hardcoded into
  * the client implementation long after the consensus change has activated. See BIP 90.
+ * Consensus changes for which the new rules are enforced from genesis are not listed here.
  */
 enum BuriedDeployment : int16_t {
     // buried deployments get negative values to avoid overlap with DeploymentPos
@@ -27,14 +28,16 @@ enum BuriedDeployment : int16_t {
     DEPLOYMENT_CLTV,
     DEPLOYMENT_DERSIG,
     DEPLOYMENT_CSV,
+    // SCRIPT_VERIFY_WITNESS is enforced from genesis, but the check for downloading
+    // missing witness data is not. BIP 147 also relies on hardcoded activation height.
     DEPLOYMENT_SEGWIT,
 };
 constexpr bool ValidDeployment(BuriedDeployment dep) { return dep <= DEPLOYMENT_SEGWIT; }
 
 enum DeploymentPos : uint16_t {
     DEPLOYMENT_TESTDUMMY,
-    DEPLOYMENT_TAPROOT, // Deployment of Schnorr/Taproot (BIPs 340-342)
     // NOTE: Also add new deployments to VersionBitsDeploymentInfo in deploymentinfo.cpp
+    // Removing an entry may require bumping MinBIP9WarningHeight.
     MAX_VERSION_BITS_DEPLOYMENTS
 };
 constexpr bool ValidDeployment(DeploymentPos dep) { return dep < MAX_VERSION_BITS_DEPLOYMENTS; }
@@ -105,7 +108,7 @@ struct Params {
      * BIP 16 exception blocks. */
     int SegwitHeight;
     /** Don't warn about unknown BIP 9 activations below this height.
-     * This prevents us from warning about the CSV and segwit activations. */
+     * This prevents us from warning about the CSV, segwit and taproot activations. */
     int MinBIP9WarningHeight;
     std::array<BIP9Deployment,MAX_VERSION_BITS_DEPLOYMENTS> vDeployments;
     /** Proof of work parameters */
diff --git a/src/core_io.cpp b/src/core_io.cpp
index 7492e9ca50fb..7ee0aa8eb2f4 100644
--- a/src/core_io.cpp
+++ b/src/core_io.cpp
@@ -11,10 +11,7 @@
 #include <consensus/validation.h>
 #include <crypto/hex_base.h>
 #include <key_io.h>
-// IWYU incorrectly suggests replacing this header
-// with forward declarations.
-// See https://github.com/include-what-you-use/include-what-you-use/issues/1886.
-#include <primitives/block.h> // IWYU pragma: keep
+#include <primitives/block.h>
 #include <primitives/transaction.h>
 #include <script/descriptor.h>
 #include <script/interpreter.h>
diff --git a/src/crypto/CMakeLists.txt b/src/crypto/CMakeLists.txt
index 92653ade5a7a..4dc84664ea7b 100644
--- a/src/crypto/CMakeLists.txt
+++ b/src/crypto/CMakeLists.txt
@@ -20,6 +20,7 @@ add_library(bitcoin_crypto STATIC EXCLUDE_FROM_ALL
   sha512.cpp
   siphash.cpp
   ../support/cleanse.cpp
+  ../support/lockedpool.cpp
 )
 
 target_link_libraries(bitcoin_crypto
diff --git a/src/crypto/aes.cpp b/src/crypto/aes.cpp
index 40df5690e0fd..cd2b4f76c60c 100644
--- a/src/crypto/aes.cpp
+++ b/src/crypto/aes.cpp
@@ -3,6 +3,7 @@
 // file COPYING or http://www.opensource.org/licenses/mit-license.php.
 
 #include <crypto/aes.h>
+#include <support/allocators/secure.h>
 
 #include <cstring>
 
@@ -12,32 +13,34 @@ extern "C" {
 
 AES256Encrypt::AES256Encrypt(const unsigned char key[32])
 {
-    AES256_init(&ctx, key);
+    ctx = allocator.allocate(1);
+    AES256_init(ctx, key);
 }
 
 AES256Encrypt::~AES256Encrypt()
 {
-    memset(&ctx, 0, sizeof(ctx));
+    allocator.deallocate(ctx, 1);
 }
 
 void AES256Encrypt::Encrypt(unsigned char ciphertext[16], const unsigned char plaintext[16]) const
 {
-    AES256_encrypt(&ctx, 1, ciphertext, plaintext);
+    AES256_encrypt(ctx, 1, ciphertext, plaintext);
 }
 
 AES256Decrypt::AES256Decrypt(const unsigned char key[32])
 {
-    AES256_init(&ctx, key);
+    ctx = allocator.allocate(1);
+    AES256_init(ctx, key);
 }
 
 AES256Decrypt::~AES256Decrypt()
 {
-    memset(&ctx, 0, sizeof(ctx));
+    allocator.deallocate(ctx, 1);
 }
 
 void AES256Decrypt::Decrypt(unsigned char plaintext[16], const unsigned char ciphertext[16]) const
 {
-    AES256_decrypt(&ctx, 1, plaintext, ciphertext);
+    AES256_decrypt(ctx, 1, plaintext, ciphertext);
 }
 
 
@@ -121,6 +124,7 @@ static int CBCDecrypt(const T& dec, const unsigned char iv[AES_BLOCKSIZE], const
 AES256CBCEncrypt::AES256CBCEncrypt(const unsigned char key[AES256_KEYSIZE], const unsigned char ivIn[AES_BLOCKSIZE], bool padIn)
     : enc(key), pad(padIn)
 {
+    iv = allocator.allocate(AES_BLOCKSIZE);
     memcpy(iv, ivIn, AES_BLOCKSIZE);
 }
 
@@ -131,12 +135,13 @@ int AES256CBCEncrypt::Encrypt(const unsigned char* data, int size, unsigned char
 
 AES256CBCEncrypt::~AES256CBCEncrypt()
 {
-    memset(iv, 0, sizeof(iv));
+    allocator.deallocate(iv, AES_BLOCKSIZE);
 }
 
 AES256CBCDecrypt::AES256CBCDecrypt(const unsigned char key[AES256_KEYSIZE], const unsigned char ivIn[AES_BLOCKSIZE], bool padIn)
     : dec(key), pad(padIn)
 {
+    iv = allocator.allocate(AES_BLOCKSIZE);
     memcpy(iv, ivIn, AES_BLOCKSIZE);
 }
 
@@ -148,5 +153,5 @@ int AES256CBCDecrypt::Decrypt(const unsigned char* data, int size, unsigned char
 
 AES256CBCDecrypt::~AES256CBCDecrypt()
 {
-    memset(iv, 0, sizeof(iv));
+    allocator.deallocate(iv, AES_BLOCKSIZE);
 }
diff --git a/src/crypto/aes.h b/src/crypto/aes.h
index 4eae9a3bf7fa..617bb62de916 100644
--- a/src/crypto/aes.h
+++ b/src/crypto/aes.h
@@ -7,6 +7,7 @@
 #ifndef BITCOIN_CRYPTO_AES_H
 #define BITCOIN_CRYPTO_AES_H
 
+#include <support/allocators/secure.h>
 extern "C" {
 #include <crypto/ctaes/ctaes.h>
 }
@@ -18,7 +19,8 @@ static const int AES256_KEYSIZE = 32;
 class AES256Encrypt
 {
 private:
-    AES256_ctx ctx;
+    secure_allocator<AES256_ctx> allocator;
+    AES256_ctx *ctx;
 
 public:
     explicit AES256Encrypt(const unsigned char key[32]);
@@ -30,7 +32,8 @@ class AES256Encrypt
 class AES256Decrypt
 {
 private:
-    AES256_ctx ctx;
+    secure_allocator<AES256_ctx> allocator;
+    AES256_ctx *ctx;
 
 public:
     explicit AES256Decrypt(const unsigned char key[32]);
@@ -46,9 +49,10 @@ class AES256CBCEncrypt
     int Encrypt(const unsigned char* data, int size, unsigned char* out) const;
 
 private:
+    secure_allocator<unsigned char> allocator;
     const AES256Encrypt enc;
     const bool pad;
-    unsigned char iv[AES_BLOCKSIZE];
+    unsigned char *iv;
 };
 
 class AES256CBCDecrypt
@@ -59,9 +63,10 @@ class AES256CBCDecrypt
     int Decrypt(const unsigned char* data, int size, unsigned char* out) const;
 
 private:
+    secure_allocator<unsigned char> allocator;
     const AES256Decrypt dec;
     const bool pad;
-    unsigned char iv[AES_BLOCKSIZE];
+    unsigned char *iv;
 };
 
 #endif // BITCOIN_CRYPTO_AES_H
diff --git a/src/cuckoocache.h b/src/cuckoocache.h
index 281efbd06965..e25f691341f8 100644
--- a/src/cuckoocache.h
+++ b/src/cuckoocache.h
@@ -6,6 +6,7 @@
 #define BITCOIN_CUCKOOCACHE_H
 
 #include <util/fastrange.h>
+#include <util/overflow.h>
 
 #include <algorithm>
 #include <array>
@@ -63,7 +64,7 @@ class bit_packed_atomic_flags
     explicit bit_packed_atomic_flags(uint32_t size)
     {
         // pad out the size if needed
-        size = (size + 7) / 8;
+        size = CeilDiv(size, 8u);
         mem.reset(new std::atomic<uint8_t>[size]);
         for (uint32_t i = 0; i < size; ++i)
             mem[i].store(0xFF);
diff --git a/src/deploymentinfo.cpp b/src/deploymentinfo.cpp
index e1447d4dde23..551982b23ae7 100644
--- a/src/deploymentinfo.cpp
+++ b/src/deploymentinfo.cpp
@@ -13,10 +13,6 @@ const std::array<VBDeploymentInfo,Consensus::MAX_VERSION_BITS_DEPLOYMENTS> Versi
         .name = "testdummy",
         .gbt_optional_rule = true,
     },
-    VBDeploymentInfo{
-        .name = "taproot",
-        .gbt_optional_rule = true,
-    },
 };
 
 std::string DeploymentName(Consensus::BuriedDeployment dep)
diff --git a/src/flatfile.cpp b/src/flatfile.cpp
index 056fb9c1f924..b1b1e0456609 100644
--- a/src/flatfile.cpp
+++ b/src/flatfile.cpp
@@ -8,6 +8,7 @@
 #include <tinyformat.h>
 #include <util/fs_helpers.h>
 #include <util/log.h>
+#include <util/overflow.h>
 
 #include <stdexcept>
 
@@ -59,8 +60,8 @@ size_t FlatFileSeq::Allocate(const FlatFilePos& pos, size_t add_size, bool& out_
 {
     out_of_space = false;
 
-    unsigned int n_old_chunks = (pos.nPos + m_chunk_size - 1) / m_chunk_size;
-    unsigned int n_new_chunks = (pos.nPos + add_size + m_chunk_size - 1) / m_chunk_size;
+    unsigned int n_old_chunks = CeilDiv(pos.nPos, m_chunk_size);
+    unsigned int n_new_chunks = CeilDiv(pos.nPos + add_size, m_chunk_size);
     if (n_new_chunks > n_old_chunks) {
         size_t old_size = pos.nPos;
         size_t new_size = n_new_chunks * m_chunk_size;
diff --git a/src/httprpc.cpp b/src/httprpc.cpp
index 56a243085c2d..9a076996656c 100644
--- a/src/httprpc.cpp
+++ b/src/httprpc.cpp
@@ -38,13 +38,15 @@ static std::vector<std::vector<std::string>> g_rpcauth;
 static std::map<std::string, std::set<std::string>> g_rpc_whitelist;
 static bool g_rpc_whitelist_default = false;
 
-static void JSONErrorReply(HTTPRequest* req, UniValue objError, const JSONRPCRequest& jreq)
+static UniValue JSONErrorReply(UniValue objError, const JSONRPCRequest& jreq, HTTPStatusCode& nStatus)
 {
-    // Sending HTTP errors is a legacy JSON-RPC behavior.
+    // HTTP errors should never be returned if JSON-RPC v2 was requested. This
+    // function should only be called when a v1 request fails or when a request
+    // cannot be parsed, so the version is unknown.
     Assume(jreq.m_json_version != JSONRPCVersion::V2);
 
     // Send error reply from json-rpc error object
-    int nStatus = HTTP_INTERNAL_SERVER_ERROR;
+    nStatus = HTTP_INTERNAL_SERVER_ERROR;
     int code = objError.find_value("code").getInt<int>();
 
     if (code == RPC_INVALID_REQUEST)
@@ -52,10 +54,7 @@ static void JSONErrorReply(HTTPRequest* req, UniValue objError, const JSONRPCReq
     else if (code == RPC_METHOD_NOT_FOUND)
         nStatus = HTTP_NOT_FOUND;
 
-    std::string strReply = JSONRPCReplyObj(NullUniValue, std::move(objError), jreq.id, jreq.m_json_version).write() + "\n";
-
-    req->WriteHeader("Content-Type", "application/json");
-    req->WriteReply(nStatus, strReply);
+    return JSONRPCReplyObj(NullUniValue, std::move(objError), jreq.id, jreq.m_json_version);
 }
 
 //This function checks username and password against -rpcauth
@@ -101,60 +100,23 @@ static bool RPCAuthorized(const std::string& strAuth, std::string& strAuthUserna
     return CheckUserAuthorized(user, pass);
 }
 
-static bool HTTPReq_JSONRPC(const std::any& context, HTTPRequest* req)
+UniValue ExecuteHTTPRPC(const UniValue& valRequest, JSONRPCRequest& jreq, HTTPStatusCode& status)
 {
-    // JSONRPC handles only POST
-    if (req->GetRequestMethod() != HTTPRequest::POST) {
-        req->WriteReply(HTTP_BAD_METHOD, "JSONRPC server handles only POST requests");
-        return false;
-    }
-    // Check authorization
-    std::pair<bool, std::string> authHeader = req->GetHeader("authorization");
-    if (!authHeader.first) {
-        req->WriteHeader("WWW-Authenticate", WWW_AUTH_HEADER_DATA);
-        req->WriteReply(HTTP_UNAUTHORIZED);
-        return false;
-    }
-
-    JSONRPCRequest jreq;
-    jreq.context = context;
-    jreq.peerAddr = req->GetPeer().ToStringAddrPort();
-    if (!RPCAuthorized(authHeader.second, jreq.authUser)) {
-        LogWarning("ThreadRPCServer incorrect password attempt from %s", jreq.peerAddr);
-
-        /* Deter brute-forcing
-           If this results in a DoS the user really
-           shouldn't have their RPC port exposed. */
-        UninterruptibleSleep(std::chrono::milliseconds{250});
-
-        req->WriteHeader("WWW-Authenticate", WWW_AUTH_HEADER_DATA);
-        req->WriteReply(HTTP_UNAUTHORIZED);
-        return false;
-    }
-
+    status = HTTP_OK;
     try {
-        // Parse request
-        UniValue valRequest;
-        if (!valRequest.read(req->ReadBody()))
-            throw JSONRPCError(RPC_PARSE_ERROR, "Parse error");
-
-        // Set the URI
-        jreq.URI = req->GetURI();
-
-        UniValue reply;
         bool user_has_whitelist = g_rpc_whitelist.contains(jreq.authUser);
         if (!user_has_whitelist && g_rpc_whitelist_default) {
             LogWarning("RPC User %s not allowed to call any methods", jreq.authUser);
-            req->WriteReply(HTTP_FORBIDDEN);
-            return false;
+            status = HTTP_FORBIDDEN;
+            return {};
 
         // singleton request
         } else if (valRequest.isObject()) {
             jreq.parse(valRequest);
             if (user_has_whitelist && !g_rpc_whitelist[jreq.authUser].contains(jreq.strMethod)) {
                 LogWarning("RPC User %s not allowed to call method %s", jreq.authUser, jreq.strMethod);
-                req->WriteReply(HTTP_FORBIDDEN);
-                return false;
+                status = HTTP_FORBIDDEN;
+                return {};
             }
 
             // Legacy 1.0/1.1 behavior is for failed requests to throw
@@ -162,14 +124,13 @@ static bool HTTPReq_JSONRPC(const std::any& context, HTTPRequest* req)
             // 2.0 behavior is to catch exceptions and return HTTP success with
             // RPC errors, as long as there is not an actual HTTP server error.
             const bool catch_errors{jreq.m_json_version == JSONRPCVersion::V2};
-            reply = JSONRPCExec(jreq, catch_errors);
-
+            UniValue reply{JSONRPCExec(jreq, catch_errors)};
             if (jreq.IsNotification()) {
                 // Even though we do execute notifications, we do not respond to them
-                req->WriteReply(HTTP_NO_CONTENT);
-                return true;
+                status = HTTP_NO_CONTENT;
+                return {};
             }
-
+            return reply;
         // array of requests
         } else if (valRequest.isArray()) {
             // Check authorization for each request's method
@@ -183,15 +144,15 @@ static bool HTTPReq_JSONRPC(const std::any& context, HTTPRequest* req)
                         std::string strMethod = request.find_value("method").get_str();
                         if (!g_rpc_whitelist[jreq.authUser].contains(strMethod)) {
                             LogWarning("RPC User %s not allowed to call method %s", jreq.authUser, strMethod);
-                            req->WriteReply(HTTP_FORBIDDEN);
-                            return false;
+                            status = HTTP_FORBIDDEN;
+                            return {};
                         }
                     }
                 }
             }
 
             // Execute each request
-            reply = UniValue::VARR;
+            UniValue reply = UniValue::VARR;
             for (size_t i{0}; i < valRequest.size(); ++i) {
                 // Batches never throw HTTP errors, they are always just included
                 // in "HTTP OK" responses. Notifications never get any response.
@@ -218,23 +179,70 @@ static bool HTTPReq_JSONRPC(const std::any& context, HTTPRequest* req)
             // empty response in this case to favor being backwards compatible
             // over complying with the JSON-RPC 2.0 spec in this case.
             if (reply.size() == 0 && valRequest.size() > 0) {
-                req->WriteReply(HTTP_NO_CONTENT);
-                return true;
+                status = HTTP_NO_CONTENT;
+                return {};
             }
+            return reply;
         }
         else
             throw JSONRPCError(RPC_PARSE_ERROR, "Top-level object parse error");
-
-        req->WriteHeader("Content-Type", "application/json");
-        req->WriteReply(HTTP_OK, reply.write() + "\n");
     } catch (UniValue& e) {
-        JSONErrorReply(req, std::move(e), jreq);
-        return false;
+        return JSONErrorReply(std::move(e), jreq, status);
     } catch (const std::exception& e) {
-        JSONErrorReply(req, JSONRPCError(RPC_PARSE_ERROR, e.what()), jreq);
-        return false;
+        return JSONErrorReply(JSONRPCError(RPC_PARSE_ERROR, e.what()), jreq, status);
+    }
+}
+
+static void HTTPReq_JSONRPC(const std::any& context, HTTPRequest* req)
+{
+    // JSONRPC handles only POST
+    if (req->GetRequestMethod() != HTTPRequest::POST) {
+        req->WriteReply(HTTP_BAD_METHOD, "JSONRPC server handles only POST requests");
+        return;
+    }
+    // Check authorization
+    std::pair<bool, std::string> authHeader = req->GetHeader("authorization");
+    if (!authHeader.first) {
+        req->WriteHeader("WWW-Authenticate", WWW_AUTH_HEADER_DATA);
+        req->WriteReply(HTTP_UNAUTHORIZED);
+        return;
+    }
+
+    JSONRPCRequest jreq;
+    jreq.context = context;
+    jreq.peerAddr = req->GetPeer().ToStringAddrPort();
+    jreq.URI = req->GetURI();
+    if (!RPCAuthorized(authHeader.second, jreq.authUser)) {
+        LogWarning("ThreadRPCServer incorrect password attempt from %s", jreq.peerAddr);
+
+        /* Deter brute-forcing
+           If this results in a DoS the user really
+           shouldn't have their RPC port exposed. */
+        UninterruptibleSleep(std::chrono::milliseconds{250});
+
+        req->WriteHeader("WWW-Authenticate", WWW_AUTH_HEADER_DATA);
+        req->WriteReply(HTTP_UNAUTHORIZED);
+        return;
+    }
+
+    // Generate reply
+    HTTPStatusCode status;
+    UniValue reply;
+    UniValue request;
+    if (request.read(req->ReadBody())) {
+        reply = ExecuteHTTPRPC(request, jreq, status);
+    } else {
+        reply = JSONErrorReply(JSONRPCError(RPC_PARSE_ERROR, "Parse error"), jreq, status);
+    }
+
+    // Write reply
+    if (reply.isNull()) {
+        // Error case or no-content notification reply.
+        req->WriteReply(status);
+    } else {
+        req->WriteHeader("Content-Type", "application/json");
+        req->WriteReply(status, reply.write() + "\n");
     }
-    return true;
 }
 
 static bool InitRPCAuthentication()
@@ -256,12 +264,12 @@ static bool InitRPCAuthentication()
         }
 
         switch (GenerateAuthCookie(cookie_perms, user, pass)) {
-        case GenerateAuthCookieResult::ERR:
+        case AuthCookieResult::Error:
             return false;
-        case GenerateAuthCookieResult::DISABLED:
+        case AuthCookieResult::Disabled:
             LogInfo("RPC authentication cookie file generation is disabled.");
             break;
-        case GenerateAuthCookieResult::OK:
+        case AuthCookieResult::Ok:
             LogInfo("Using random cookie authentication.");
             break;
         }
diff --git a/src/httprpc.h b/src/httprpc.h
index 1c1a624168f7..511c82a4459c 100644
--- a/src/httprpc.h
+++ b/src/httprpc.h
@@ -7,6 +7,10 @@
 
 #include <any>
 
+class JSONRPCRequest;
+class UniValue;
+enum HTTPStatusCode : int;
+
 /** Start HTTP RPC subsystem.
  * Precondition; HTTP and RPC has been started.
  */
@@ -19,6 +23,11 @@ void InterruptHTTPRPC();
  */
 void StopHTTPRPC();
 
+/** Execute a single HTTP request containing one or more JSONRPC requests.
+ * Specified `jreq` will be modified and `status` will be returned.
+ */
+UniValue ExecuteHTTPRPC(const UniValue& valRequest, JSONRPCRequest& jreq, HTTPStatusCode& status);
+
 /** Start HTTP REST subsystem.
  * Precondition; HTTP and RPC has been started.
  */
diff --git a/src/httpserver.h b/src/httpserver.h
index 5461480d44f2..76381a382b32 100644
--- a/src/httpserver.h
+++ b/src/httpserver.h
@@ -50,7 +50,7 @@ void StopHTTPServer();
 void UpdateHTTPServerLogging(bool enable);
 
 /** Handler for requests to a certain HTTP path */
-typedef std::function<bool(HTTPRequest* req, const std::string &)> HTTPRequestHandler;
+typedef std::function<void(HTTPRequest* req, const std::string &)> HTTPRequestHandler;
 /** Register handler for prefix.
  * If multiple handlers match a prefix, the first-registered one will
  * be invoked.
diff --git a/src/index/base.cpp b/src/index/base.cpp
index fba2f4f6c106..9e75109d5c93 100644
--- a/src/index/base.cpp
+++ b/src/index/base.cpp
@@ -33,9 +33,9 @@
 #include <cassert>
 #include <compare>
 #include <cstdint>
+#include <functional>
 #include <memory>
 #include <optional>
-#include <span>
 #include <stdexcept>
 #include <string>
 #include <thread>
@@ -155,11 +155,15 @@ static const CBlockIndex* NextSyncBlock(const CBlockIndex* pindex_prev, CChain&
         return chain.Genesis();
     }
 
-    const CBlockIndex* pindex = chain.Next(pindex_prev);
-    if (pindex) {
+    if (const auto* pindex{chain.Next(pindex_prev)}) {
         return pindex;
     }
 
+    // If there is no next block, we might be synced
+    if (pindex_prev == chain.Tip()) {
+        return nullptr;
+    }
+
     // Since block is not in the chain, return the next block in the chain AFTER the last common ancestor.
     // Caller will be responsible for rewinding back to the common ancestor.
     return chain.Next(chain.FindFork(pindex_prev));
diff --git a/src/index/base.h b/src/index/base.h
index d8fd85669335..63f60be0349a 100644
--- a/src/index/base.h
+++ b/src/index/base.h
@@ -9,7 +9,7 @@
 #include <dbwrapper.h>
 #include <interfaces/chain.h>
 #include <kernel/cs_main.h>
-#include <threadsafety.h>
+#include <sync.h>
 #include <uint256.h>
 #include <util/fs.h>
 #include <util/threadinterrupt.h>
diff --git a/src/index/blockfilterindex.cpp b/src/index/blockfilterindex.cpp
index 67fa1fab3185..e63aa4a332c1 100644
--- a/src/index/blockfilterindex.cpp
+++ b/src/index/blockfilterindex.cpp
@@ -28,7 +28,6 @@
 #include <exception>
 #include <map>
 #include <optional>
-#include <span>
 #include <stdexcept>
 #include <string>
 #include <tuple>
diff --git a/src/index/coinstatsindex.cpp b/src/index/coinstatsindex.cpp
index 319ffcadc638..80a6d8dfd2b3 100644
--- a/src/index/coinstatsindex.cpp
+++ b/src/index/coinstatsindex.cpp
@@ -30,7 +30,6 @@
 
 #include <compare>
 #include <limits>
-#include <span>
 #include <string>
 #include <utility>
 #include <vector>
diff --git a/src/index/txindex.cpp b/src/index/txindex.cpp
index d0e880213250..4b0c82877ab2 100644
--- a/src/index/txindex.cpp
+++ b/src/index/txindex.cpp
@@ -24,7 +24,6 @@
 #include <cstdint>
 #include <cstdio>
 #include <exception>
-#include <span>
 #include <string>
 #include <utility>
 #include <vector>
diff --git a/src/index/txospenderindex.cpp b/src/index/txospenderindex.cpp
index d451bb1e0a49..f0d559a958f5 100644
--- a/src/index/txospenderindex.cpp
+++ b/src/index/txospenderindex.cpp
@@ -26,7 +26,6 @@
 #include <cstdio>
 #include <exception>
 #include <ios>
-#include <span>
 #include <string>
 #include <utility>
 #include <vector>
diff --git a/src/init.cpp b/src/init.cpp
index fb4b8fa9e27a..407ee0fefffe 100644
--- a/src/init.cpp
+++ b/src/init.cpp
@@ -12,6 +12,7 @@
 #include <addrman.h>
 #include <banman.h>
 #include <blockfilter.h>
+#include <btcsignals.h>
 #include <chain.h>
 #include <chainparams.h>
 #include <chainparamsbase.h>
@@ -112,8 +113,6 @@
 #include <sys/stat.h>
 #endif
 
-#include <boost/signals2/signal.hpp>
-
 #ifdef ENABLE_ZMQ
 #include <zmq/zmqabstractnotifier.h>
 #include <zmq/zmqnotificationinterface.h>
@@ -276,7 +275,9 @@ void Interrupt(NodeContext& node)
     InterruptHTTPRPC();
     InterruptRPC();
     InterruptREST();
-    InterruptTorControl();
+    if (node.tor_controller) {
+        node.tor_controller->Interrupt();
+    }
     InterruptMapPort();
     if (node.connman)
         node.connman->Interrupt();
@@ -319,7 +320,10 @@ void Shutdown(NodeContext& node)
     if (node.peerman && node.validation_signals) node.validation_signals->UnregisterValidationInterface(node.peerman.get());
     if (node.connman) node.connman->Stop();
 
-    StopTorControl();
+    if (node.tor_controller) {
+        node.tor_controller->Join();
+        node.tor_controller.reset();
+    }
 
     if (node.background_init_thread.joinable()) node.background_init_thread.join();
     // After everything has been shut down, but before things get flushed, stop the
@@ -506,7 +510,7 @@ void SetupServerArgs(ArgsManager& argsman, bool can_listen_ipc)
     argsman.AddArg("-dbcache=<n>", strprintf("Maximum database cache size <n> MiB (minimum %d, default: %d). Make sure you have enough RAM. In addition, unused memory allocated to the mempool is shared with this cache (see -maxmempool).", MIN_DB_CACHE >> 20, node::GetDefaultDBCache() >> 20), ArgsManager::ALLOW_ANY, OptionsCategory::OPTIONS);
     argsman.AddArg("-includeconf=<file>", "Specify additional configuration file, relative to the -datadir path (only useable from configuration file, not command line)", ArgsManager::ALLOW_ANY, OptionsCategory::OPTIONS);
     argsman.AddArg("-allowignoredconf", strprintf("For backwards compatibility, treat an unused %s file in the datadir as a warning, not an error.", BITCOIN_CONF_FILENAME), ArgsManager::ALLOW_ANY, OptionsCategory::OPTIONS);
-    argsman.AddArg("-loadblock=<file>", "Imports blocks from external file on startup", ArgsManager::ALLOW_ANY, OptionsCategory::OPTIONS);
+    argsman.AddArg("-loadblock=<file>", "Imports blocks from an external file on startup. Obfuscated blocks are not supported.", ArgsManager::ALLOW_ANY, OptionsCategory::OPTIONS);
     argsman.AddArg("-maxmempool=<n>", strprintf("Keep the transaction memory pool below <n> megabytes (default: %u)", DEFAULT_MAX_MEMPOOL_SIZE_MB), ArgsManager::ALLOW_ANY, OptionsCategory::OPTIONS);
     argsman.AddArg("-mempoolexpiry=<n>", strprintf("Do not keep transactions in the mempool longer than <n> hours (default: %u)", DEFAULT_MEMPOOL_EXPIRY_HOURS), ArgsManager::ALLOW_ANY, OptionsCategory::OPTIONS);
     argsman.AddArg("-minimumchainwork=<hex>", strprintf("Minimum work assumed to exist on a valid chain in hex (default: %s, testnet3: %s, testnet4: %s, signet: %s)", defaultChainParams->GetConsensus().nMinimumChainWork.GetHex(), testnetChainParams->GetConsensus().nMinimumChainWork.GetHex(), testnet4ChainParams->GetConsensus().nMinimumChainWork.GetHex(), signetChainParams->GetConsensus().nMinimumChainWork.GetHex()), ArgsManager::ALLOW_ANY | ArgsManager::DEBUG_ONLY, OptionsCategory::OPTIONS);
@@ -719,7 +723,7 @@ void SetupServerArgs(ArgsManager& argsman, bool can_listen_ipc)
     argsman.AddArg("-rpcworkqueue=<n>", strprintf("Set the maximum depth of the work queue to service RPC calls (default: %d)", DEFAULT_HTTP_WORKQUEUE), ArgsManager::ALLOW_ANY | ArgsManager::DEBUG_ONLY, OptionsCategory::RPC);
     argsman.AddArg("-server", "Accept command line and JSON-RPC commands", ArgsManager::ALLOW_ANY, OptionsCategory::RPC);
     if (can_listen_ipc) {
-        argsman.AddArg("-ipcbind=<address>", "Bind to Unix socket address and listen for incoming connections. Valid address values are \"unix\" to listen on the default path, <datadir>/node.sock, or \"unix:/custom/path\" to specify a custom path. Can be specified multiple times to listen on multiple paths. Default behavior is not to listen on any path. If relative paths are specified, they are interpreted relative to the network data directory. If paths include any parent directory components and the parent directories do not exist, they will be created.", ArgsManager::ALLOW_ANY, OptionsCategory::IPC);
+        argsman.AddArg("-ipcbind=<address>", "Bind to Unix socket address and listen for incoming connections. Valid address values are \"unix\" to listen on the default path, <datadir>/node.sock, or \"unix:/custom/path\" to specify a custom path. Can be specified multiple times to listen on multiple paths. Default behavior is not to listen on any path. If relative paths are specified, they are interpreted relative to the network data directory. If paths include any parent directory components and the parent directories do not exist, they will be created. Enabling this gives local processes that can access the socket unauthenticated RPC access, so it's important to choose a path with secure permissions if customizing this.", ArgsManager::ALLOW_ANY, OptionsCategory::IPC);
     }
 
 #if HAVE_DECL_FORK
@@ -2187,10 +2191,29 @@ bool AppInitMain(NodeContext& node, interfaces::BlockAndHeaderTipInfo* tip_info)
                                     "for the automatically created Tor onion service."),
                                   onion_service_target.ToStringAddrPort()));
         }
-        StartTorControl(onion_service_target);
+        node.tor_controller = std::make_unique<TorController>(gArgs.GetArg("-torcontrol", DEFAULT_TOR_CONTROL), onion_service_target);
+    }
+
+    bool should_discover = connOptions.bind_on_any;
+    if (!should_discover) {
+        for (const auto& bind : connOptions.vBinds) {
+            if (bind.IsBindAny()) {
+                should_discover = true;
+                break;
+            }
+        }
+    }
+
+    if (!should_discover) {
+        for (const auto& whitebind : connOptions.vWhiteBinds) {
+            if (whitebind.m_service.IsBindAny()) {
+                should_discover = true;
+                break;
+            }
+        }
     }
 
-    if (connOptions.bind_on_any) {
+    if (should_discover) {
         // Only add all IP addresses of the machine if we would be listening on
         // any address - 0.0.0.0 (IPv4) and :: (IPv6).
         Discover();
diff --git a/src/init/basic.cpp b/src/init/basic.cpp
new file mode 100644
index 000000000000..12d468c0af96
--- /dev/null
+++ b/src/init/basic.cpp
@@ -0,0 +1,26 @@
+// Copyright (c) 2025 The Bitcoin Core developers
+// Distributed under the MIT software license, see the accompanying
+// file COPYING or http://www.opensource.org/licenses/mit-license.php.
+
+#include <interfaces/init.h>
+#include <interfaces/ipc.h>
+
+namespace init {
+namespace {
+class BitcoinBasicInit : public interfaces::Init
+{
+public:
+    BitcoinBasicInit(const char* exe_name, const char* process_argv0) : m_ipc(interfaces::MakeIpc(exe_name, process_argv0, *this)) {}
+    interfaces::Ipc* ipc() override { return m_ipc.get(); }
+private:
+    std::unique_ptr<interfaces::Ipc> m_ipc;
+};
+} // namespace
+} // namespace init
+
+namespace interfaces {
+std::unique_ptr<Init> MakeBasicInit(const char* exe_name, const char* process_argv0)
+{
+    return std::make_unique<init::BitcoinBasicInit>(exe_name, process_argv0);
+}
+} // namespace interfaces
diff --git a/src/init/bitcoin-gui.cpp b/src/init/bitcoin-gui.cpp
index ca3077b9bb2b..45f623d026a6 100644
--- a/src/init/bitcoin-gui.cpp
+++ b/src/init/bitcoin-gui.cpp
@@ -7,7 +7,9 @@
 #include <interfaces/echo.h>
 #include <interfaces/init.h>
 #include <interfaces/ipc.h>
+#include <interfaces/mining.h>
 #include <interfaces/node.h>
+#include <interfaces/rpc.h>
 #include <interfaces/wallet.h>
 #include <node/context.h>
 #include <util/check.h>
@@ -28,11 +30,13 @@ class BitcoinGuiInit : public interfaces::Init
     }
     std::unique_ptr<interfaces::Node> makeNode() override { return interfaces::MakeNode(m_node); }
     std::unique_ptr<interfaces::Chain> makeChain() override { return interfaces::MakeChain(m_node); }
+    std::unique_ptr<interfaces::Mining> makeMining() override { return interfaces::MakeMining(m_node); }
     std::unique_ptr<interfaces::WalletLoader> makeWalletLoader(interfaces::Chain& chain) override
     {
         return MakeWalletLoader(chain, *Assert(m_node.args));
     }
     std::unique_ptr<interfaces::Echo> makeEcho() override { return interfaces::MakeEcho(); }
+    std::unique_ptr<interfaces::Rpc> makeRpc() override { return interfaces::MakeRpc(m_node); }
     interfaces::Ipc* ipc() override { return m_ipc.get(); }
     // bitcoin-gui accepts -ipcbind option even though it does not use it
     // directly. It just returns true here to accept the option because
diff --git a/src/init/bitcoin-node.cpp b/src/init/bitcoin-node.cpp
index e42521938a62..b4e5b8eeb6db 100644
--- a/src/init/bitcoin-node.cpp
+++ b/src/init/bitcoin-node.cpp
@@ -8,6 +8,7 @@
 #include <interfaces/init.h>
 #include <interfaces/ipc.h>
 #include <interfaces/node.h>
+#include <interfaces/rpc.h>
 #include <interfaces/wallet.h>
 #include <node/context.h>
 #include <util/check.h>
@@ -36,6 +37,7 @@ class BitcoinNodeInit : public interfaces::Init
         return MakeWalletLoader(chain, *Assert(m_node.args));
     }
     std::unique_ptr<interfaces::Echo> makeEcho() override { return interfaces::MakeEcho(); }
+    std::unique_ptr<interfaces::Rpc> makeRpc() override { return interfaces::MakeRpc(m_node); }
     interfaces::Ipc* ipc() override { return m_ipc.get(); }
     bool canListenIpc() override { return true; }
     const char* exeName() override { return EXE_NAME; }
diff --git a/src/init/common.cpp b/src/init/common.cpp
index cb35c1b4f62a..f65e3c92d133 100644
--- a/src/init/common.cpp
+++ b/src/init/common.cpp
@@ -40,7 +40,7 @@ void AddLoggingArgs(ArgsManager& argsman)
     argsman.AddArg("-loglevelalways", strprintf("Always prepend a category and level (default: %u)", DEFAULT_LOGLEVELALWAYS), ArgsManager::ALLOW_ANY, OptionsCategory::DEBUG_TEST);
     argsman.AddArg("-logratelimit", strprintf("Apply rate limiting to unconditional logging to mitigate disk-filling attacks (default: %u)", BCLog::DEFAULT_LOGRATELIMIT), ArgsManager::ALLOW_ANY | ArgsManager::DEBUG_ONLY, OptionsCategory::DEBUG_TEST);
     argsman.AddArg("-printtoconsole", "Send trace/debug info to console (default: 1 when no -daemon. To disable logging to file, set -nodebuglogfile)", ArgsManager::ALLOW_ANY, OptionsCategory::DEBUG_TEST);
-    argsman.AddArg("-shrinkdebugfile", "Shrink debug.log file on client startup (default: 1 when no -debug)", ArgsManager::ALLOW_ANY, OptionsCategory::DEBUG_TEST);
+    argsman.AddArg("-shrinkdebugfile", "Shrink debug log file on client startup (default: 1 when no -debug)", ArgsManager::ALLOW_ANY, OptionsCategory::DEBUG_TEST);
 }
 
 void SetLoggingOptions(const ArgsManager& args)
diff --git a/src/interfaces/README.md b/src/interfaces/README.md
index 97167d5298f0..cbb2c40f3198 100644
--- a/src/interfaces/README.md
+++ b/src/interfaces/README.md
@@ -16,4 +16,6 @@ The following interfaces are defined here:
 
 * [`Ipc`](ipc.h) — used by multiprocess code to access `Init` interface across processes. Added in [#19160](https://github.com/bitcoin/bitcoin/pull/19160).
 
+* [`Rpc`](rpc.h) — used by `bitcoin-cli` to be able to call RPC methods over a unix socket instead of TCP.
+
 The interfaces above define boundaries between major components of bitcoin code (node, wallet, and gui), making it possible for them to run in [different processes](../../doc/multiprocess.md), and be tested, developed, and understood independently. These interfaces are not currently designed to be stable or to be used externally.
diff --git a/src/interfaces/handler.h b/src/interfaces/handler.h
index b3aebf7e14da..a68af21a0c5a 100644
--- a/src/interfaces/handler.h
+++ b/src/interfaces/handler.h
@@ -8,11 +8,9 @@
 #include <functional>
 #include <memory>
 
-namespace boost {
-namespace signals2 {
-class connection;
-} // namespace signals2
-} // namespace boost
+namespace btcsignals {
+    class connection;
+} // namespace btcsignals
 
 namespace interfaces {
 
@@ -28,8 +26,8 @@ class Handler
     virtual void disconnect() = 0;
 };
 
-//! Return handler wrapping a boost signal connection.
-std::unique_ptr<Handler> MakeSignalHandler(boost::signals2::connection connection);
+//! Return handler wrapping a btcsignals connection.
+std::unique_ptr<Handler> MakeSignalHandler(btcsignals::connection connection);
 
 //! Return handler wrapping a cleanup function.
 std::unique_ptr<Handler> MakeCleanupHandler(std::function<void()> cleanup);
diff --git a/src/interfaces/init.h b/src/interfaces/init.h
index 463d43e7c2ea..d5b394b0e231 100644
--- a/src/interfaces/init.h
+++ b/src/interfaces/init.h
@@ -9,6 +9,7 @@
 #include <interfaces/echo.h>
 #include <interfaces/mining.h>
 #include <interfaces/node.h>
+#include <interfaces/rpc.h>
 #include <interfaces/wallet.h>
 
 #include <memory>
@@ -36,6 +37,7 @@ class Init
     virtual std::unique_ptr<Mining> makeMining() { return nullptr; }
     virtual std::unique_ptr<WalletLoader> makeWalletLoader(Chain& chain) { return nullptr; }
     virtual std::unique_ptr<Echo> makeEcho() { return nullptr; }
+    virtual std::unique_ptr<Rpc> makeRpc() { return nullptr; }
     virtual Ipc* ipc() { return nullptr; }
     virtual bool canListenIpc() { return false; }
     virtual const char* exeName() { return nullptr; }
@@ -55,6 +57,25 @@ std::unique_ptr<Init> MakeWalletInit(int argc, char* argv[], int& exit_status);
 
 //! Return implementation of Init interface for the gui process.
 std::unique_ptr<Init> MakeGuiInit(int argc, char* argv[]);
+
+//! Return implementation of Init interface for a basic IPC client that doesn't
+//! provide any IPC services itself.
+//!
+//! When an IPC client connects to a socket or spawns a process, it gets a pointer
+//! to an Init object allowing it to create objects and threads on the remote
+//! side of the IPC connection. But the client also needs to provide a local Init
+//! object to allow the remote side of the connection to create objects and
+//! threads on this side. This function just returns a basic Init object
+//! allowing remote connections to only create local threads, not other objects
+//! (because its Init::make* methods return null.)
+//!
+//! @param exe_name Current executable name, which is just passed to the IPC
+//!     system and used for logging.
+//!
+//! @param process_argv0 Optional string containing argv[0] value passed to
+//!     main(). This is passed to the IPC system and used to locate binaries by
+//!     relative path if subprocesses are spawned.
+std::unique_ptr<Init> MakeBasicInit(const char* exe_name, const char* process_argv0="");
 } // namespace interfaces
 
 #endif // BITCOIN_INTERFACES_INIT_H
diff --git a/src/interfaces/ipc.h b/src/interfaces/ipc.h
index f94ffa3c9d76..23b46fb68266 100644
--- a/src/interfaces/ipc.h
+++ b/src/interfaces/ipc.h
@@ -7,6 +7,7 @@
 
 #include <functional>
 #include <memory>
+#include <string>
 #include <typeindex>
 
 namespace ipc {
diff --git a/src/interfaces/node.h b/src/interfaces/node.h
index 6a051d8d3860..f6d8209f0727 100644
--- a/src/interfaces/node.h
+++ b/src/interfaces/node.h
@@ -19,6 +19,7 @@
 #include <cstdint>
 #include <functional>
 #include <memory>
+#include <optional>
 #include <string>
 #include <tuple>
 #include <vector>
@@ -123,7 +124,7 @@ class Node
     virtual void mapPort(bool enable) = 0;
 
     //! Get proxy.
-    virtual bool getProxy(Network net, Proxy& proxy_info) = 0;
+    virtual std::optional<Proxy> getProxy(Network net) = 0;
 
     //! Get number of connections.
     virtual size_t getNodeCount(ConnectionDirection flags) = 0;
diff --git a/src/interfaces/rpc.h b/src/interfaces/rpc.h
new file mode 100644
index 000000000000..d8d5566ad87a
--- /dev/null
+++ b/src/interfaces/rpc.h
@@ -0,0 +1,31 @@
+// Copyright (c) 2025 The Bitcoin Core developers
+// Distributed under the MIT software license, see the accompanying
+// file COPYING or http://www.opensource.org/licenses/mit-license.php.
+
+#ifndef BITCOIN_INTERFACES_RPC_H
+#define BITCOIN_INTERFACES_RPC_H
+
+#include <memory>
+#include <string>
+
+class UniValue;
+
+namespace node {
+struct NodeContext;
+} // namespace node
+
+namespace interfaces {
+//! Interface giving clients ability to emulate HTTP RPC calls.
+class Rpc
+{
+public:
+    virtual ~Rpc() = default;
+    virtual UniValue executeRpc(UniValue request, std::string url, std::string user) = 0;
+};
+
+//! Return implementation of Rpc interface.
+std::unique_ptr<Rpc> MakeRpc(node::NodeContext& node);
+
+} // namespace interfaces
+
+#endif // BITCOIN_INTERFACES_RPC_H
diff --git a/src/ipc/CMakeLists.txt b/src/ipc/CMakeLists.txt
index 5378ef1924bf..8326423d8bc4 100644
--- a/src/ipc/CMakeLists.txt
+++ b/src/ipc/CMakeLists.txt
@@ -14,6 +14,7 @@ target_capnp_sources(bitcoin_ipc ${CMAKE_CURRENT_SOURCE_DIR}
   capnp/echo.capnp
   capnp/init.capnp
   capnp/mining.capnp
+  capnp/rpc.capnp
 )
 
 target_link_libraries(bitcoin_ipc
diff --git a/src/ipc/capnp/init-types.h b/src/ipc/capnp/init-types.h
index 2abd7b211e17..c6764d2a2800 100644
--- a/src/ipc/capnp/init-types.h
+++ b/src/ipc/capnp/init-types.h
@@ -7,5 +7,6 @@
 
 #include <ipc/capnp/echo.capnp.proxy-types.h>
 #include <ipc/capnp/mining.capnp.proxy-types.h>
+#include <ipc/capnp/rpc.capnp.proxy-types.h>
 
 #endif // BITCOIN_IPC_CAPNP_INIT_TYPES_H
diff --git a/src/ipc/capnp/init.capnp b/src/ipc/capnp/init.capnp
index a20ef2fcaf36..d95bfb7426a8 100644
--- a/src/ipc/capnp/init.capnp
+++ b/src/ipc/capnp/init.capnp
@@ -15,11 +15,13 @@ $Proxy.includeTypes("ipc/capnp/init-types.h");
 
 using Echo = import "echo.capnp";
 using Mining = import "mining.capnp";
+using Rpc = import "rpc.capnp";
 
 interface Init $Proxy.wrap("interfaces::Init") {
     construct @0 (threadMap: Proxy.ThreadMap) -> (threadMap :Proxy.ThreadMap);
     makeEcho @1 (context :Proxy.Context) -> (result :Echo.Echo);
     makeMining @3 (context :Proxy.Context) -> (result :Mining.Mining);
+    makeRpc @4 (context :Proxy.Context) -> (result :Rpc.Rpc);
 
     # DEPRECATED: no longer supported; server returns an error.
     makeMiningOld2 @2 () -> ();
diff --git a/src/ipc/capnp/rpc-types.h b/src/ipc/capnp/rpc-types.h
new file mode 100644
index 000000000000..4d385dee3121
--- /dev/null
+++ b/src/ipc/capnp/rpc-types.h
@@ -0,0 +1,12 @@
+// Copyright (c) 2025 The Bitcoin Core developers
+// Distributed under the MIT software license, see the accompanying
+// file COPYING or http://www.opensource.org/licenses/mit-license.php.
+
+#ifndef BITCOIN_IPC_CAPNP_RPC_TYPES_H
+#define BITCOIN_IPC_CAPNP_RPC_TYPES_H
+
+#include <ipc/capnp/common.capnp.proxy-types.h>
+#include <ipc/capnp/common-types.h>
+#include <ipc/capnp/rpc.capnp.proxy.h>
+
+#endif // BITCOIN_IPC_CAPNP_RPC_TYPES_H
diff --git a/src/ipc/capnp/rpc.capnp b/src/ipc/capnp/rpc.capnp
new file mode 100644
index 000000000000..c831424a0463
--- /dev/null
+++ b/src/ipc/capnp/rpc.capnp
@@ -0,0 +1,17 @@
+# Copyright (c) 2025 The Bitcoin Core developers
+# Distributed under the MIT software license, see the accompanying
+# file COPYING or http://www.opensource.org/licenses/mit-license.php.
+
+@0x9c3505dc45e146ac;
+
+using Cxx = import "/capnp/c++.capnp";
+$Cxx.namespace("ipc::capnp::messages");
+
+using Common = import "common.capnp";
+using Proxy = import "/mp/proxy.capnp";
+$Proxy.include("interfaces/rpc.h");
+$Proxy.includeTypes("ipc/capnp/rpc-types.h");
+
+interface Rpc $Proxy.wrap("interfaces::Rpc") {
+    executeRpc @0 (context :Proxy.Context, request :Text, uri :Text, user :Text) -> (result :Text);
+}
diff --git a/src/ipc/interfaces.cpp b/src/ipc/interfaces.cpp
index f40913d1853e..1171f7064871 100644
--- a/src/ipc/interfaces.cpp
+++ b/src/ipc/interfaces.cpp
@@ -95,10 +95,13 @@ class IpcImpl : public interfaces::Ipc
                 fd = m_process->connect(gArgs.GetDataDirNet(), "bitcoin-node", address);
             } catch (const std::system_error& e) {
                 // If connection type is auto and socket path isn't accepting connections, or doesn't exist, catch the error and return null;
-                if (e.code() == std::errc::connection_refused || e.code() == std::errc::no_such_file_or_directory) {
+                if (e.code() == std::errc::connection_refused || e.code() == std::errc::no_such_file_or_directory || e.code() == std::errc::not_a_directory) {
                     return nullptr;
                 }
                 throw;
+            } catch (const std::invalid_argument&) {
+               // Catch 'Unix address path "..." exceeded maximum socket path length' error
+               return nullptr;
             }
         } else {
             fd = m_process->connect(gArgs.GetDataDirNet(), "bitcoin-node", address);
diff --git a/src/ipc/libmultiprocess/.github/workflows/bitcoin-core-ci.yml b/src/ipc/libmultiprocess/.github/workflows/bitcoin-core-ci.yml
new file mode 100644
index 000000000000..e6ac83f0bd45
--- /dev/null
+++ b/src/ipc/libmultiprocess/.github/workflows/bitcoin-core-ci.yml
@@ -0,0 +1,300 @@
+# Copyright (c) The Bitcoin Core developers
+# Distributed under the MIT software license, see the accompanying
+# file COPYING or https://opensource.org/license/mit.
+
+# Test libmultiprocess inside Bitcoin Core by replacing the subtree copy
+# with the version from this PR, then building and running IPC-related
+# unit & functional tests.
+
+name: Bitcoin Core CI
+
+on:
+  push:
+  pull_request:
+
+concurrency:
+  group: ${{ github.workflow }}-${{ github.ref }}
+  cancel-in-progress: true
+
+env:
+  BITCOIN_REPO: bitcoin/bitcoin
+  LLVM_VERSION: 22
+  LIBCXX_DIR: /tmp/libcxx-build/
+
+jobs:
+  bitcoin-core:
+    name: ${{ matrix.name }}
+    runs-on: ${{ matrix.runner }}
+    timeout-minutes: 120
+
+    strategy:
+      fail-fast: false
+      matrix:
+        include:
+          - name: 'ASan + UBSan'
+            unit_test_runs: 15
+            functional_test_runs: 20
+            nproc_multiplier: 2
+            functional_timeout_factor: 40
+            runner: ubuntu-24.04
+            apt-llvm: true
+            packages: >-
+              ccache
+              clang-22
+              llvm-22
+              libclang-rt-22-dev
+              libevent-dev
+              libboost-dev
+              libsqlite3-dev
+              libcapnp-dev
+              capnproto
+              ninja-build
+              pkgconf
+              python3-pip
+            pip-packages: --break-system-packages pycapnp
+            cmake-args: |-
+              -DSANITIZERS=address,float-divide-by-zero,integer,undefined
+              -DCMAKE_C_COMPILER=clang
+              -DCMAKE_CXX_COMPILER=clang++
+              -DCMAKE_C_FLAGS=-ftrivial-auto-var-init=pattern
+              -DCMAKE_CXX_FLAGS=-ftrivial-auto-var-init=pattern
+
+          - name: 'macOS'
+            unit_test_runs: 50
+            functional_test_runs: 20
+            nproc_multiplier: 2
+            functional_timeout_factor: 40
+            runner: macos-15
+            brew-packages: ccache capnp boost libevent sqlite pkgconf ninja
+            pip-packages: --break-system-packages pycapnp
+            cmake-args: |-
+              -DREDUCE_EXPORTS=ON
+
+    env:
+      CCACHE_MAXSIZE: 400M
+      CCACHE_DIR: ${{ github.workspace }}/.ccache
+
+    steps:
+      - name: Checkout Bitcoin Core
+        uses: actions/checkout@v4
+        with:
+          repository: ${{ env.BITCOIN_REPO }}
+          fetch-depth: 1
+
+      - name: Checkout libmultiprocess
+        uses: actions/checkout@v4
+        with:
+          path: _libmultiprocess
+
+      - name: Replace libmultiprocess subtree
+        run: _libmultiprocess/ci/scripts/bitcoin_core_ci.sh replace_subtree
+
+      - name: Add LLVM apt repository
+        if: matrix.apt-llvm
+        run: _libmultiprocess/ci/scripts/bitcoin_core_ci.sh add_llvm_apt_repository
+
+      - name: Install APT packages
+        if: matrix.packages
+        run: _libmultiprocess/ci/scripts/ci_helpers.sh install_apt_packages ${{ matrix.packages }}
+
+      - name: Configure LLVM alternatives
+        if: matrix.packages
+        run: _libmultiprocess/ci/scripts/bitcoin_core_ci.sh install_llvm_alternatives
+
+      - name: Install Homebrew packages
+        if: matrix.brew-packages
+        run: _libmultiprocess/ci/scripts/ci_helpers.sh install_homebrew_packages ${{ matrix.brew-packages }}
+
+      - name: Install pip packages
+        if: matrix.pip-packages
+        run: _libmultiprocess/ci/scripts/ci_helpers.sh install_pip_packages ${{ matrix.pip-packages }}
+
+      - name: Determine parallelism
+        run: _libmultiprocess/ci/scripts/ci_helpers.sh determine_parallelism "${{ matrix.nproc_multiplier }}"
+
+      - name: Restore ccache
+        id: ccache-restore
+        uses: actions/cache/restore@v4
+        with:
+          path: ${{ env.CCACHE_DIR }}
+          key: ccache-${{ matrix.name }}-${{ github.ref }}-${{ github.sha }}
+          restore-keys: |
+            ccache-${{ matrix.name }}-${{ github.ref }}-
+            ccache-${{ matrix.name }}-
+
+      - name: Reset ccache stats
+        if: matrix.packages || matrix.brew-packages
+        run: _libmultiprocess/ci/scripts/ci_helpers.sh reset_ccache_stats
+
+      - name: CMake configure
+        env:
+          BITCOIN_CORE_CMAKE_ARGS: ${{ matrix.cmake-args }}
+        run: _libmultiprocess/ci/scripts/bitcoin_core_ci.sh configure_bitcoin_core
+
+      - name: Build
+        run: _libmultiprocess/ci/scripts/bitcoin_core_ci.sh build_bitcoin_core
+
+      - name: Show ccache stats
+        if: matrix.packages || matrix.brew-packages
+        run: _libmultiprocess/ci/scripts/ci_helpers.sh show_ccache_stats
+
+      - name: Run IPC unit tests
+        env:
+          ASAN_OPTIONS: detect_leaks=1:detect_stack_use_after_return=1:check_initialization_order=1:strict_init_order=1
+          LSAN_OPTIONS: suppressions=${{ github.workspace }}/test/sanitizer_suppressions/lsan
+          UBSAN_OPTIONS: suppressions=${{ github.workspace }}/test/sanitizer_suppressions/ubsan:print_stacktrace=1:halt_on_error=1:report_error_type=1
+        run: _libmultiprocess/ci/scripts/bitcoin_core_ci.sh run_ipc_unit_tests "${{ matrix.unit_test_runs }}"
+
+      - name: Run IPC functional tests
+        env:
+          ASAN_OPTIONS: detect_leaks=1:detect_stack_use_after_return=1:check_initialization_order=1:strict_init_order=1
+          LSAN_OPTIONS: suppressions=${{ github.workspace }}/test/sanitizer_suppressions/lsan
+          UBSAN_OPTIONS: suppressions=${{ github.workspace }}/test/sanitizer_suppressions/ubsan:print_stacktrace=1:halt_on_error=1:report_error_type=1
+          CI_FAILFAST_TEST_LEAVE_DANGLING: 1
+        run: _libmultiprocess/ci/scripts/bitcoin_core_ci.sh run_ipc_functional_tests "${{ matrix.functional_test_runs }}" "${{ matrix.functional_timeout_factor }}"
+
+      - name: Save ccache
+        uses: actions/cache/save@v4
+        if: github.ref == 'refs/heads/master' || steps.ccache-restore.outputs.cache-hit != 'true'
+        with:
+          path: ${{ env.CCACHE_DIR }}
+          key: ccache-${{ matrix.name }}-${{ github.ref }}-${{ github.sha }}
+
+  bitcoin-core-tsan:
+    name: ${{ matrix.name }}
+    runs-on: ubuntu-24.04
+    timeout-minutes: 180
+
+    strategy:
+      matrix:
+        include:
+          - name: TSan
+            unit_test_runs: 8
+            functional_test_runs: 25
+            nproc_multiplier: 2
+            functional_timeout_factor: 40
+
+    env:
+      CCACHE_MAXSIZE: 400M
+      CCACHE_DIR: ${{ github.workspace }}/.ccache
+      LIBCXX_FLAGS: >-
+        -fsanitize=thread
+        -nostdinc++
+        -nostdlib++
+        -isystem /tmp/libcxx-build/include/c++/v1
+        -L/tmp/libcxx-build/lib
+        -Wl,-rpath,/tmp/libcxx-build/lib
+        -lc++
+        -lc++abi
+        -lpthread
+        -Wno-unused-command-line-argument
+      TSAN_OPTIONS: suppressions=${{ github.workspace }}/test/sanitizer_suppressions/tsan:halt_on_error=1:second_deadlock_stack=1
+
+    steps:
+      - name: Checkout Bitcoin Core
+        uses: actions/checkout@v4
+        with:
+          repository: ${{ env.BITCOIN_REPO }}
+          fetch-depth: 1
+
+      - name: Checkout libmultiprocess
+        uses: actions/checkout@v4
+        with:
+          path: _libmultiprocess
+
+      - name: Add LLVM apt repository
+        run: _libmultiprocess/ci/scripts/bitcoin_core_ci.sh add_llvm_apt_repository
+
+      - name: Install packages
+        run: _libmultiprocess/ci/scripts/bitcoin_core_ci.sh install_tsan_packages
+
+      - name: Determine parallelism
+        run: _libmultiprocess/ci/scripts/ci_helpers.sh determine_parallelism "${{ matrix.nproc_multiplier }}"
+
+      - name: Restore instrumented libc++ cache
+        id: libcxx-cache
+        uses: actions/cache@v4
+        with:
+          path: ${{ env.LIBCXX_DIR }}
+          key: libcxx-Thread-llvmorg-${{ env.LLVM_VERSION }}.1.0
+
+      - name: Build instrumented libc++
+        if: steps.libcxx-cache.outputs.cache-hit != 'true'
+        run: _libmultiprocess/ci/scripts/bitcoin_core_ci.sh build_instrumented_libcxx
+
+      - name: Determine host
+        id: host
+        run: _libmultiprocess/ci/scripts/ci_helpers.sh determine_host
+
+      - name: Restore depends cache
+        id: depends-cache
+        uses: actions/cache/restore@v4
+        with:
+          path: |
+            depends/built
+            depends/${{ steps.host.outputs.host }}
+          key: depends-tsan-${{ hashFiles('depends/packages/*.mk') }}-${{ env.LLVM_VERSION }}
+
+      - name: Build depends (stage 1, without IPC)
+        if: steps.depends-cache.outputs.cache-hit != 'true'
+        run: _libmultiprocess/ci/scripts/bitcoin_core_ci.sh build_depends_without_ipc
+
+      - name: Save depends cache
+        uses: actions/cache/save@v4
+        if: steps.depends-cache.outputs.cache-hit != 'true'
+        with:
+          path: |
+            depends/built
+            depends/${{ steps.host.outputs.host }}
+          key: depends-tsan-${{ hashFiles('depends/packages/*.mk') }}-${{ env.LLVM_VERSION }}
+
+      - name: Replace libmultiprocess subtree
+        run: _libmultiprocess/ci/scripts/bitcoin_core_ci.sh replace_subtree
+
+      - name: Build depends (stage 2, IPC packages including libmultiprocess)
+        run: _libmultiprocess/ci/scripts/bitcoin_core_ci.sh build_depends_with_ipc
+
+      - name: Restore ccache
+        id: ccache-restore
+        uses: actions/cache/restore@v4
+        with:
+          path: ${{ env.CCACHE_DIR }}
+          key: ccache-TSan-${{ github.ref }}-${{ github.sha }}
+          restore-keys: |
+            ccache-TSan-${{ github.ref }}-
+            ccache-TSan-
+
+      - name: Reset ccache stats
+        run: _libmultiprocess/ci/scripts/ci_helpers.sh reset_ccache_stats
+
+      - name: CMake configure
+        env:
+          BITCOIN_CORE_CMAKE_ARGS: |-
+            -DSANITIZERS=thread
+            -DAPPEND_CPPFLAGS=-DARENA_DEBUG -DDEBUG_LOCKCONTENTION -D_LIBCPP_REMOVE_TRANSITIVE_INCLUDES
+            -DCMAKE_TOOLCHAIN_FILE=depends/${{ steps.host.outputs.host }}/toolchain.cmake
+        run: _libmultiprocess/ci/scripts/bitcoin_core_ci.sh configure_bitcoin_core
+
+      - name: Build
+        run: _libmultiprocess/ci/scripts/bitcoin_core_ci.sh build_bitcoin_core
+
+      - name: Show ccache stats
+        run: _libmultiprocess/ci/scripts/ci_helpers.sh show_ccache_stats
+
+      - name: Run IPC unit tests
+        env:
+          LD_LIBRARY_PATH: depends/${{ steps.host.outputs.host }}/lib
+        run: _libmultiprocess/ci/scripts/bitcoin_core_ci.sh run_ipc_unit_tests "${{ matrix.unit_test_runs }}"
+
+      - name: Run IPC functional tests
+        env:
+          LD_LIBRARY_PATH: depends/${{ steps.host.outputs.host }}/lib
+          CI_FAILFAST_TEST_LEAVE_DANGLING: 1
+        run: _libmultiprocess/ci/scripts/bitcoin_core_ci.sh run_ipc_functional_tests "${{ matrix.functional_test_runs }}" "${{ matrix.functional_timeout_factor }}"
+
+      - name: Save ccache
+        uses: actions/cache/save@v4
+        if: github.ref == 'refs/heads/master' || steps.ccache-restore.outputs.cache-hit != 'true'
+        with:
+          path: ${{ env.CCACHE_DIR }}
+          key: ccache-TSan-${{ github.ref }}-${{ github.sha }}
diff --git a/src/ipc/libmultiprocess/.github/workflows/ci.yml b/src/ipc/libmultiprocess/.github/workflows/ci.yml
index f4a6623416ce..ffaca1cac93c 100644
--- a/src/ipc/libmultiprocess/.github/workflows/ci.yml
+++ b/src/ipc/libmultiprocess/.github/workflows/ci.yml
@@ -120,16 +120,21 @@ jobs:
         env:
           HOMEBREW_NO_INSTALLED_DEPENDENTS_CHECK: 1
         run: |
-          brew install --quiet ninja capnp
+          brew install --quiet ninja capnp llvm
 
       - name: Run CI script
         run: |
+          export PATH="$(brew --prefix llvm)/bin:$PATH"
           CI_CONFIG="ci/configs/macos.bash" bash ci/scripts/ci.sh
 
   build:
     runs-on: ubuntu-latest
 
     env:
+      NIXPKGS_CHANNEL: nixos-25.05
+      NIX_EXTRA_CONFIG: |
+        keep-env-derivations = true
+        keep-outputs = true
       NIX_EXTRA_CONFIG_ACT: |
         sandbox = false
         filter-syscalls = false
@@ -144,14 +149,33 @@ jobs:
     steps:
       - uses: actions/checkout@v5
 
+      - name: Determine CI configuration
+        id: config
+        env:
+          CI_CONFIG: ci/configs/${{ matrix.config }}.bash
+        run: ci/scripts/config.sh
+
       - name: Install Nix
         uses: cachix/install-nix-action@v31       # 2025-05-27, from https://github.com/cachix/install-nix-action/tags
         with:
-          nix_path: nixpkgs=channel:nixos-25.05   # latest release
+          nix_path: nixpkgs=https://github.com/NixOS/nixpkgs/archive/${{ steps.config.outputs.nixpkgs_rev }}.tar.gz
           # Act executes inside an unprivileged container (Docker or Podman),
           # so KVM support isn't available.
           enable_kvm: "${{ github.actor != 'nektos/act' }}"
-          extra_nix_config: ${{ github.actor == 'nektos/act' && env.NIX_EXTRA_CONFIG_ACT || '' }}
+          extra_nix_config: |
+            ${{ env.NIX_EXTRA_CONFIG }}
+            ${{ github.actor == 'nektos/act' && env.NIX_EXTRA_CONFIG_ACT || '' }}
+
+      - name: Cache Nix store
+        if: steps.config.outputs.cache_nix_store == 'true'
+        uses: nix-community/cache-nix-action@v7
+        with:
+          primary-key: nix-${{ runner.os }}-${{ matrix.config }}-${{ steps.config.outputs.nixpkgs_rev }}-${{ hashFiles('shell.nix', 'ci/patches/*.patch', format('ci/configs/{0}.bash', matrix.config)) }}
+          restore-prefixes-first-match: |
+            nix-${{ runner.os }}-${{ matrix.config }}-${{ steps.config.outputs.nixpkgs_rev }}-
+            nix-${{ runner.os }}-${{ matrix.config }}-
+            nix-${{ runner.os }}-
+          gc-max-store-size-linux: 10G
 
       - name: Run CI script
         env:
diff --git a/src/ipc/libmultiprocess/ci/configs/gnu32.bash b/src/ipc/libmultiprocess/ci/configs/gnu32.bash
index 961821ce8ce7..04d78a24fc5c 100644
--- a/src/ipc/libmultiprocess/ci/configs/gnu32.bash
+++ b/src/ipc/libmultiprocess/ci/configs/gnu32.bash
@@ -1,5 +1,7 @@
 CI_DESC="CI job cross-compiling to 32-bit"
 CI_DIR=build-gnu32
+# Cache the heaviest Nix job to stay within GitHub's cache budget.
+CI_CACHE_NIX_STORE=true
 NIX_ARGS=(
   --arg minimal true
   --arg crossPkgs 'import <nixpkgs> { crossSystem = { config = "i686-unknown-linux-gnu"; }; }'
diff --git a/src/ipc/libmultiprocess/ci/configs/macos.bash b/src/ipc/libmultiprocess/ci/configs/macos.bash
index a444bacd51ea..895d795f8912 100644
--- a/src/ipc/libmultiprocess/ci/configs/macos.bash
+++ b/src/ipc/libmultiprocess/ci/configs/macos.bash
@@ -1,5 +1,5 @@
 CI_DESC="CI config for macOS"
 CI_DIR=build-macos
 export CXXFLAGS="-Werror -Wall -Wextra -Wpedantic -Wno-unused-parameter"
-CMAKE_ARGS=(-G Ninja)
+CMAKE_ARGS=(-G Ninja -DMP_ENABLE_CLANG_TIDY=ON)
 BUILD_ARGS=(-k 0)
diff --git a/src/ipc/libmultiprocess/ci/scripts/bitcoin_core_ci.sh b/src/ipc/libmultiprocess/ci/scripts/bitcoin_core_ci.sh
new file mode 100755
index 000000000000..7f3c5cbd4b97
--- /dev/null
+++ b/src/ipc/libmultiprocess/ci/scripts/bitcoin_core_ci.sh
@@ -0,0 +1,173 @@
+#!/usr/bin/env bash
+
+export LC_ALL=C
+
+set -o errexit -o nounset -o pipefail -o xtrace
+
+readonly SCRIPT_DIR="$(cd -- "$(dirname -- "${BASH_SOURCE[0]}")" && pwd)"
+
+source "${SCRIPT_DIR}/ci_helpers.sh"
+
+replace_subtree() {
+  rm -rf src/ipc/libmultiprocess
+  cp -a _libmultiprocess src/ipc/libmultiprocess
+  rm -rf src/ipc/libmultiprocess/.git
+}
+
+add_llvm_apt_repository() {
+  curl -s "https://apt.llvm.org/llvm-snapshot.gpg.key" | sudo tee "/etc/apt/trusted.gpg.d/apt.llvm.org.asc" > /dev/null
+  source /etc/os-release
+  echo "deb http://apt.llvm.org/${VERSION_CODENAME}/ llvm-toolchain-${VERSION_CODENAME}-${LLVM_VERSION} main" | sudo tee "/etc/apt/sources.list.d/llvm.list"
+  sudo apt-get update
+}
+
+install_llvm_alternatives() {
+  sudo update-alternatives --install /usr/bin/clang++ clang++ "/usr/bin/clang++-${LLVM_VERSION}" 100
+  sudo update-alternatives --install /usr/bin/clang clang "/usr/bin/clang-${LLVM_VERSION}" 100
+  sudo update-alternatives --install /usr/bin/llvm-symbolizer llvm-symbolizer "/usr/bin/llvm-symbolizer-${LLVM_VERSION}" 100
+}
+
+set_llvm_alternatives() {
+  sudo update-alternatives --set clang "/usr/bin/clang-${LLVM_VERSION}"
+  sudo update-alternatives --set clang++ "/usr/bin/clang++-${LLVM_VERSION}"
+  sudo update-alternatives --set llvm-symbolizer "/usr/bin/llvm-symbolizer-${LLVM_VERSION}"
+}
+
+install_tsan_packages() {
+  install_apt_packages \
+    ccache \
+    "clang-${LLVM_VERSION}" \
+    "llvm-${LLVM_VERSION}" \
+    "llvm-${LLVM_VERSION}-dev" \
+    "libclang-${LLVM_VERSION}-dev" \
+    "libclang-rt-${LLVM_VERSION}-dev" \
+    ninja-build \
+    pkgconf \
+    python3-pip \
+    bison
+  install_llvm_alternatives
+  set_llvm_alternatives
+  install_pip_packages --break-system-packages pycapnp
+}
+
+build_instrumented_libcxx() {
+  export PATH="/usr/lib/llvm-${LLVM_VERSION}/bin:${PATH}"
+
+  ls -l /usr/bin/clang /usr/bin/clang++ /usr/bin/llvm-symbolizer
+  which clang clang++ llvm-symbolizer
+  clang --version
+  clang++ --version
+  "/usr/bin/clang-${LLVM_VERSION}" --version
+  "/usr/bin/clang++-${LLVM_VERSION}" --version
+  git clone --depth=1 https://github.com/llvm/llvm-project -b "llvmorg-${LLVM_VERSION}.1.0" /tmp/llvm-project
+  cmake -G Ninja -B "${LIBCXX_DIR}" \
+    -DLLVM_ENABLE_RUNTIMES="libcxx;libcxxabi;libunwind" \
+    -DCMAKE_BUILD_TYPE=Release \
+    -DLLVM_USE_SANITIZER=Thread \
+    -DCMAKE_C_COMPILER="/usr/bin/clang-${LLVM_VERSION}" \
+    -DCMAKE_CXX_COMPILER="/usr/bin/clang++-${LLVM_VERSION}" \
+    -DLLVM_TARGETS_TO_BUILD=Native \
+    -DLLVM_ENABLE_PER_TARGET_RUNTIME_DIR=OFF \
+    -DLIBCXX_INCLUDE_TESTS=OFF \
+    -DLIBCXXABI_INCLUDE_TESTS=OFF \
+    -DLIBUNWIND_INCLUDE_TESTS=OFF \
+    -DLIBCXXABI_USE_LLVM_UNWINDER=OFF \
+    -S /tmp/llvm-project/runtimes
+  grep -E 'CMAKE_(C|CXX)_COMPILER' "${LIBCXX_DIR}/CMakeCache.txt"
+  ninja -C "${LIBCXX_DIR}" -j "${BUILD_PARALLEL}" -v
+  rm -rf /tmp/llvm-project
+}
+
+configure_bitcoin_core() {
+  local cmake_arg
+  local cmake_args=()
+
+  if [[ -n "${BITCOIN_CORE_CMAKE_ARGS:-}" ]]; then
+    while IFS= read -r cmake_arg; do
+      [[ -n "${cmake_arg}" ]] || continue
+      cmake_args+=("${cmake_arg}")
+    done <<< "${BITCOIN_CORE_CMAKE_ARGS}"
+  fi
+
+  cmake -S . -B build \
+    --preset=dev-mode \
+    -DCMAKE_BUILD_TYPE=Debug \
+    -DBUILD_GUI=OFF \
+    -DBUILD_GUI_TESTS=OFF \
+    -DWITH_ZMQ=OFF \
+    -DWITH_USDT=OFF \
+    -DBUILD_BENCH=OFF \
+    -DBUILD_FUZZ_BINARY=OFF \
+    -DWITH_QRENCODE=OFF \
+    -G Ninja \
+    "${cmake_args[@]}"
+}
+
+build_bitcoin_core() {
+  cmake --build build --parallel "${BUILD_PARALLEL}"
+}
+
+build_depends_without_ipc() {
+  make -C depends -j "${BUILD_PARALLEL}" \
+    CC=clang \
+    CXX=clang++ \
+    CXXFLAGS="${LIBCXX_FLAGS}" \
+    NO_QT=1 \
+    NO_ZMQ=1 \
+    NO_USDT=1 \
+    NO_QR=1 \
+    NO_IPC=1
+}
+
+build_depends_with_ipc() {
+  make -C depends -j "${BUILD_PARALLEL}" \
+    CC=clang \
+    CXX=clang++ \
+    CXXFLAGS="${LIBCXX_FLAGS}" \
+    NO_QT=1 \
+    NO_ZMQ=1 \
+    NO_USDT=1 \
+    NO_QR=1
+}
+
+run_ipc_unit_tests() {
+  local runs="$1"
+
+  for _ in $(seq 1 "${runs}"); do
+    build/bin/test_bitcoin --run_test=ipc_tests,miner_tests --catch_system_error=no --log_level=nothing --report_level=no
+  done
+}
+
+run_ipc_functional_tests() {
+  local runs="$1"
+  local timeout_factor="$2"
+  local test_scripts
+  local test_args=()
+
+  test_scripts=$(python3 -c "import sys; import os; sys.path.append(os.path.abspath('build/test/functional')); from test_runner import ALL_SCRIPTS; print(' '.join(s for s in ALL_SCRIPTS if s.startswith('interface_ipc')))")
+  for _ in $(seq 1 "${runs}"); do
+    for script in $test_scripts; do
+      test_args+=("$script")
+    done
+  done
+  build/test/functional/test_runner.py "${test_args[@]}" --jobs "${PARALLEL}" --timeout-factor="${timeout_factor}" --failfast --combinedlogslen=99999999
+}
+
+main() {
+  local command="${1:?missing command}"
+  shift
+
+  [[ "${command}" =~ ^[a-z_][a-z0-9_]*$ ]] || {
+    echo "Invalid command: ${command}" >&2
+    exit 1
+  }
+
+  if declare -F "${command}" >/dev/null; then
+    "${command}" "$@"
+  else
+    echo "Unknown command: ${command}" >&2
+    exit 1
+  fi
+}
+
+main "$@"
diff --git a/src/ipc/libmultiprocess/ci/scripts/ci_helpers.sh b/src/ipc/libmultiprocess/ci/scripts/ci_helpers.sh
new file mode 100755
index 000000000000..1b6d0121969e
--- /dev/null
+++ b/src/ipc/libmultiprocess/ci/scripts/ci_helpers.sh
@@ -0,0 +1,94 @@
+#!/usr/bin/env bash
+
+export LC_ALL=C
+
+set -o errexit -o nounset -o pipefail -o xtrace
+
+write_env_var() {
+  local key="$1"
+  local value="$2"
+
+  if [[ -n "${GITHUB_ENV:-}" ]]; then
+    echo "${key}=${value}" >> "${GITHUB_ENV}"
+  else
+    export "${key}=${value}"
+  fi
+}
+
+write_output_var() {
+  local key="$1"
+  local value="$2"
+
+  if [[ -n "${GITHUB_OUTPUT:-}" ]]; then
+    echo "${key}=${value}" >> "${GITHUB_OUTPUT}"
+  else
+    echo "${key}=${value}"
+  fi
+}
+
+available_nproc() {
+  if command -v nproc >/dev/null 2>&1; then
+    nproc
+  else
+    sysctl -n hw.logicalcpu
+  fi
+}
+
+determine_parallelism() {
+  local multiplier="$1"
+  local available
+
+  available="$(available_nproc)"
+  write_env_var BUILD_PARALLEL "${available}"
+  write_env_var PARALLEL "$((available * multiplier))"
+}
+
+reset_ccache_stats() {
+  which ccache
+  ccache --version
+  ccache --zero-stats
+}
+
+show_ccache_stats() {
+  ccache --show-stats
+}
+
+install_apt_packages() {
+  sudo apt-get install --no-install-recommends -y "$@"
+}
+
+install_homebrew_packages() {
+  HOMEBREW_NO_INSTALLED_DEPENDENTS_CHECK=1 brew install --quiet "$@"
+}
+
+install_pip_packages() {
+  pip3 install "$@"
+}
+
+determine_host() {
+  local config_guess="${1:-./depends/config.guess}"
+  local output_key="${2:-host}"
+
+  write_output_var "${output_key}" "$("${config_guess}")"
+}
+
+ci_helpers_main() {
+  local command="${1:?missing command}"
+  shift
+
+  [[ "${command}" =~ ^[a-z_][a-z0-9_]*$ ]] || {
+    echo "Invalid command: ${command}" >&2
+    exit 1
+  }
+
+  if declare -F "${command}" >/dev/null; then
+    "${command}" "$@"
+  else
+    echo "Unknown command: ${command}" >&2
+    exit 1
+  fi
+}
+
+if [[ "${BASH_SOURCE[0]}" == "$0" ]]; then
+  ci_helpers_main "$@"
+fi
diff --git a/src/ipc/libmultiprocess/ci/scripts/config.sh b/src/ipc/libmultiprocess/ci/scripts/config.sh
new file mode 100755
index 000000000000..7fe8118d7bee
--- /dev/null
+++ b/src/ipc/libmultiprocess/ci/scripts/config.sh
@@ -0,0 +1,26 @@
+#!/usr/bin/env bash
+#
+# Copyright (c) The Bitcoin Core developers
+# Distributed under the MIT software license, see the accompanying
+# file COPYING or http://www.opensource.org/licenses/mit-license.php.
+#
+# Source CI configuration and output variables needed by the workflow.
+
+export LC_ALL=C
+
+set -o errexit -o nounset -o pipefail -o xtrace
+
+readonly SCRIPT_DIR="$(cd -- "$(dirname -- "${BASH_SOURCE[0]}")" && pwd)"
+
+source "${SCRIPT_DIR}/ci_helpers.sh"
+
+[ "${CI_CONFIG+x}" ] && source "$CI_CONFIG"
+
+# Resolve the nixpkgs channel to a specific revision for use in cache keys.
+if [[ -n "${NIXPKGS_CHANNEL:-}" ]]; then
+  rev="$(curl --fail --location --silent --show-error "https://channels.nixos.org/${NIXPKGS_CHANNEL}/git-revision")"
+  test -n "${rev}"
+  write_output_var nixpkgs_rev "${rev}"
+fi
+
+write_output_var cache_nix_store "${CI_CACHE_NIX_STORE:-false}"
diff --git a/src/ipc/libmultiprocess/ci/scripts/run.sh b/src/ipc/libmultiprocess/ci/scripts/run.sh
index 4b7808314cee..04ac8596d490 100755
--- a/src/ipc/libmultiprocess/ci/scripts/run.sh
+++ b/src/ipc/libmultiprocess/ci/scripts/run.sh
@@ -11,3 +11,14 @@ set -o errexit -o nounset -o pipefail -o xtrace
 [ "${CI_CONFIG+x}" ] && source "$CI_CONFIG"
 
 nix develop --ignore-environment --keep CI_CONFIG --keep CI_CLEAN "${NIX_ARGS[@]+"${NIX_ARGS[@]}"}" -f shell.nix --command ci/scripts/ci.sh
+
+# Create a GC root for the shell closure so the cache-nix-action save step
+# does not garbage-collect it.
+if [ -n "${CI_CACHE_NIX_STORE-}" ]; then
+  nix-build shell.nix \
+    -o "$CI_DIR/gcroot" \
+    "${NIX_ARGS[@]+"${NIX_ARGS[@]}"}"
+  # Verify the closure is complete so the cache-nix-action save step has
+  # everything it needs.
+  nix-store --query --requisites "$CI_DIR/gcroot" >/dev/null
+fi
diff --git a/src/ipc/libmultiprocess/cmake/pthread_checks.cmake b/src/ipc/libmultiprocess/cmake/pthread_checks.cmake
index 241978d5677d..877114165a60 100644
--- a/src/ipc/libmultiprocess/cmake/pthread_checks.cmake
+++ b/src/ipc/libmultiprocess/cmake/pthread_checks.cmake
@@ -25,7 +25,7 @@ check_cxx_source_compiles("
   int main(int argc, char** argv)
   {
     uint64_t tid;
-    pthread_threadid_np(NULL, &tid);
+    pthread_threadid_np(nullptr, &tid);
     return 0;
   }"
   HAVE_PTHREAD_THREADID_NP)
diff --git a/src/ipc/libmultiprocess/doc/versions.md b/src/ipc/libmultiprocess/doc/versions.md
index 9a7b12238f0b..2c2ec50e7c6d 100644
--- a/src/ipc/libmultiprocess/doc/versions.md
+++ b/src/ipc/libmultiprocess/doc/versions.md
@@ -7,55 +7,72 @@ Library versions are tracked with simple
 Versioning policy is described in the [version.h](../include/mp/version.h)
 include.
 
-## v8
-- Current unstable version in master branch.
+## v10
+- Current unstable version.
 
-## v7.0
-- Adds SpawnProcess race fix, cmake `target_capnp_sources` option, ci and documentation improvements.
-- Used in Bitcoin Core master branch, pulled in by [#34363](https://github.com/bitcoin/bitcoin/pull/34363).
+## [v9.0](https://github.com/bitcoin-core/libmultiprocess/commits/v9.0)
+- Fixes race conditions where worker thread could be used after destruction, where getParams() could be called after request cancel, and where m_on_cancel could be called after request finishes.
+- Adds `CustomHasField` hook to map Cap'n Proto null values to C++ null values.
+- Improves `CustomBuildField` for `std::optional` to use move semantics.
+- Adds LLVM 22 compatibility fix in type-map.
+- Used in Bitcoin Core master branch, pulled in by [#34804](https://github.com/bitcoin/bitcoin/pull/34804). Also pulled into Bitcoin Core 31.x stable branch by [#34952](https://github.com/bitcoin/bitcoin/pull/34952).
 
-## v7.0-pre1
+## [v8.0](https://github.com/bitcoin-core/libmultiprocess/commits/v8.0)
+- Better support for non-libmultiprocess IPC clients: avoiding errors on unclean disconnects, and allowing simultaneous requests to worker threads which previously triggered "thread busy" errors.
+- Intermediate version used in Bitcoin Core master branch between 30.x and 31.x branches, pulled in by [#34422](https://github.com/bitcoin/bitcoin/pull/34422).
 
-- Adds support for log levels to reduce logging and "thread busy" error to avoid a crash on misuse. Fixes intermittent mptest hang and makes other minor improvements.
-- Used in Bitcoin Core 30.1 and 30.2 releases and 30.x branch. Pulled in by [#33412](https://github.com/bitcoin/bitcoin/pull/33412), [#33518](https://github.com/bitcoin/bitcoin/pull/33518), and [#33519](https://github.com/bitcoin/bitcoin/pull/33519).
+## [v7.0](https://github.com/bitcoin-core/libmultiprocess/commits/v7.0)
+- Adds SpawnProcess race fix, cmake `target_capnp_sources` option, ci and documentation improvements. Adds `version.h` header declaring major and minor version numbers.
+- Intermediate version used in Bitcoin Core master branch between 30.x and 31.x branches, pulled in by [#34363](https://github.com/bitcoin/bitcoin/pull/34363).
 
-## v6.0
+## [v7.0-pre2](https://github.com/bitcoin-core/libmultiprocess/commits/v7.0-pre2)
+- Fixes intermittent mptest hang and makes other minor improvements.
+- Used in Bitcoin Core 30.1 and 30.2 releases and 30.x branch, pulled in by [#33518](https://github.com/bitcoin/bitcoin/pull/33518) and [#33519](https://github.com/bitcoin/bitcoin/pull/33519).
 
-- Adds fixes for unclean shutdowns and thread sanitizer issues and adds CI scripts.
+## [v7.0-pre1](https://github.com/bitcoin-core/libmultiprocess/commits/v7.0-pre1)
+- Adds support for log levels to reduce logging and "thread busy" error to avoid a crash on misuse.
+- Minimum required version since Bitcoin Core 30.1, pulled in by [#33412](https://github.com/bitcoin/bitcoin/pull/33412), [#33518](https://github.com/bitcoin/bitcoin/pull/33518), and [#33519](https://github.com/bitcoin/bitcoin/pull/33519).
+
+## [v6.0](https://github.com/bitcoin-core/libmultiprocess/commits/v6.0)
+- Adds CI scripts and build and test fixes.
+- Used in Bitcoin Core 30.0 release, pulled in by [#32345](https://github.com/bitcoin/bitcoin/pull/32345), [#33241](https://github.com/bitcoin/bitcoin/pull/33241), and [#33322](https://github.com/bitcoin/bitcoin/pull/33322).
+
+## [v6.0-pre1](https://github.com/bitcoin-core/libmultiprocess/commits/v6.0-pre1)
+- Adds fixes for unclean shutdowns and thread sanitizer issues.
 - Drops `EventLoop::addClient` and `EventLoop::removeClient` methods,
   requiring clients to use new `EventLoopRef` class instead.
-- Used in Bitcoin Core 30.0 release. Pulled in by [#31741](https://github.com/bitcoin/bitcoin/pull/31741), [#32641](https://github.com/bitcoin/bitcoin/pull/32641), [#32345](https://github.com/bitcoin/bitcoin/pull/32345), [#33241](https://github.com/bitcoin/bitcoin/pull/33241), and [#33322](https://github.com/bitcoin/bitcoin/pull/33322).
+- Minimum required version for Bitcoin Core 30.0 release, pulled in by [#31741](https://github.com/bitcoin/bitcoin/pull/31741), [#32641](https://github.com/bitcoin/bitcoin/pull/32641), and [#32345](https://github.com/bitcoin/bitcoin/pull/32345).
 
-## v5.0
+## [v5.0](https://github.com/bitcoin-core/libmultiprocess/commits/v5.0)
 - Adds build improvements and tidy/warning fixes.
 - Used in Bitcoin Core 29 releases, pulled in by [#31945](https://github.com/bitcoin/bitcoin/pull/31945).
 
-## v5.0-pre1
+## [v5.0-pre1](https://github.com/bitcoin-core/libmultiprocess/commits/v5.0-pre1)
 - Adds many improvements to Bitcoin Core mining interface: splitting up type headers, fixing shutdown bugs, adding subtree build support.
 - Broke up `proxy-types.h` into `type-*.h` files requiring clients to explicitly
   include overloads needed for C++ ↔️ Cap'n Proto type conversions.
 - Now requires C++ 20 support.
 - Minimum required version for Bitcoin Core 29 releases, pulled in by [#30509](https://github.com/bitcoin/bitcoin/pull/30509), [#30510](https://github.com/bitcoin/bitcoin/pull/30510), [#31105](https://github.com/bitcoin/bitcoin/pull/31105), [#31740](https://github.com/bitcoin/bitcoin/pull/31740).
 
-## v4.0
+## [v4.0](https://github.com/bitcoin-core/libmultiprocess/commits/v4.0)
 - Added better cmake support, installing cmake package files so clients do not
   need to use pkgconfig.
 - Used in Bitcoin Core 28 releases, pulled in by [#30490](https://github.com/bitcoin/bitcoin/pull/30490) and [#30513](https://github.com/bitcoin/bitcoin/pull/30513).
 
-## v3.0
+## [v3.0](https://github.com/bitcoin-core/libmultiprocess/commits/v3.0)
 - Dropped compatibility with Cap'n Proto versions before 0.7.
 - Used in Bitcoin Core 27 releases, pulled in by [#28735](https://github.com/bitcoin/bitcoin/pull/28735), [#28907](https://github.com/bitcoin/bitcoin/pull/28907), and [#29276](https://github.com/bitcoin/bitcoin/pull/29276).
 
-## v2.0
+## [v2.0](https://github.com/bitcoin-core/libmultiprocess/commits/v2.0)
 - Changed `PassField` function signature.
 - Now requires C++17 support.
 - Used in Bitcoin Core 25 and 26 releases, pulled in by [#26672](https://github.com/bitcoin/bitcoin/pull/26672).
 
-## v1.0
+## [v1.0](https://github.com/bitcoin-core/libmultiprocess/commits/v1.0)
 - Dropped hardcoded includes in generated files, now requiring `include` and
   `includeTypes` annotations.
 - Used in Bitcoin Core 22, 23, and 24 releases, pulled in by [#19160](https://github.com/bitcoin/bitcoin/pull/19160).
 
-## v0.0
+## [v0.0](https://github.com/bitcoin-core/libmultiprocess/commits/v0.0)
 - Initial version used in a downstream release.
 - Used in Bitcoin Core 21 releases, pulled in by [#16367](https://github.com/bitcoin/bitcoin/pull/16367), [#18588](https://github.com/bitcoin/bitcoin/pull/18588), and [#18677](https://github.com/bitcoin/bitcoin/pull/18677).
diff --git a/src/ipc/libmultiprocess/include/mp/proxy-io.h b/src/ipc/libmultiprocess/include/mp/proxy-io.h
index c298257c4daf..d7b9f0e54683 100644
--- a/src/ipc/libmultiprocess/include/mp/proxy-io.h
+++ b/src/ipc/libmultiprocess/include/mp/proxy-io.h
@@ -340,6 +340,22 @@ class EventLoop
 
     //! External context pointer.
     void* m_context;
+
+    //! Hook called when ProxyServer<ThreadMap>::makeThread() is called.
+    std::function<void()> testing_hook_makethread;
+
+    //! Hook called on the worker thread inside makeThread(), after the thread
+    //! context is set up and thread_context promise is fulfilled, but before it
+    //! starts waiting for requests.
+    std::function<void()> testing_hook_makethread_created;
+
+    //! Hook called on the worker thread when it starts to execute an async
+    //! request. Used by tests to control timing or inject behavior at this
+    //! point in execution.
+    std::function<void()> testing_hook_async_request_start;
+
+    //! Hook called on the worker thread just before returning results.
+    std::function<void()> testing_hook_async_request_done;
 };
 
 //! Single element task queue used to handle recursive capnp calls. (If the
@@ -814,6 +830,7 @@ void _Serve(EventLoop& loop, kj::Own<kj::AsyncIoStream>&& stream, InitImpl& init
         return kj::heap<ProxyServer<InitInterface>>(std::shared_ptr<InitImpl>(&init, [](InitImpl*){}), connection);
     });
     auto it = loop.m_incoming_connections.begin();
+    MP_LOG(loop, Log::Info) << "IPC server: socket connected.";
     it->onDisconnect([&loop, it] {
         MP_LOG(loop, Log::Info) << "IPC server: socket disconnected.";
         loop.m_incoming_connections.erase(it);
diff --git a/src/ipc/libmultiprocess/include/mp/proxy-types.h b/src/ipc/libmultiprocess/include/mp/proxy-types.h
index 5d38048498f1..c13debf361d9 100644
--- a/src/ipc/libmultiprocess/include/mp/proxy-types.h
+++ b/src/ipc/libmultiprocess/include/mp/proxy-types.h
@@ -23,9 +23,10 @@ class ValueField
     ValueField(Value&& value) : m_value(value) {}
     Value& m_value;
 
+    const Value& get() const { return m_value; }
     Value& get() { return m_value; }
     Value& init() { return m_value; }
-    bool has() { return true; }
+    bool has() const { return true; }
 };
 
 template <typename Accessor, typename Struct>
@@ -166,10 +167,52 @@ struct ReadDestUpdate
     Value& m_value;
 };
 
-template <typename... LocalTypes, typename... Args>
-decltype(auto) ReadField(TypeList<LocalTypes...>, Args&&... args)
+//! Return whether to read a C++ value from a Cap'n Proto field. Returning
+//! false can be useful to interpret certain Cap'n Proto field values as null
+//! C++ values when initializing nullable C++ std::optional / std::unique_ptr /
+//! std::shared_ptr types.
+//!
+//! For example, when reading from a `List(Data)` field into a
+//! `std::vector<std::shared_ptr<const CTransaction>>` value, it's useful to be
+//! able to interpret empty `Data` values as null pointers. This is useful
+//! because the Cap'n Proto C++ API does not currently provide a way to
+//! distinguish between null and empty Data values in a List[*], so we need to
+//! choose some Data value to represent null if we want to allow passing null
+//! pointers. Since no CTransaction is ever serialized as empty Data, it's safe
+//! to use empty Data values to represent null pointers.
+//!
+//! [*] The Cap'n Proto wire format actually does distinguish between null and
+//! empty Data values inside Lists, and the C++ API does allow distinguishing
+//! between null and empty Data values in other contexts, just not the List
+//! context, so this limitation could be removed in the future.
+//!
+//! Design note: CustomHasField() and CustomHasValue() are inverses of each
+//! other.  CustomHasField() allows leaving Cap'n Proto fields unset when C++
+//! types have certain values, and CustomHasValue() allows leaving C++ values
+//! unset when Cap'n Proto fields have certain values. But internally the
+//! functions get called in different ways. This is because in C++, unlike in
+//! Cap'n Proto not every C++ type is default constructible, and it may be
+//! impossible to leave certain C++ values unset. For example if a C++ method
+//! requires function parameters, there's no way to call the function without
+//! constructing values for each of the parameters. Similarly there's no way to
+//! add values to C++ vectors or maps without initializing those values.  This
+//! is not the case in Cap'n Proto where all values are optional and it's
+//! possible to skip initializing parameters and list elements.
+//!
+//! Because of this difference, CustomHasValue() works universally and can be
+//! used to disable BuildField() calls in every context, while CustomHasField()
+//! can only be used to disable ReadField() calls in certain contexts like
+//! std::optional and pointer contexts.
+template <typename... LocalTypes, typename Input>
+bool CustomHasField(TypeList<LocalTypes...>, InvokeContext& invoke_context, const Input& input)
+{
+    return input.has();
+}
+
+template <typename... LocalTypes, typename Input, typename... Args>
+decltype(auto) ReadField(TypeList<LocalTypes...>, InvokeContext& invoke_context, Input&& input, Args&&... args)
 {
-    return CustomReadField(TypeList<RemoveCvRef<LocalTypes>...>(), Priority<2>(), std::forward<Args>(args)...);
+    return CustomReadField(TypeList<RemoveCvRef<LocalTypes>...>(), Priority<2>(), invoke_context, std::forward<Input>(input), std::forward<Args>(args)...);
 }
 
 template <typename LocalType, typename Input>
@@ -190,6 +233,13 @@ void ThrowField(TypeList<std::exception>, InvokeContext& invoke_context, Input&&
     throw std::runtime_error(std::string(CharCast(data.begin()), data.size()));
 }
 
+//! Return whether to write a C++ value into a Cap'n Proto field. Returning
+//! false can be useful to map certain C++ values to unset Cap'n Proto fields.
+//!
+//! For example the bitcoin `Coin` class asserts false when a spent coin is
+//! serialized. But some C++ methods return these coins, so there needs to be a
+//! way to represent them in Cap'n Proto and a null Data field is a convenient
+//! representation.
 template <typename... Values>
 bool CustomHasValue(InvokeContext& invoke_context, const Values&... value)
 {
@@ -372,7 +422,7 @@ struct ClientException
         void handleField(InvokeContext& invoke_context, Results& results, ParamList)
         {
             StructField<Accessor, Results> input(results);
-            if (input.has()) {
+            if (CustomHasField(TypeList<Exception>(), invoke_context, input)) {
                 ThrowField(TypeList<Exception>(), invoke_context, input);
             }
         }
@@ -595,7 +645,7 @@ template <typename Client>
 void clientDestroy(Client& client)
 {
     if (client.m_context.connection) {
-        MP_LOG(*client.m_context.loop, Log::Info) << "IPC client destroy " << typeid(client).name();
+        MP_LOG(*client.m_context.loop, Log::Debug) << "IPC client destroy " << typeid(client).name();
     } else {
         KJ_LOG(INFO, "IPC interrupted client destroy", typeid(client).name());
     }
@@ -604,7 +654,7 @@ void clientDestroy(Client& client)
 template <typename Server>
 void serverDestroy(Server& server)
 {
-    MP_LOG(*server.m_context.loop, Log::Info) << "IPC server destroy " << typeid(server).name();
+    MP_LOG(*server.m_context.loop, Log::Debug) << "IPC server destroy " << typeid(server).name();
 }
 
 //! Entry point called by generated client code that looks like:
diff --git a/src/ipc/libmultiprocess/include/mp/type-context.h b/src/ipc/libmultiprocess/include/mp/type-context.h
index 72c39630d00c..46952f49f870 100644
--- a/src/ipc/libmultiprocess/include/mp/type-context.h
+++ b/src/ipc/libmultiprocess/include/mp/type-context.h
@@ -61,9 +61,8 @@ auto PassField(Priority<1>, TypeList<>, ServerContext& server_context, const Fn&
         std::is_same<decltype(Accessor::get(server_context.call_context.getParams())), Context::Reader>::value,
         kj::Promise<typename ServerContext::CallContext>>::type
 {
-    const auto& params = server_context.call_context.getParams();
-    Context::Reader context_arg = Accessor::get(params);
     auto& server = server_context.proxy_server;
+    EventLoop& loop = *server.m_context.loop;
     int req = server_context.req;
     // Keep a reference to the ProxyServer instance by assigning it to the self
     // variable. ProxyServer instances are reference-counted and if the client
@@ -72,136 +71,148 @@ auto PassField(Priority<1>, TypeList<>, ServerContext& server_context, const Fn&
     // needs to be destroyed on the event loop thread so it is freed in a sync()
     // call below.
     auto self = server.thisCap();
-    auto invoke = [self = kj::mv(self), call_context = kj::mv(server_context.call_context), &server, req, fn, args...](CancelMonitor& cancel_monitor) mutable {
-                MP_LOG(*server.m_context.loop, Log::Debug) << "IPC server executing request #" << req;
-                const auto& params = call_context.getParams();
-                Context::Reader context_arg = Accessor::get(params);
-                ServerContext server_context{server, call_context, req};
-                {
-                    // Before invoking the function, store a reference to the
-                    // callbackThread provided by the client in the
-                    // thread_local.request_threads map. This way, if this
-                    // server thread needs to execute any RPCs that call back to
-                    // the client, they will happen on the same client thread
-                    // that is waiting for this function, just like what would
-                    // happen if this were a normal function call made on the
-                    // local stack.
-                    //
-                    // If the request_threads map already has an entry for this
-                    // connection, it will be left unchanged, and it indicates
-                    // that the current thread is an RPC client thread which is
-                    // in the middle of an RPC call, and the current RPC call is
-                    // a nested call from the remote thread handling that RPC
-                    // call. In this case, the callbackThread value should point
-                    // to the same thread already in the map, so there is no
-                    // need to update the map.
-                    auto& thread_context = g_thread_context;
-                    auto& request_threads = thread_context.request_threads;
-                    ConnThread request_thread;
-                    bool inserted{false};
-                    Mutex cancel_mutex;
-                    Lock cancel_lock{cancel_mutex};
-                    server_context.cancel_lock = &cancel_lock;
-                    server.m_context.loop->sync([&] {
-                        // Detect request being canceled before it executes.
-                        if (cancel_monitor.m_canceled) {
-                            server_context.request_canceled = true;
-                            return;
-                        }
-                        // Detect request being canceled while it executes.
-                        assert(!cancel_monitor.m_on_cancel);
-                        cancel_monitor.m_on_cancel = [&server, &server_context, &cancel_mutex, req]() {
-                            MP_LOG(*server.m_context.loop, Log::Info) << "IPC server request #" << req << " canceled while executing.";
-                            // Lock cancel_mutex here to block the event loop
-                            // thread and prevent it from deleting the request's
-                            // params and response structs while the execution
-                            // thread is accessing them. Because this lock is
-                            // released before the event loop thread does delete
-                            // the structs, the mutex does not provide any
-                            // protection from the event loop deleting the
-                            // structs _before_ the execution thread acquires
-                            // it. So in addition to locking the mutex, the
-                            // execution thread always checks request_canceled
-                            // as well before accessing the structs.
-                            Lock cancel_lock{cancel_mutex};
-                            server_context.request_canceled = true;
-                        };
-                        // Update requests_threads map if not canceled.
-                        std::tie(request_thread, inserted) = SetThread(
-                            GuardedRef{thread_context.waiter->m_mutex, request_threads}, server.m_context.connection,
-                            [&] { return context_arg.getCallbackThread(); });
-                    });
+    auto invoke = [self = kj::mv(self), call_context = kj::mv(server_context.call_context), &server, &loop, req, fn, args...](CancelMonitor& cancel_monitor) mutable {
+        MP_LOG(loop, Log::Debug) << "IPC server executing request #" << req;
+        if (loop.testing_hook_async_request_start) loop.testing_hook_async_request_start();
+        KJ_DEFER(if (loop.testing_hook_async_request_done) loop.testing_hook_async_request_done());
+        ServerContext server_context{server, call_context, req};
+        // Before invoking the function, store a reference to the
+        // callbackThread provided by the client in the
+        // thread_local.request_threads map. This way, if this
+        // server thread needs to execute any RPCs that call back to
+        // the client, they will happen on the same client thread
+        // that is waiting for this function, just like what would
+        // happen if this were a normal function call made on the
+        // local stack.
+        //
+        // If the request_threads map already has an entry for this
+        // connection, it will be left unchanged, and it indicates
+        // that the current thread is an RPC client thread which is
+        // in the middle of an RPC call, and the current RPC call is
+        // a nested call from the remote thread handling that RPC
+        // call. In this case, the callbackThread value should point
+        // to the same thread already in the map, so there is no
+        // need to update the map.
+        auto& thread_context = g_thread_context;
+        auto& request_threads = thread_context.request_threads;
+        ConnThread request_thread;
+        bool inserted{false};
+        Mutex cancel_mutex;
+        Lock cancel_lock{cancel_mutex};
+        server_context.cancel_lock = &cancel_lock;
+        loop.sync([&] {
+            // Detect request being canceled before it executes.
+            if (cancel_monitor.m_canceled) {
+                server_context.request_canceled = true;
+                return;
+            }
+            // Detect request being canceled while it executes.
+            assert(!cancel_monitor.m_on_cancel);
+            cancel_monitor.m_on_cancel = [&loop, &server_context, &cancel_mutex, req]() {
+                MP_LOG(loop, Log::Info) << "IPC server request #" << req << " canceled while executing.";
+                // Lock cancel_mutex here to block the event loop
+                // thread and prevent it from deleting the request's
+                // params and response structs while the execution
+                // thread is accessing them. Because this lock is
+                // released before the event loop thread does delete
+                // the structs, the mutex does not provide any
+                // protection from the event loop deleting the
+                // structs _before_ the execution thread acquires
+                // it. So in addition to locking the mutex, the
+                // execution thread always checks request_canceled
+                // as well before accessing the structs.
+                Lock cancel_lock{cancel_mutex};
+                server_context.request_canceled = true;
+            };
+            // Update requests_threads map if not canceled. We know
+            // the request is not canceled currently because
+            // cancel_monitor.m_canceled was checked above and this
+            // code is running on the event loop thread.
+            std::tie(request_thread, inserted) = SetThread(
+                GuardedRef{thread_context.waiter->m_mutex, request_threads}, server.m_context.connection,
+                [&] { return Accessor::get(call_context.getParams()).getCallbackThread(); });
+        });
 
-                    // If an entry was inserted into the request_threads map,
-                    // remove it after calling fn.invoke. If an entry was not
-                    // inserted, one already existed, meaning this must be a
-                    // recursive call (IPC call calling back to the caller which
-                    // makes another IPC call), so avoid modifying the map.
-                    const bool erase_thread{inserted};
-                    KJ_DEFER(
-                        // Release the cancel lock before calling loop->sync and
-                        // waiting for the event loop thread, because if a
-                        // cancellation happened, it needs to run the on_cancel
-                        // callback above. It's safe to release cancel_lock at
-                        // this point because the fn.invoke() call below will be
-                        // finished and no longer accessing the params or
-                        // results structs.
-                        cancel_lock.m_lock.unlock();
-                        // Erase the request_threads entry on the event loop
-                        // thread with loop->sync(), so if the connection is
-                        // broken there is not a race between this thread and
-                        // the disconnect handler trying to destroy the thread
-                        // client object.
-                        server.m_context.loop->sync([&] {
-                            auto self_dispose{kj::mv(self)};
-                            if (erase_thread) {
-                            // Look up the thread again without using existing
-                            // iterator since entry may no longer be there after
-                            // a disconnect. Destroy node after releasing
-                            // Waiter::m_mutex, so the ProxyClient<Thread>
-                            // destructor is able to use EventLoop::mutex
-                            // without violating lock order.
-                            ConnThreads::node_type removed;
-                            {
-                                Lock lock(thread_context.waiter->m_mutex);
-                                removed = request_threads.extract(server.m_context.connection);
-                            }
-                            }
-                        });
-                    );
-                    if (server_context.request_canceled) {
-                        MP_LOG(*server.m_context.loop, Log::Info) << "IPC server request #" << req << " canceled before it could be executed";
-                    } else KJ_IF_MAYBE(exception, kj::runCatchingExceptions([&]{
-                        try {
-                            fn.invoke(server_context, args...);
-                        } catch (const InterruptException& e) {
-                            MP_LOG(*server.m_context.loop, Log::Info) << "IPC server request #" << req << " interrupted (" << e.what() << ")";
-                        }
-                    })) {
-                        MP_LOG(*server.m_context.loop, Log::Error) << "IPC server request #" << req << " uncaught exception (" << kj::str(*exception).cStr() << ")";
-                        throw kj::mv(*exception);
+        // If an entry was inserted into the request_threads map,
+        // remove it after calling fn.invoke. If an entry was not
+        // inserted, one already existed, meaning this must be a
+        // recursive call (IPC call calling back to the caller which
+        // makes another IPC call), so avoid modifying the map.
+        const bool erase_thread{inserted};
+        KJ_DEFER(
+            // Release the cancel lock before calling loop->sync and
+            // waiting for the event loop thread, because if a
+            // cancellation happened, it needs to run the on_cancel
+            // callback above. It's safe to release cancel_lock at
+            // this point because the fn.invoke() call below will be
+            // finished and no longer accessing the params or
+            // results structs.
+            cancel_lock.m_lock.unlock();
+            // Erase the request_threads entry on the event loop
+            // thread with loop->sync(), so if the connection is
+            // broken there is not a race between this thread and
+            // the disconnect handler trying to destroy the thread
+            // client object.
+            loop.sync([&] {
+                // Clear cancellation callback. At this point the
+                // method invocation finished and the result is
+                // either being returned, or discarded if a
+                // cancellation happened. So we do not need to be
+                // notified of cancellations after this point. Also
+                // we do not want to be notified because
+                // cancel_mutex and server_context could be out of
+                // scope when it happens.
+                cancel_monitor.m_on_cancel = nullptr;
+                auto self_dispose{kj::mv(self)};
+                if (erase_thread) {
+                    // Look up the thread again without using existing
+                    // iterator since entry may no longer be there after
+                    // a disconnect. Destroy node after releasing
+                    // Waiter::m_mutex, so the ProxyClient<Thread>
+                    // destructor is able to use EventLoop::mutex
+                    // without violating lock order.
+                    ConnThreads::node_type removed;
+                    {
+                        Lock lock(thread_context.waiter->m_mutex);
+                        removed = request_threads.extract(server.m_context.connection);
                     }
-                    // End of scope: if KJ_DEFER was reached, it runs here
                 }
-                return call_context;
-            };
+            });
+        );
+        if (server_context.request_canceled) {
+            MP_LOG(loop, Log::Info) << "IPC server request #" << req << " canceled before it could be executed";
+        } else KJ_IF_MAYBE(exception, kj::runCatchingExceptions([&]{
+            try {
+                fn.invoke(server_context, args...);
+            } catch (const InterruptException& e) {
+                MP_LOG(loop, Log::Info) << "IPC server request #" << req << " interrupted (" << e.what() << ")";
+            }
+        })) {
+            MP_LOG(loop, Log::Error) << "IPC server request #" << req << " uncaught exception (" << kj::str(*exception).cStr() << ")";
+            kj::throwRecoverableException(kj::mv(*exception));
+        }
+        return call_context;
+        // End of scope: if KJ_DEFER was reached, it runs here
+    };
 
     // Lookup Thread object specified by the client. The specified thread should
     // be a local Thread::Server object, but it needs to be looked up
     // asynchronously with getLocalServer().
+    const auto& params = server_context.call_context.getParams();
+    Context::Reader context_arg = Accessor::get(params);
     auto thread_client = context_arg.getThread();
     auto result = server.m_context.connection->m_threads.getLocalServer(thread_client)
-        .then([&server, invoke = kj::mv(invoke), req](const kj::Maybe<Thread::Server&>& perhaps) mutable {
+        .then([&loop, invoke = kj::mv(invoke), req](const kj::Maybe<Thread::Server&>& perhaps) mutable {
             // Assuming the thread object is found, pass it a pointer to the
             // `invoke` lambda above which will invoke the function on that
             // thread.
             KJ_IF_MAYBE (thread_server, perhaps) {
                 auto& thread = static_cast<ProxyServer<Thread>&>(*thread_server);
-                MP_LOG(*server.m_context.loop, Log::Debug)
+                MP_LOG(loop, Log::Debug)
                     << "IPC server post request  #" << req << " {" << thread.m_thread_context.thread_name << "}";
                 return thread.template post<typename ServerContext::CallContext>(std::move(invoke));
             } else {
-                MP_LOG(*server.m_context.loop, Log::Error)
+                MP_LOG(loop, Log::Error)
                     << "IPC server error request #" << req << ", missing thread to execute request";
                 throw std::runtime_error("invalid thread handle");
             }
diff --git a/src/ipc/libmultiprocess/include/mp/type-data.h b/src/ipc/libmultiprocess/include/mp/type-data.h
index 5da4cfce5f49..cdcdd30eb4c6 100644
--- a/src/ipc/libmultiprocess/include/mp/type-data.h
+++ b/src/ipc/libmultiprocess/include/mp/type-data.h
@@ -7,6 +7,9 @@
 
 #include <mp/util.h>
 
+#include <concepts>
+#include <span>
+
 namespace mp {
 template <typename T, typename U>
 concept IsSpanOf =
diff --git a/src/ipc/libmultiprocess/include/mp/type-function.h b/src/ipc/libmultiprocess/include/mp/type-function.h
index 47d3b30be299..951e08852d31 100644
--- a/src/ipc/libmultiprocess/include/mp/type-function.h
+++ b/src/ipc/libmultiprocess/include/mp/type-function.h
@@ -48,13 +48,13 @@ struct ProxyCallFn
 };
 
 template <typename FnR, typename... FnParams, typename Input, typename ReadDest>
-decltype(auto) CustomReadField(TypeList<std::function<FnR(FnParams...)>>,
+decltype(auto) CustomReadField(TypeList<std::function<FnR(FnParams...)>> types,
     Priority<1>,
     InvokeContext& invoke_context,
     Input&& input,
     ReadDest&& read_dest)
 {
-    if (input.has()) {
+    if (CustomHasField(types, invoke_context, input)) {
         using Interface = typename Decay<decltype(input.get())>::Calls;
         auto client = std::make_shared<ProxyClient<Interface>>(
             input.get(), &invoke_context.connection, /* destroy_connection= */ false);
diff --git a/src/ipc/libmultiprocess/include/mp/type-interface.h b/src/ipc/libmultiprocess/include/mp/type-interface.h
index 7a98b4afab4f..a32c53d268f8 100644
--- a/src/ipc/libmultiprocess/include/mp/type-interface.h
+++ b/src/ipc/libmultiprocess/include/mp/type-interface.h
@@ -85,7 +85,7 @@ decltype(auto) CustomReadField(TypeList<std::unique_ptr<LocalType>>,
     typename Decay<decltype(input.get())>::Calls* enable = nullptr)
 {
     using Interface = typename Decay<decltype(input.get())>::Calls;
-    if (input.has()) {
+    if (CustomHasField(TypeList<LocalType>(), invoke_context, input)) {
         return read_dest.construct(
                                    CustomMakeProxyClient<Interface, LocalType>(invoke_context, std::move(input.get())));
     }
@@ -101,7 +101,7 @@ decltype(auto) CustomReadField(TypeList<std::shared_ptr<LocalType>>,
     typename Decay<decltype(input.get())>::Calls* enable = nullptr)
 {
     using Interface = typename Decay<decltype(input.get())>::Calls;
-    if (input.has()) {
+    if (CustomHasField(TypeList<LocalType>(), invoke_context, input)) {
         return read_dest.construct(
             CustomMakeProxyClient<Interface, LocalType>(invoke_context, std::move(input.get())));
     }
diff --git a/src/ipc/libmultiprocess/include/mp/type-map.h b/src/ipc/libmultiprocess/include/mp/type-map.h
index 6fa5623e510a..50a590cbc3fc 100644
--- a/src/ipc/libmultiprocess/include/mp/type-map.h
+++ b/src/ipc/libmultiprocess/include/mp/type-map.h
@@ -27,6 +27,35 @@ void CustomBuildField(TypeList<std::map<KeyLocalType, ValueLocalType>>,
     }
 }
 
+// Replacement for `m.emplace(piecewise_construct, t1, t2)` to work around a
+// Clang 22 regression triggered by libc++'s std::map piecewise emplace: when
+// the key constructor argument tuple is empty (std::tuple<>), libc++'s internal
+// "try key extraction" SFINAE probe instantiates std::tuple_element<0,
+// std::tuple<>>, which Clang 22 diagnoses as an out-of-bounds pack access ("a
+// parameter pack may not be accessed at an out of bounds index") instead of
+// treating it as substitution failure. See LLVM issue #167709 and the upstream
+// fix in llvm/llvm-project PR #183614.
+// https://github.com/llvm/llvm-project/issues/167709
+// https://github.com/llvm/llvm-project/pull/183614
+template <class Map, class Tuple1, class Tuple2>
+auto EmplacePiecewiseSafe(
+    Map& m,
+    const std::piecewise_construct_t&,
+    Tuple1&& t1,
+    Tuple2&& t2)
+{
+    if constexpr (std::tuple_size_v<std::remove_reference_t<Tuple1>> == 0) {
+        // Avoid tuple<> / tuple<> (LLVM 22 libc++ regression path)
+        return m.emplace(std::piecewise_construct,
+                         std::forward_as_tuple(typename Map::key_type{}),
+                         std::forward<Tuple2>(t2));
+    } else {
+        return m.emplace(std::piecewise_construct,
+                         std::forward<Tuple1>(t1),
+                         std::forward<Tuple2>(t2));
+    }
+}
+
 template <typename KeyLocalType, typename ValueLocalType, typename Input, typename ReadDest>
 decltype(auto) CustomReadField(TypeList<std::map<KeyLocalType, ValueLocalType>>,
     Priority<1>,
@@ -42,7 +71,7 @@ decltype(auto) CustomReadField(TypeList<std::map<KeyLocalType, ValueLocalType>>,
                 Make<ValueField>(item),
                 ReadDestEmplace(
                     TypeList<std::pair<const KeyLocalType, ValueLocalType>>(), [&](auto&&... args) -> auto& {
-                        return *value.emplace(std::forward<decltype(args)>(args)...).first;
+                        return *EmplacePiecewiseSafe(value, std::forward<decltype(args)>(args)...).first;
                     }));
         }
     });
diff --git a/src/ipc/libmultiprocess/include/mp/type-message.h b/src/ipc/libmultiprocess/include/mp/type-message.h
index baa46eb0cad4..b1cec13d6c1f 100644
--- a/src/ipc/libmultiprocess/include/mp/type-message.h
+++ b/src/ipc/libmultiprocess/include/mp/type-message.h
@@ -23,13 +23,13 @@ void CustomBuildField(TypeList<LocalType>, Priority<2>, InvokeContext& invoke_co
 //! overloads. Defining a CustomReadMessage overload is simpler than defining a
 //! CustomReadField overload because it only requires defining a normal
 //! function, not a template function, but less flexible.
-template <typename LocalType, typename Reader, typename ReadDest>
-decltype(auto) CustomReadField(TypeList<LocalType>, Priority<2>, InvokeContext& invoke_context, Reader&& reader,
+template <typename LocalType, typename Input, typename ReadDest>
+decltype(auto) CustomReadField(TypeList<LocalType>, Priority<2>, InvokeContext& invoke_context, Input&& input,
                                ReadDest&& read_dest,
-                               decltype(CustomReadMessage(invoke_context, reader.get(),
+                               decltype(CustomReadMessage(invoke_context, input.get(),
                                                           std::declval<LocalType&>()))* enable = nullptr)
 {
-    return read_dest.update([&](auto& value) { if (reader.has()) CustomReadMessage(invoke_context, reader.get(), value); });
+    return read_dest.update([&](auto& value) { if (CustomHasField(TypeList<LocalType>(), invoke_context, input)) CustomReadMessage(invoke_context, input.get(), value); });
 }
 
 //! Helper for CustomPassField below. Call Accessor::init method if it has one,
diff --git a/src/ipc/libmultiprocess/include/mp/type-optional.h b/src/ipc/libmultiprocess/include/mp/type-optional.h
index 6f23fd4d5211..80a8f4f3026e 100644
--- a/src/ipc/libmultiprocess/include/mp/type-optional.h
+++ b/src/ipc/libmultiprocess/include/mp/type-optional.h
@@ -17,8 +17,7 @@ void CustomBuildField(TypeList<std::optional<LocalType>>,
 {
     if (value) {
         output.setHas();
-        // FIXME: should std::move value if destvalue is rref?
-        BuildField(TypeList<LocalType>(), invoke_context, output, *value);
+        BuildField(TypeList<LocalType>(), invoke_context, output, *std::forward<Value>(value));
     }
 }
 
@@ -30,7 +29,7 @@ decltype(auto) CustomReadField(TypeList<std::optional<LocalType>>,
     ReadDest&& read_dest)
 {
     return read_dest.update([&](auto& value) {
-        if (!input.has()) {
+        if (!CustomHasField(TypeList<LocalType>(), invoke_context, input)) {
             value.reset();
         } else if (value) {
             ReadField(TypeList<LocalType>(), invoke_context, input, ReadDestUpdate(*value));
diff --git a/src/ipc/libmultiprocess/include/mp/type-pointer.h b/src/ipc/libmultiprocess/include/mp/type-pointer.h
index 98b7aa817fe0..192e1b034a36 100644
--- a/src/ipc/libmultiprocess/include/mp/type-pointer.h
+++ b/src/ipc/libmultiprocess/include/mp/type-pointer.h
@@ -50,7 +50,7 @@ decltype(auto) CustomReadField(TypeList<std::shared_ptr<LocalType>>,
     ReadDest&& read_dest)
 {
     return read_dest.update([&](auto& value) {
-        if (!input.has()) {
+        if (!CustomHasField(TypeList<LocalType>(), invoke_context, input)) {
             value.reset();
         } else if (value) {
             ReadField(TypeList<LocalType>(), invoke_context, input, ReadDestUpdate(*value));
@@ -72,7 +72,7 @@ decltype(auto) CustomReadField(TypeList<std::shared_ptr<const LocalType>>,
     ReadDest&& read_dest)
 {
     return read_dest.update([&](auto& value) {
-        if (!input.has()) {
+        if (!CustomHasField(TypeList<LocalType>(), invoke_context, input)) {
             value.reset();
             return;
         }
diff --git a/src/ipc/libmultiprocess/include/mp/version.h b/src/ipc/libmultiprocess/include/mp/version.h
index a6b0096feb82..964667a98fb6 100644
--- a/src/ipc/libmultiprocess/include/mp/version.h
+++ b/src/ipc/libmultiprocess/include/mp/version.h
@@ -24,7 +24,7 @@
 //! pointing at the prior merge commit. The /doc/versions.md file should also be
 //! updated, noting any significant or incompatible changes made since the
 //! previous version.
-#define MP_MAJOR_VERSION 8
+#define MP_MAJOR_VERSION 10
 
 //! Minor version number. Should be incremented in stable branches after
 //! backporting changes. The /doc/versions.md file should also be updated to
diff --git a/src/ipc/libmultiprocess/src/mp/gen.cpp b/src/ipc/libmultiprocess/src/mp/gen.cpp
index 53d3fd36efa4..603f9ccb7206 100644
--- a/src/ipc/libmultiprocess/src/mp/gen.cpp
+++ b/src/ipc/libmultiprocess/src/mp/gen.cpp
@@ -228,6 +228,7 @@ static void Generate(kj::StringPtr src_prefix,
     cpp_client << "#include <" << include_path << ".proxy-types.h>\n";
     cpp_client << "#include <capnp/generated-header-support.h>\n";
     cpp_client << "#include <cstring>\n";
+    cpp_client << "#include <vector>\n";
     cpp_client << "#include <kj/common.h>\n";
     cpp_client << "#include <mp/proxy.h>\n";
     cpp_client << "#include <mp/util.h>\n";
diff --git a/src/ipc/libmultiprocess/src/mp/proxy.cpp b/src/ipc/libmultiprocess/src/mp/proxy.cpp
index da22ae62c950..d24208dbfd89 100644
--- a/src/ipc/libmultiprocess/src/mp/proxy.cpp
+++ b/src/ipc/libmultiprocess/src/mp/proxy.cpp
@@ -411,13 +411,16 @@ ProxyServer<ThreadMap>::ProxyServer(Connection& connection) : m_connection(conne
 
 kj::Promise<void> ProxyServer<ThreadMap>::makeThread(MakeThreadContext context)
 {
+    EventLoop& loop{*m_connection.m_loop};
+    if (loop.testing_hook_makethread) loop.testing_hook_makethread();
     const std::string from = context.getParams().getName();
     std::promise<ThreadContext*> thread_context;
-    std::thread thread([&thread_context, from, this]() {
-        g_thread_context.thread_name = ThreadName(m_connection.m_loop->m_exe_name) + " (from " + from + ")";
+    std::thread thread([&loop, &thread_context, from]() {
+        g_thread_context.thread_name = ThreadName(loop.m_exe_name) + " (from " + from + ")";
         g_thread_context.waiter = std::make_unique<Waiter>();
-        thread_context.set_value(&g_thread_context);
         Lock lock(g_thread_context.waiter->m_mutex);
+        thread_context.set_value(&g_thread_context);
+        if (loop.testing_hook_makethread_created) loop.testing_hook_makethread_created();
         // Wait for shutdown signal from ProxyServer<Thread> destructor (signal
         // is just waiter getting set to null.)
         g_thread_context.waiter->wait(lock, [] { return !g_thread_context.waiter; });
diff --git a/src/ipc/libmultiprocess/src/mp/util.cpp b/src/ipc/libmultiprocess/src/mp/util.cpp
index 7b486082a063..463947b9bbb8 100644
--- a/src/ipc/libmultiprocess/src/mp/util.cpp
+++ b/src/ipc/libmultiprocess/src/mp/util.cpp
@@ -81,7 +81,7 @@ std::string ThreadName(const char* exe_name)
     buffer << syscall(SYS_gettid);
 #elif defined(HAVE_PTHREAD_THREADID_NP)
     uint64_t tid = 0;
-    pthread_threadid_np(NULL, &tid);
+    pthread_threadid_np(nullptr, &tid);
     buffer << tid;
 #elif defined(HAVE_PTHREAD_GETTHREADID_NP)
     buffer << pthread_getthreadid_np();
@@ -102,7 +102,7 @@ std::string LogEscape(const kj::StringTree& string, size_t max_size)
                 result.append("\\\\");
             } else if (c < 0x20 || c > 0x7e) {
                 char escape[4];
-                snprintf(escape, 4, "\\%02x", c);
+                snprintf(escape, sizeof(escape), "\\%02x", static_cast<unsigned char>(c));
                 result.append(escape);
             } else {
                 result.push_back(c);
diff --git a/src/ipc/libmultiprocess/test/mp/test/foo-types.h b/src/ipc/libmultiprocess/test/mp/test/foo-types.h
index e70bc4c100bb..735adb7689c9 100644
--- a/src/ipc/libmultiprocess/test/mp/test/foo-types.h
+++ b/src/ipc/libmultiprocess/test/mp/test/foo-types.h
@@ -13,12 +13,14 @@
 #include <cstddef>
 #include <mp/test/foo.capnp.h>
 #include <mp/type-context.h>
+#include <mp/type-data.h>
 #include <mp/type-decay.h>
 #include <mp/type-function.h>
 #include <mp/type-interface.h>
 #include <mp/type-map.h>
 #include <mp/type-message.h>
 #include <mp/type-number.h>
+#include <mp/type-pointer.h>
 #include <mp/type-set.h>
 #include <mp/type-string.h>
 #include <mp/type-struct.h>
@@ -56,6 +58,14 @@ decltype(auto) CustomReadField(TypeList<FooCustom>, Priority<1>, InvokeContext&
 
 } // namespace test
 
+template <typename Input>
+bool CustomHasField(TypeList<test::FooData>, InvokeContext& invoke_context, const Input& input)
+{
+    // Cap'n Proto C++ cannot distinguish null vs empty Data in List(Data), so
+    // interpret empty Data as null for this specific type.
+    return input.get().size() != 0;
+}
+
 inline void CustomBuildMessage(InvokeContext& invoke_context,
                         const test::FooMessage& src,
                         test::messages::FooMessage::Builder&& builder)
diff --git a/src/ipc/libmultiprocess/test/mp/test/foo.capnp b/src/ipc/libmultiprocess/test/mp/test/foo.capnp
index 5bdb5754bde5..5bdee2575b5a 100644
--- a/src/ipc/libmultiprocess/test/mp/test/foo.capnp
+++ b/src/ipc/libmultiprocess/test/mp/test/foo.capnp
@@ -34,6 +34,7 @@ interface FooInterface $Proxy.wrap("mp::test::FooImplementation") {
     callFn @17 () -> ();
     callFnAsync @18 (context :Proxy.Context) -> ();
     callIntFnAsync @21 (context :Proxy.Context, arg :Int32) -> (result :Int32);
+    passDataPointers @22 (arg :List(Data)) -> (result :List(Data));
 }
 
 interface FooCallback $Proxy.wrap("mp::test::FooCallback") {
diff --git a/src/ipc/libmultiprocess/test/mp/test/foo.h b/src/ipc/libmultiprocess/test/mp/test/foo.h
index 73f43da35311..317af025eb63 100644
--- a/src/ipc/libmultiprocess/test/mp/test/foo.h
+++ b/src/ipc/libmultiprocess/test/mp/test/foo.h
@@ -45,6 +45,9 @@ struct FooMutable
     std::string message;
 };
 
+using FooData = std::vector<char>;
+using FooDataRef = std::shared_ptr<const FooData>;
+
 class FooCallback
 {
 public:
@@ -80,6 +83,7 @@ class FooImplementation
     void passMutable(FooMutable& foo) { foo.message += " call"; }
     FooEnum passEnum(FooEnum foo) { return foo; }
     int passFn(std::function<int()> fn) { return fn(); }
+    std::vector<FooDataRef> passDataPointers(std::vector<FooDataRef> values) { return values; }
     std::shared_ptr<FooCallback> m_callback;
     void callFn() { assert(m_fn); m_fn(); }
     void callFnAsync() { assert(m_fn); m_fn(); }
diff --git a/src/ipc/libmultiprocess/test/mp/test/spawn_tests.cpp b/src/ipc/libmultiprocess/test/mp/test/spawn_tests.cpp
index 4c7edba48308..a14e50e2a30f 100644
--- a/src/ipc/libmultiprocess/test/mp/test/spawn_tests.cpp
+++ b/src/ipc/libmultiprocess/test/mp/test/spawn_tests.cpp
@@ -20,6 +20,8 @@
 
 namespace {
 
+constexpr auto FAILURE_TIMEOUT = std::chrono::seconds{30};
+
 // Poll for child process exit using waitpid(..., WNOHANG) until the child exits
 // or timeout expires. Returns true if the child exited and status_out was set.
 // Returns false on timeout or error.
@@ -94,9 +96,9 @@ KJ_TEST("SpawnProcess does not run callback in child")
     ::close(fd);
 
     int status{0};
-    // Give the child up to 1 second to exit. If it does not, terminate it and
+    // Give the child some time to exit. If it does not, terminate it and
     // reap it to avoid leaving a zombie behind.
-    const bool exited{WaitPidWithTimeout(pid, std::chrono::milliseconds{1000}, status)};
+    const bool exited{WaitPidWithTimeout(pid, FAILURE_TIMEOUT, status)};
     if (!exited) {
         ::kill(pid, SIGKILL);
         ::waitpid(pid, &status, /*options=*/0);
diff --git a/src/ipc/libmultiprocess/test/mp/test/test.cpp b/src/ipc/libmultiprocess/test/mp/test/test.cpp
index b8df4677ca09..d91edb40dce4 100644
--- a/src/ipc/libmultiprocess/test/mp/test/test.cpp
+++ b/src/ipc/libmultiprocess/test/mp/test/test.cpp
@@ -9,6 +9,7 @@
 #include <capnp/capability.h>
 #include <capnp/rpc.h>
 #include <cassert>
+#include <chrono>
 #include <condition_variable>
 #include <cstdint>
 #include <cstring>
@@ -49,8 +50,8 @@ static_assert(std::is_integral_v<decltype(kMP_MINOR_VERSION)>, "MP_MINOR_VERSION
  * Test setup class creating a two way connection between a
  * ProxyServer<FooInterface> object and a ProxyClient<FooInterface>.
  *
- * Provides client_disconnect and server_disconnect lambdas that can be used to
- * trigger disconnects and test handling of broken and closed connections.
+ * Provides disconnection lambdas that can be used to trigger
+ * disconnects and test handling of broken and closed connections.
  *
  * Accepts a client_owns_connection option to test different ProxyClient
  * destroy_connection values and control whether destroying the ProxyClient
@@ -63,6 +64,7 @@ class TestSetup
 {
 public:
     std::function<void()> server_disconnect;
+    std::function<void()> server_disconnect_later;
     std::function<void()> client_disconnect;
     std::promise<std::unique_ptr<ProxyClient<messages::FooInterface>>> client_promise;
     std::unique_ptr<ProxyClient<messages::FooInterface>> client;
@@ -88,6 +90,10 @@ class TestSetup
                       return capnp::Capability::Client(kj::mv(server_proxy));
                   });
               server_disconnect = [&] { loop.sync([&] { server_connection.reset(); }); };
+              server_disconnect_later = [&] {
+                  assert(std::this_thread::get_id() == loop.m_thread_id);
+                  loop.m_task_set->add(kj::evalLater([&] { server_connection.reset(); }));
+              };
               // Set handler to destroy the server when the client disconnects. This
               // is ignored if server_disconnect() is called instead.
               server_connection->onDisconnect([&] { server_connection.reset(); });
@@ -211,6 +217,15 @@ KJ_TEST("Call FooInterface methods")
     KJ_EXPECT(mut.message == "init build pass call return read");
 
     KJ_EXPECT(foo->passFn([]{ return 10; }) == 10);
+
+    std::vector<FooDataRef> data_in;
+    data_in.push_back(std::make_shared<FooData>(FooData{'H', 'i'}));
+    data_in.push_back(nullptr);
+    std::vector<FooDataRef> data_out{foo->passDataPointers(data_in)};
+    KJ_EXPECT(data_out.size() == 2);
+    KJ_REQUIRE(data_out[0] != nullptr);
+    KJ_EXPECT(*data_out[0] == *data_in[0]);
+    KJ_EXPECT(!data_out[1]);
 }
 
 KJ_TEST("Call IPC method after client connection is closed")
@@ -316,6 +331,102 @@ KJ_TEST("Calling IPC method, disconnecting and blocking during the call")
     signal.set_value();
 }
 
+KJ_TEST("Worker thread destroyed before it is initialized")
+{
+    // Regression test for bitcoin/bitcoin#34711, bitcoin/bitcoin#34756 where a
+    // worker thread is destroyed before it starts waiting for work.
+    //
+    // The test uses the `makethread` hook to trigger a disconnect as soon as
+    // ProxyServer<ThreadMap>::makeThread is called, so without the bugfix,
+    // ProxyServer<Thread>::~ProxyServer would run and destroy the waiter before
+    // the worker thread started waiting, causing a SIGSEGV when it did start.
+    TestSetup setup;
+    ProxyClient<messages::FooInterface>* foo = setup.client.get();
+    foo->initThreadMap();
+    setup.server->m_impl->m_fn = [] {};
+
+    EventLoop& loop = *setup.server->m_context.connection->m_loop;
+    loop.testing_hook_makethread = [&] {
+        // Use disconnect_later to queue the disconnect, because the makethread
+        // hook is called on the event loop thread. The disconnect should happen
+        // as soon as the event loop is idle.
+        setup.server_disconnect_later();
+    };
+    loop.testing_hook_makethread_created = [&] {
+        // Sleep to allow event loop to run and process the queued disconnect
+        // before the worker thread starts waiting.
+        std::this_thread::sleep_for(std::chrono::milliseconds(10));
+    };
+
+    bool disconnected{false};
+    try {
+        foo->callFnAsync();
+    } catch (const std::runtime_error& e) {
+        KJ_EXPECT(std::string_view{e.what()} == "IPC client method call interrupted by disconnect.");
+        disconnected = true;
+    }
+    KJ_EXPECT(disconnected);
+}
+
+KJ_TEST("Calling async IPC method, with server disconnect racing the call")
+{
+    // Regression test for bitcoin/bitcoin#34777 heap-use-after-free where
+    // an async request is canceled before it starts to execute.
+    //
+    // Use testing_hook_async_request_start to trigger a disconnect from the
+    // worker thread as soon as it begins to execute an async request. Without
+    // the bugfix, the worker thread would trigger a SIGSEGV after this by
+    // calling call_context.getParams().
+    TestSetup setup;
+    ProxyClient<messages::FooInterface>* foo = setup.client.get();
+    foo->initThreadMap();
+    setup.server->m_impl->m_fn = [] {};
+
+    EventLoop& loop = *setup.server->m_context.connection->m_loop;
+    loop.testing_hook_async_request_start = [&] {
+        setup.server_disconnect();
+        // Sleep is necessary to let the event loop fully clean up after the
+        // disconnect and trigger the SIGSEGV.
+        std::this_thread::sleep_for(std::chrono::milliseconds(10));
+    };
+
+    try {
+        foo->callFnAsync();
+        KJ_EXPECT(false);
+    } catch (const std::runtime_error& e) {
+        KJ_EXPECT(std::string_view{e.what()} == "IPC client method call interrupted by disconnect.");
+    }
+}
+
+KJ_TEST("Calling async IPC method, with server disconnect after cleanup")
+{
+    // Regression test for bitcoin/bitcoin#34782 stack-use-after-return where
+    // an async request is canceled after it finishes executing but before the
+    // response is sent.
+    //
+    // Use testing_hook_async_request_done to trigger a disconnect from the
+    // worker thread after it executes an async request but before it returns.
+    // Without the bugfix, the m_on_cancel callback would be called at this
+    // point, accessing the cancel_mutex stack variable that had gone out of
+    // scope.
+    TestSetup setup;
+    ProxyClient<messages::FooInterface>* foo = setup.client.get();
+    foo->initThreadMap();
+    setup.server->m_impl->m_fn = [] {};
+
+    EventLoop& loop = *setup.server->m_context.connection->m_loop;
+    loop.testing_hook_async_request_done = [&] {
+        setup.server_disconnect();
+    };
+
+    try {
+        foo->callFnAsync();
+        KJ_EXPECT(false);
+    } catch (const std::runtime_error& e) {
+        KJ_EXPECT(std::string_view{e.what()} == "IPC client method call interrupted by disconnect.");
+    }
+}
+
 KJ_TEST("Make simultaneous IPC calls on single remote thread")
 {
     TestSetup setup;
diff --git a/src/ipc/stub.cpp b/src/ipc/stub.cpp
new file mode 100644
index 000000000000..e00ff568f823
--- /dev/null
+++ b/src/ipc/stub.cpp
@@ -0,0 +1,14 @@
+// Copyright (c) 2025 The Bitcoin Core developers
+// Distributed under the MIT software license, see the accompanying
+// file COPYING or http://www.opensource.org/licenses/mit-license.php.
+
+#include <interfaces/ipc.h>
+
+#include <memory>
+
+namespace interfaces {
+std::unique_ptr<Ipc> MakeIpc(const char* exe_name, const char* process_argv0, Init& init)
+{
+    return {};
+}
+} // namespace interfaces
diff --git a/src/kernel/CMakeLists.txt b/src/kernel/CMakeLists.txt
index 244f0098fdf9..541f10b3adce 100644
--- a/src/kernel/CMakeLists.txt
+++ b/src/kernel/CMakeLists.txt
@@ -54,7 +54,6 @@ add_library(bitcoinkernel
   ../script/solver.cpp
   ../signet.cpp
   ../streams.cpp
-  ../support/lockedpool.cpp
   ../sync.cpp
   ../txdb.cpp
   ../txgraph.cpp
@@ -69,7 +68,6 @@ add_library(bitcoinkernel
   ../util/hasher.cpp
   ../util/moneystr.cpp
   ../util/rbf.cpp
-  ../util/serfloat.cpp
   ../util/signalinterrupt.cpp
   ../util/syserror.cpp
   ../util/threadnames.cpp
diff --git a/src/kernel/bitcoinkernel.cpp b/src/kernel/bitcoinkernel.cpp
index 09b4853fa91e..dc03be71461f 100644
--- a/src/kernel/bitcoinkernel.cpp
+++ b/src/kernel/bitcoinkernel.cpp
@@ -50,6 +50,10 @@
 #include <utility>
 #include <vector>
 
+namespace Consensus {
+struct Params;
+} // namespace Consensus
+
 using kernel::ChainstateRole;
 using util::ImmediateTaskRunner;
 
@@ -496,6 +500,7 @@ struct btck_TransactionOutPoint: Handle<btck_TransactionOutPoint, COutPoint> {};
 struct btck_Txid: Handle<btck_Txid, Txid> {};
 struct btck_PrecomputedTransactionData : Handle<btck_PrecomputedTransactionData, PrecomputedTransactionData> {};
 struct btck_BlockHeader: Handle<btck_BlockHeader, CBlockHeader> {};
+struct btck_ConsensusParams: Handle<btck_ConsensusParams, Consensus::Params> {};
 
 btck_Transaction* btck_transaction_create(const void* raw_transaction, size_t raw_transaction_len)
 {
@@ -533,6 +538,11 @@ const btck_TransactionInput* btck_transaction_get_input_at(const btck_Transactio
     return btck_TransactionInput::ref(&btck_Transaction::get(transaction)->vin[input_index]);
 }
 
+uint32_t btck_transaction_get_locktime(const btck_Transaction* transaction)
+{
+    return btck_Transaction::get(transaction)->nLockTime;
+}
+
 const btck_Txid* btck_transaction_get_txid(const btck_Transaction* transaction)
 {
     return btck_Txid::ref(&btck_Transaction::get(transaction)->GetHash());
@@ -692,6 +702,11 @@ const btck_TransactionOutPoint* btck_transaction_input_get_out_point(const btck_
     return btck_TransactionOutPoint::ref(&btck_TransactionInput::get(input).prevout);
 }
 
+uint32_t btck_transaction_input_get_sequence(const btck_TransactionInput* input)
+{
+    return btck_TransactionInput::get(input).nSequence;
+}
+
 void btck_transaction_input_destroy(btck_TransactionInput* input)
 {
     delete input;
@@ -813,6 +828,11 @@ btck_ChainParameters* btck_chain_parameters_copy(const btck_ChainParameters* cha
     return btck_ChainParameters::copy(chain_parameters);
 }
 
+const btck_ConsensusParams* btck_chain_parameters_get_consensus_params(const btck_ChainParameters* chain_parameters)
+{
+    return btck_ConsensusParams::ref(&btck_ChainParameters::get(chain_parameters).GetConsensus());
+}
+
 void btck_chain_parameters_destroy(btck_ChainParameters* chain_parameters)
 {
     delete chain_parameters;
@@ -1109,6 +1129,19 @@ btck_Block* btck_block_copy(const btck_Block* block)
     return btck_Block::copy(block);
 }
 
+int btck_block_check(const btck_Block* block, const btck_ConsensusParams* consensus_params, btck_BlockCheckFlags flags, btck_BlockValidationState* validation_state)
+{
+    auto& state = btck_BlockValidationState::get(validation_state);
+    state = BlockValidationState{};
+
+    const bool check_pow    = (flags & btck_BlockCheckFlags_POW) != 0;
+    const bool check_merkle = (flags & btck_BlockCheckFlags_MERKLE) != 0;
+
+    const bool result = CheckBlock(*btck_Block::get(block), state, btck_ConsensusParams::get(consensus_params), /*fCheckPOW=*/check_pow, /*fCheckMerkleRoot=*/check_merkle);
+
+    return result ? 1 : 0;
+}
+
 size_t btck_block_count_transactions(const btck_Block* block)
 {
     return btck_Block::get(block)->vtx.size();
@@ -1390,6 +1423,16 @@ uint32_t btck_block_header_get_nonce(const btck_BlockHeader* header)
     return btck_BlockHeader::get(header).nNonce;
 }
 
+int btck_block_header_to_bytes(const btck_BlockHeader* header, unsigned char output[80])
+{
+    try {
+        SpanWriter{std::as_writable_bytes(std::span{output, 80})} << btck_BlockHeader::get(header);
+        return 0;
+    } catch (...) {
+        return -1;
+    }
+}
+
 void btck_block_header_destroy(btck_BlockHeader* header)
 {
     delete header;
diff --git a/src/kernel/bitcoinkernel.h b/src/kernel/bitcoinkernel.h
index 5427e7761771..d3028b491d24 100644
--- a/src/kernel/bitcoinkernel.h
+++ b/src/kernel/bitcoinkernel.h
@@ -225,6 +225,11 @@ typedef struct btck_Block btck_Block;
  */
 typedef struct btck_BlockValidationState btck_BlockValidationState;
 
+/**
+ * Opaque data structure for holding the Consensus Params.
+ */
+typedef struct btck_ConsensusParams btck_ConsensusParams;
+
 /**
  * Opaque data structure for holding the currently known best-chain associated
  * with a chainstate.
@@ -349,6 +354,8 @@ typedef void (*btck_ValidationInterfaceBlockDisconnected)(void* user_data, btck_
 
 /**
  * Function signature for serializing data.
+ *
+ * Returns 0 to indicate success.
  */
 typedef int (*btck_WriteBytes)(const void* bytes, size_t size, void* userdata);
 
@@ -574,6 +581,15 @@ BITCOINKERNEL_API const btck_TransactionInput* BITCOINKERNEL_WARN_UNUSED_RESULT
 BITCOINKERNEL_API size_t BITCOINKERNEL_WARN_UNUSED_RESULT btck_transaction_count_inputs(
     const btck_Transaction* transaction) BITCOINKERNEL_ARG_NONNULL(1);
 
+/**
+ * @brief Get a transaction's nLockTime value.
+ *
+ * @param[in] transaction Non-null.
+ * @return                The nLockTime value.
+ */
+BITCOINKERNEL_API uint32_t BITCOINKERNEL_WARN_UNUSED_RESULT btck_transaction_get_locktime(
+    const btck_Transaction* transaction) BITCOINKERNEL_ARG_NONNULL(1);
+
 /**
  * @brief Get the txid of a transaction. The returned txid is not owned and
  * depends on the lifetime of the transaction.
@@ -853,6 +869,17 @@ BITCOINKERNEL_API btck_ChainParameters* BITCOINKERNEL_WARN_UNUSED_RESULT btck_ch
 BITCOINKERNEL_API btck_ChainParameters* BITCOINKERNEL_WARN_UNUSED_RESULT btck_chain_parameters_copy(
     const btck_ChainParameters* chain_parameters) BITCOINKERNEL_ARG_NONNULL(1);
 
+/**
+ * @brief Get btck_ConsensusParams from btck_ChainParameters. The returned
+ * btck_ConsensusParams pointer is valid only for the lifetime of the
+ * btck_ChainParameters object and must not be destroyed by the caller.
+ *
+ * @param[in] chain_parameters  Non-null.
+ * @return                      The btck_ConsensusParams.
+ */
+BITCOINKERNEL_API const btck_ConsensusParams* BITCOINKERNEL_WARN_UNUSED_RESULT btck_chain_parameters_get_consensus_params(
+    const btck_ChainParameters* chain_parameters) BITCOINKERNEL_ARG_NONNULL(1);
+
 /**
  * Destroy the chain parameters.
  */
@@ -1236,6 +1263,40 @@ BITCOINKERNEL_API btck_Block* BITCOINKERNEL_WARN_UNUSED_RESULT btck_block_create
 BITCOINKERNEL_API btck_Block* BITCOINKERNEL_WARN_UNUSED_RESULT btck_block_copy(
     const btck_Block* block) BITCOINKERNEL_ARG_NONNULL(1);
 
+/** Bitflags to control context-free block checks (optional). */
+typedef uint32_t btck_BlockCheckFlags;
+#define btck_BlockCheckFlags_BASE   ((btck_BlockCheckFlags)0)                                                        //!< run the base context-free block checks only
+#define btck_BlockCheckFlags_POW    ((btck_BlockCheckFlags)(1U << 0))                                                //!< run CheckProofOfWork via CheckBlockHeader
+#define btck_BlockCheckFlags_MERKLE ((btck_BlockCheckFlags)(1U << 1))                                                //!< verify merkle root (and mutation detection)
+#define btck_BlockCheckFlags_ALL    ((btck_BlockCheckFlags)(btck_BlockCheckFlags_POW | btck_BlockCheckFlags_MERKLE)) //!< enable all optional context-free block checks
+
+/**
+ * @brief Perform context-free validation checks on a btck_Block.
+ *
+ * Runs the base context-free block checks (size limits, coinbase structure,
+ * transaction checks, and sigop limits) using the supplied
+ * btck_ConsensusParams. The proof-of-work and merkle-root checks are optional
+ * and can be toggled via @p flags. Note that this does not include any
+ * transaction script, timestamps, order, or other checks that may require more
+ * context.
+ *
+ * @param[in]     block             Non-null, btck_Block to validate.
+ * @param[in]     consensus_params  Non-null, btck_ConsensusParams for validation.
+ * @param[in]     flags             Bitmask of btck_BlockCheckFlags controlling the
+ *                                  optional POW and merkle-root checks. Use
+ *                                  btck_BlockCheckFlags_BASE to run only the base
+ *                                  checks.
+ * @param[in,out] validation_state  Non-null, previously created with
+ *                                  btck_block_validation_state_create and updated
+ *                                  in-place with the validation result.
+ * @return                          1 if the btck_Block passed the checks, 0 otherwise.
+ */
+BITCOINKERNEL_API int BITCOINKERNEL_WARN_UNUSED_RESULT btck_block_check(
+    const btck_Block* block,
+    const btck_ConsensusParams* consensus_params,
+    btck_BlockCheckFlags flags,
+    btck_BlockValidationState* validation_state) BITCOINKERNEL_ARG_NONNULL(1, 2, 4);
+
 /**
  * @brief Count the number of transactions contained in a block.
  *
@@ -1333,7 +1394,7 @@ BITCOINKERNEL_API btck_BlockValidationState* BITCOINKERNEL_WARN_UNUSED_RESULT bt
  * Destroy the btck_BlockValidationState.
  */
 BITCOINKERNEL_API void btck_block_validation_state_destroy(
-    btck_BlockValidationState* block_validation_state) BITCOINKERNEL_ARG_NONNULL(1);
+    btck_BlockValidationState* block_validation_state);
 
 ///@}
 
@@ -1503,6 +1564,15 @@ BITCOINKERNEL_API btck_TransactionInput* BITCOINKERNEL_WARN_UNUSED_RESULT btck_t
 BITCOINKERNEL_API const btck_TransactionOutPoint* BITCOINKERNEL_WARN_UNUSED_RESULT btck_transaction_input_get_out_point(
     const btck_TransactionInput* transaction_input) BITCOINKERNEL_ARG_NONNULL(1);
 
+/**
+ * @brief Get a transaction input's nSequence value.
+ *
+ * @param[in] transaction_input Non-null.
+ * @return                      The nSequence value.
+ */
+BITCOINKERNEL_API uint32_t BITCOINKERNEL_WARN_UNUSED_RESULT btck_transaction_input_get_sequence(
+    const btck_TransactionInput* transaction_input) BITCOINKERNEL_ARG_NONNULL(1);
+
 /**
  * Destroy the transaction input.
  */
@@ -1590,8 +1660,6 @@ BITCOINKERNEL_API void btck_txid_destroy(btck_Txid* txid);
 
 ///@}
 
-///@}
-
 /** @name Coin
  * Functions for working with coins.
  */
@@ -1768,6 +1836,17 @@ BITCOINKERNEL_API int32_t BITCOINKERNEL_WARN_UNUSED_RESULT btck_block_header_get
 BITCOINKERNEL_API uint32_t BITCOINKERNEL_WARN_UNUSED_RESULT btck_block_header_get_nonce(
     const btck_BlockHeader* header) BITCOINKERNEL_ARG_NONNULL(1);
 
+/**
+ * @brief Serializes the btck_BlockHeader to bytes.
+ * This is consensus serialization that is also used for the P2P network.
+ *
+ * @param[in] header    Non-null.
+ * @param[out] output   The serialized block header (80 bytes).
+ * @return              0 on success.
+ */
+BITCOINKERNEL_API int BITCOINKERNEL_WARN_UNUSED_RESULT btck_block_header_to_bytes(
+    const btck_BlockHeader* header, unsigned char output[80]) BITCOINKERNEL_ARG_NONNULL(1, 2);
+
 /**
  * Destroy the btck_BlockHeader.
  */
diff --git a/src/kernel/bitcoinkernel_wrapper.h b/src/kernel/bitcoinkernel_wrapper.h
index 064d0dd14b9d..cb7af8b35dd2 100644
--- a/src/kernel/bitcoinkernel_wrapper.h
+++ b/src/kernel/bitcoinkernel_wrapper.h
@@ -97,6 +97,13 @@ enum class ScriptVerificationFlags : btck_ScriptVerificationFlags {
     ALL = btck_ScriptVerificationFlags_ALL
 };
 
+enum class BlockCheckFlags : btck_BlockCheckFlags {
+    BASE = btck_BlockCheckFlags_BASE,
+    POW = btck_BlockCheckFlags_POW,
+    MERKLE = btck_BlockCheckFlags_MERKLE,
+    ALL = btck_BlockCheckFlags_ALL
+};
+
 template <typename T>
 struct is_bitmask_enum : std::false_type {
 };
@@ -105,6 +112,10 @@ template <>
 struct is_bitmask_enum<ScriptVerificationFlags> : std::true_type {
 };
 
+template <>
+struct is_bitmask_enum<BlockCheckFlags> : std::true_type {
+};
+
 template <typename T>
 concept BitmaskEnum = is_bitmask_enum<T>::value;
 
@@ -370,6 +381,7 @@ class UniqueHandle
 class PrecomputedTransactionData;
 class Transaction;
 class TransactionOutput;
+class BlockValidationState;
 
 template <typename Derived>
 class ScriptPubkeyApi
@@ -551,6 +563,11 @@ class TransactionInputApi
     {
         return OutPointView{btck_transaction_input_get_out_point(impl())};
     }
+
+    uint32_t GetSequence() const
+    {
+        return btck_transaction_input_get_sequence(impl());
+    }
 };
 
 class TransactionInputView : public View<btck_TransactionInput>, public TransactionInputApi<TransactionInputView>
@@ -596,6 +613,11 @@ class TransactionApi
         return TransactionInputView{btck_transaction_get_input_at(impl(), index)};
     }
 
+    uint32_t GetLocktime() const
+    {
+        return btck_transaction_get_locktime(impl());
+    }
+
     TxidView Txid() const
     {
         return TxidView{btck_transaction_get_txid(impl())};
@@ -746,6 +768,16 @@ class BlockHeaderApi
     {
         return btck_block_header_get_nonce(impl());
     }
+
+    std::array<std::byte, 80> ToBytes() const
+    {
+        std::array<std::byte, 80> header;
+        int res{btck_block_header_to_bytes(impl(), reinterpret_cast<unsigned char*>(header.data()))};
+        if (res != 0) {
+            throw std::runtime_error("Failed to serialize block header");
+        }
+        return header;
+    }
 };
 
 class BlockHeaderView : public View<btck_BlockHeader>, public BlockHeaderApi<BlockHeaderView>
@@ -767,6 +799,12 @@ class BlockHeader : public Handle<btck_BlockHeader, btck_block_header_copy, btck
         : Handle{header} {}
 };
 
+class ConsensusParamsView : public View<btck_ConsensusParams>
+{
+public:
+    explicit ConsensusParamsView(const btck_ConsensusParams* ptr) : View{ptr} {}
+};
+
 class Block : public Handle<btck_Block, btck_block_copy, btck_block_destroy>
 {
 public:
@@ -787,6 +825,10 @@ class Block : public Handle<btck_Block, btck_block_copy, btck_block_destroy>
         return TransactionView{btck_block_get_transaction_at(get(), index)};
     }
 
+    bool Check(const ConsensusParamsView& consensus_params,
+        BlockCheckFlags flags,
+        BlockValidationState& state) const;
+
     MAKE_RANGE_METHOD(Transactions, Block, &Block::CountTransactions, &Block::GetTransaction, *this)
 
     BlockHash GetHash() const
@@ -942,6 +984,13 @@ class BlockValidationState : public Handle<btck_BlockValidationState, btck_block
     BlockValidationState(const BlockValidationStateView& view) : Handle{view} {}
 };
 
+inline bool Block::Check(const ConsensusParamsView& consensus_params,
+    BlockCheckFlags flags,
+    BlockValidationState& state) const
+{
+    return btck_block_check(get(), consensus_params.get(), static_cast<btck_BlockCheckFlags>(flags), state.get()) == 1;
+}
+
 class ValidationInterface
 {
 public:
@@ -961,6 +1010,11 @@ class ChainParams : public Handle<btck_ChainParameters, btck_chain_parameters_co
 public:
     ChainParams(ChainType chain_type)
         : Handle{btck_chain_parameters_create(static_cast<btck_ChainType>(chain_type))} {}
+
+    ConsensusParamsView GetConsensusParams() const
+    {
+        return ConsensusParamsView{btck_chain_parameters_get_consensus_params(get())};
+    }
 };
 
 class ContextOptions : public UniqueHandle<btck_ContextOptions, btck_context_options_destroy>
diff --git a/src/kernel/chainparams.cpp b/src/kernel/chainparams.cpp
index 64809a75911e..02c7ae9d2209 100644
--- a/src/kernel/chainparams.cpp
+++ b/src/kernel/chainparams.cpp
@@ -92,7 +92,7 @@ class CMainParams : public CChainParams {
         consensus.BIP66Height = 363725; // 00000000000000000379eaa19dce8c9b722d46ae6a57c2f1a988119488b50931
         consensus.CSVHeight = 419328; // 000000000000000004a1b34462cb8aeebd5799177f7a29cf28f2d1961716b5b5
         consensus.SegwitHeight = 481824; // 0000000000000000001c8018d9cb3b742ef25114f27563e3fc4a1902167f9893
-        consensus.MinBIP9WarningHeight = 483840; // segwit activation height + miner confirmation window
+        consensus.MinBIP9WarningHeight = 711648; // taproot activation height + miner confirmation window
         consensus.powLimit = uint256{"00000000ffffffffffffffffffffffffffffffffffffffffffffffffffffffff"};
         consensus.nPowTargetTimespan = 14 * 24 * 60 * 60; // two weeks
         consensus.nPowTargetSpacing = 10 * 60;
@@ -106,14 +106,6 @@ class CMainParams : public CChainParams {
         consensus.vDeployments[Consensus::DEPLOYMENT_TESTDUMMY].threshold = 1815; // 90%
         consensus.vDeployments[Consensus::DEPLOYMENT_TESTDUMMY].period = 2016;
 
-        // Deployment of Taproot (BIPs 340-342)
-        consensus.vDeployments[Consensus::DEPLOYMENT_TAPROOT].bit = 2;
-        consensus.vDeployments[Consensus::DEPLOYMENT_TAPROOT].nStartTime = 1619222400; // April 24th, 2021
-        consensus.vDeployments[Consensus::DEPLOYMENT_TAPROOT].nTimeout = 1628640000; // August 11th, 2021
-        consensus.vDeployments[Consensus::DEPLOYMENT_TAPROOT].min_activation_height = 709632; // Approximately November 12th, 2021
-        consensus.vDeployments[Consensus::DEPLOYMENT_TAPROOT].threshold = 1815; // 90%
-        consensus.vDeployments[Consensus::DEPLOYMENT_TAPROOT].period = 2016;
-
         consensus.nMinimumChainWork = uint256{"0000000000000000000000000000000000000001128750f82f4c366153a3a030"};
         consensus.defaultAssumeValid = uint256{"00000000000000000000ccebd6d74d9194d8dcdc1d177c478e094bfad51ba5ac"}; // 938343
 
@@ -223,7 +215,7 @@ class CTestNetParams : public CChainParams {
         consensus.BIP66Height = 330776; // 000000002104c8c45e99a8853285a3b592602a3ccde2b832481da85e9e4ba182
         consensus.CSVHeight = 770112; // 00000000025e930139bac5c6c31a403776da130831ab85be56578f3fa75369bb
         consensus.SegwitHeight = 834624; // 00000000002b980fcd729daaa248fd9316a5200e9b367f4ff2c42453e84201ca
-        consensus.MinBIP9WarningHeight = 836640; // segwit activation height + miner confirmation window
+        consensus.MinBIP9WarningHeight = 2013984; // taproot activation height + miner confirmation window
         consensus.powLimit = uint256{"00000000ffffffffffffffffffffffffffffffffffffffffffffffffffffffff"};
         consensus.nPowTargetTimespan = 14 * 24 * 60 * 60; // two weeks
         consensus.nPowTargetSpacing = 10 * 60;
@@ -237,14 +229,6 @@ class CTestNetParams : public CChainParams {
         consensus.vDeployments[Consensus::DEPLOYMENT_TESTDUMMY].threshold = 1512; // 75%
         consensus.vDeployments[Consensus::DEPLOYMENT_TESTDUMMY].period = 2016;
 
-        // Deployment of Taproot (BIPs 340-342)
-        consensus.vDeployments[Consensus::DEPLOYMENT_TAPROOT].bit = 2;
-        consensus.vDeployments[Consensus::DEPLOYMENT_TAPROOT].nStartTime = 1619222400; // April 24th, 2021
-        consensus.vDeployments[Consensus::DEPLOYMENT_TAPROOT].nTimeout = 1628640000; // August 11th, 2021
-        consensus.vDeployments[Consensus::DEPLOYMENT_TAPROOT].min_activation_height = 0; // No activation delay
-        consensus.vDeployments[Consensus::DEPLOYMENT_TAPROOT].threshold = 1512; // 75%
-        consensus.vDeployments[Consensus::DEPLOYMENT_TAPROOT].period = 2016;
-
         consensus.nMinimumChainWork = uint256{"0000000000000000000000000000000000000000000017dde1c649f3708d14b6"};
         consensus.defaultAssumeValid = uint256{"000000007a61e4230b28ac5cb6b5e5a0130de37ac1faf2f8987d2fa6505b67f4"}; // 4842348
 
@@ -345,14 +329,6 @@ class CTestNet4Params : public CChainParams {
         consensus.vDeployments[Consensus::DEPLOYMENT_TESTDUMMY].threshold = 1512; // 75%
         consensus.vDeployments[Consensus::DEPLOYMENT_TESTDUMMY].period = 2016;
 
-        // Deployment of Taproot (BIPs 340-342)
-        consensus.vDeployments[Consensus::DEPLOYMENT_TAPROOT].bit = 2;
-        consensus.vDeployments[Consensus::DEPLOYMENT_TAPROOT].nStartTime = Consensus::BIP9Deployment::ALWAYS_ACTIVE;
-        consensus.vDeployments[Consensus::DEPLOYMENT_TAPROOT].nTimeout = Consensus::BIP9Deployment::NO_TIMEOUT;
-        consensus.vDeployments[Consensus::DEPLOYMENT_TAPROOT].min_activation_height = 0; // No activation delay
-        consensus.vDeployments[Consensus::DEPLOYMENT_TAPROOT].threshold = 1512; // 75%
-        consensus.vDeployments[Consensus::DEPLOYMENT_TAPROOT].period = 2016;
-
         consensus.nMinimumChainWork = uint256{"0000000000000000000000000000000000000000000009a0fe15d0177d086304"};
         consensus.defaultAssumeValid = uint256{"0000000002368b1e4ee27e2e85676ae6f9f9e69579b29093e9a82c170bf7cf8a"}; // 123613
 
@@ -496,14 +472,6 @@ class SigNetParams : public CChainParams {
         consensus.vDeployments[Consensus::DEPLOYMENT_TESTDUMMY].threshold = 1815; // 90%
         consensus.vDeployments[Consensus::DEPLOYMENT_TESTDUMMY].period = 2016;
 
-        // Activation of Taproot (BIPs 340-342)
-        consensus.vDeployments[Consensus::DEPLOYMENT_TAPROOT].bit = 2;
-        consensus.vDeployments[Consensus::DEPLOYMENT_TAPROOT].nStartTime = Consensus::BIP9Deployment::ALWAYS_ACTIVE;
-        consensus.vDeployments[Consensus::DEPLOYMENT_TAPROOT].nTimeout = Consensus::BIP9Deployment::NO_TIMEOUT;
-        consensus.vDeployments[Consensus::DEPLOYMENT_TAPROOT].min_activation_height = 0; // No activation delay
-        consensus.vDeployments[Consensus::DEPLOYMENT_TAPROOT].threshold = 1815; // 90%
-        consensus.vDeployments[Consensus::DEPLOYMENT_TAPROOT].period = 2016;
-
         // message start is defined as the first 4 bytes of the sha256d of the block script
         HashWriter h{};
         h << consensus.signet_challenge;
@@ -586,13 +554,6 @@ class CRegTestParams : public CChainParams
         consensus.vDeployments[Consensus::DEPLOYMENT_TESTDUMMY].threshold = 108; // 75%
         consensus.vDeployments[Consensus::DEPLOYMENT_TESTDUMMY].period = 144; // Faster than normal for regtest (144 instead of 2016)
 
-        consensus.vDeployments[Consensus::DEPLOYMENT_TAPROOT].bit = 2;
-        consensus.vDeployments[Consensus::DEPLOYMENT_TAPROOT].nStartTime = Consensus::BIP9Deployment::ALWAYS_ACTIVE;
-        consensus.vDeployments[Consensus::DEPLOYMENT_TAPROOT].nTimeout = Consensus::BIP9Deployment::NO_TIMEOUT;
-        consensus.vDeployments[Consensus::DEPLOYMENT_TAPROOT].min_activation_height = 0; // No activation delay
-        consensus.vDeployments[Consensus::DEPLOYMENT_TAPROOT].threshold = 108; // 75%
-        consensus.vDeployments[Consensus::DEPLOYMENT_TAPROOT].period = 144;
-
         consensus.nMinimumChainWork = uint256{};
         consensus.defaultAssumeValid = uint256{};
 
diff --git a/src/kernel/coinstats.cpp b/src/kernel/coinstats.cpp
index d287ec4be6e3..e165d3e212c5 100644
--- a/src/kernel/coinstats.cpp
+++ b/src/kernel/coinstats.cpp
@@ -20,11 +20,10 @@
 #include <util/overflow.h>
 #include <validation.h>
 
+#include <cstddef>
 #include <map>
 #include <memory>
-#include <span>
 #include <utility>
-#include <version>
 
 namespace kernel {
 
@@ -109,9 +108,8 @@ static void ApplyStats(CCoinsStats& stats, const std::map<uint32_t, Coin>& outpu
 
 //! Calculate statistics about the unspent transaction output set
 template <typename T>
-static bool ComputeUTXOStats(CCoinsView* view, CCoinsStats& stats, T hash_obj, const std::function<void()>& interruption_point)
+static bool ComputeUTXOStats(CCoinsView* view, CCoinsStats& stats, T hash_obj, const std::function<void()>& interruption_point, std::unique_ptr<CCoinsViewCursor> pcursor)
 {
-    std::unique_ptr<CCoinsViewCursor> pcursor(view->Cursor());
     assert(pcursor);
 
     Txid prevkey;
@@ -149,21 +147,27 @@ static bool ComputeUTXOStats(CCoinsView* view, CCoinsStats& stats, T hash_obj, c
 
 std::optional<CCoinsStats> ComputeUTXOStats(CoinStatsHashType hash_type, CCoinsView* view, node::BlockManager& blockman, const std::function<void()>& interruption_point)
 {
-    CBlockIndex* pindex = WITH_LOCK(::cs_main, return blockman.LookupBlockIndex(view->GetBestBlock()));
+    std::unique_ptr<CCoinsViewCursor> pcursor;
+    CBlockIndex* pindex;
+    {
+        LOCK(::cs_main);
+        pcursor = view->Cursor();
+        pindex = blockman.LookupBlockIndex(pcursor->GetBestBlock());
+    }
     CCoinsStats stats{Assert(pindex)->nHeight, pindex->GetBlockHash()};
 
     bool success = [&]() -> bool {
         switch (hash_type) {
         case(CoinStatsHashType::HASH_SERIALIZED): {
             HashWriter ss{};
-            return ComputeUTXOStats(view, stats, ss, interruption_point);
+            return ComputeUTXOStats(view, stats, ss, interruption_point, std::move(pcursor));
         }
         case(CoinStatsHashType::MUHASH): {
             MuHash3072 muhash;
-            return ComputeUTXOStats(view, stats, muhash, interruption_point);
+            return ComputeUTXOStats(view, stats, muhash, interruption_point, std::move(pcursor));
         }
         case(CoinStatsHashType::NONE): {
-            return ComputeUTXOStats(view, stats, nullptr, interruption_point);
+            return ComputeUTXOStats(view, stats, nullptr, interruption_point, std::move(pcursor));
         }
         } // no default case, so the compiler can warn about missing cases
         assert(false);
diff --git a/src/kernel/mempool_entry.h b/src/kernel/mempool_entry.h
index dd0c23a2cdec..29ca1fd0e280 100644
--- a/src/kernel/mempool_entry.h
+++ b/src/kernel/mempool_entry.h
@@ -13,8 +13,8 @@
 #include <primitives/transaction.h>
 #include <txgraph.h>
 #include <util/overflow.h>
+#include <util/time.h>
 
-#include <chrono>
 #include <cstddef>
 #include <cstdint>
 #include <functional>
diff --git a/src/kernel/mempool_options.h b/src/kernel/mempool_options.h
index a18d565c65c9..392c837fbbf9 100644
--- a/src/kernel/mempool_options.h
+++ b/src/kernel/mempool_options.h
@@ -8,8 +8,8 @@
 
 #include <policy/feerate.h>
 #include <policy/policy.h>
+#include <util/time.h>
 
-#include <chrono>
 #include <cstdint>
 #include <optional>
 
diff --git a/src/key_io.cpp b/src/key_io.cpp
index 3726d22233f6..94964bdd8d5b 100644
--- a/src/key_io.cpp
+++ b/src/key_io.cpp
@@ -9,6 +9,7 @@
 #include <script/interpreter.h>
 #include <script/solver.h>
 #include <tinyformat.h>
+#include <util/overflow.h>
 #include <util/strencodings.h>
 
 #include <algorithm>
@@ -72,7 +73,7 @@ class DestinationEncoder
             return {};
         }
         std::vector<unsigned char> data = {(unsigned char)id.GetWitnessVersion()};
-        data.reserve(1 + (program.size() * 8 + 4) / 5);
+        data.reserve(1 + CeilDiv(program.size() * 8, 5u));
         ConvertBits<8, 5, true>([&](unsigned char c) { data.push_back(c); }, program.begin(), program.end());
         return bech32::Encode(bech32::Encoding::BECH32M, m_params.Bech32HRP(), data);
     }
diff --git a/src/logging.cpp b/src/logging.cpp
index df6946d6611c..3a9d84f539c4 100644
--- a/src/logging.cpp
+++ b/src/logging.cpp
@@ -53,7 +53,7 @@ static int FileWriteStr(std::string_view str, FILE *fp)
 
 bool BCLog::Logger::StartLogging()
 {
-    StdLockGuard scoped_lock(m_cs);
+    STDLOCK(m_cs);
 
     assert(m_buffering);
     assert(m_fileout == nullptr);
@@ -97,7 +97,7 @@ bool BCLog::Logger::StartLogging()
 
 void BCLog::Logger::DisconnectTestLogger()
 {
-    StdLockGuard scoped_lock(m_cs);
+    STDLOCK(m_cs);
     m_buffering = true;
     if (m_fileout != nullptr) fclose(m_fileout);
     m_fileout = nullptr;
@@ -111,7 +111,7 @@ void BCLog::Logger::DisconnectTestLogger()
 void BCLog::Logger::DisableLogging()
 {
     {
-        StdLockGuard scoped_lock(m_cs);
+        STDLOCK(m_cs);
         assert(m_buffering);
         assert(m_print_callbacks.empty());
     }
@@ -127,10 +127,11 @@ void BCLog::Logger::EnableCategory(BCLog::LogFlags flag)
 
 bool BCLog::Logger::EnableCategory(std::string_view str)
 {
-    BCLog::LogFlags flag;
-    if (!GetLogCategory(flag, str)) return false;
-    EnableCategory(flag);
-    return true;
+    if (const auto flag{GetLogCategory(str)}) {
+        EnableCategory(*flag);
+        return true;
+    }
+    return false;
 }
 
 void BCLog::Logger::DisableCategory(BCLog::LogFlags flag)
@@ -140,10 +141,11 @@ void BCLog::Logger::DisableCategory(BCLog::LogFlags flag)
 
 bool BCLog::Logger::DisableCategory(std::string_view str)
 {
-    BCLog::LogFlags flag;
-    if (!GetLogCategory(flag, str)) return false;
-    DisableCategory(flag);
-    return true;
+    if (const auto flag{GetLogCategory(str)}) {
+        DisableCategory(*flag);
+        return true;
+    }
+    return false;
 }
 
 bool BCLog::Logger::WillLogCategory(BCLog::LogFlags category) const
@@ -159,7 +161,7 @@ bool BCLog::Logger::WillLogCategoryLevel(BCLog::LogFlags category, BCLog::Level
 
     if (!WillLogCategory(category)) return false;
 
-    StdLockGuard scoped_lock(m_cs);
+    STDLOCK(m_cs);
     const auto it{m_category_log_levels.find(category)};
     return level >= (it == m_category_log_levels.end() ? LogLevel() : it->second);
 }
@@ -217,18 +219,16 @@ static const std::unordered_map<BCLog::LogFlags, std::string> LOG_CATEGORIES_BY_
     }(LOG_CATEGORIES_BY_STR)
 };
 
-bool GetLogCategory(BCLog::LogFlags& flag, std::string_view str)
+std::optional<BCLog::LogFlags> GetLogCategory(std::string_view str)
 {
     if (str.empty() || str == "1" || str == "all") {
-        flag = BCLog::ALL;
-        return true;
+        return BCLog::ALL;
     }
     auto it = LOG_CATEGORIES_BY_STR.find(str);
     if (it != LOG_CATEGORIES_BY_STR.end()) {
-        flag = it->second;
-        return true;
+        return it->second;
     }
-    return false;
+    return std::nullopt;
 }
 
 std::string BCLog::Logger::LogLevelToStr(BCLog::Level level)
@@ -392,7 +392,7 @@ BCLog::LogRateLimiter::Status BCLog::LogRateLimiter::Consume(
     const SourceLocation& source_loc,
     const std::string& str)
 {
-    StdLockGuard scoped_lock(m_mutex);
+    STDLOCK(m_mutex);
     auto& stats{m_source_locations.try_emplace(source_loc, m_max_bytes).first->second};
     Status status{stats.m_dropped_bytes > 0 ? Status::STILL_SUPPRESSED : Status::UNSUPPRESSED};
 
@@ -423,7 +423,7 @@ void BCLog::Logger::FormatLogStrInPlace(std::string& str, BCLog::LogFlags catego
 
 void BCLog::Logger::LogPrintStr(std::string_view str, SourceLocation&& source_loc, BCLog::LogFlags category, BCLog::Level level, bool should_ratelimit)
 {
-    StdLockGuard scoped_lock(m_cs);
+    STDLOCK(m_cs);
     return LogPrintStr_(str, std::move(source_loc), category, level, should_ratelimit);
 }
 
@@ -556,7 +556,7 @@ void BCLog::LogRateLimiter::Reset()
 {
     decltype(m_source_locations) source_locations;
     {
-        StdLockGuard scoped_lock(m_mutex);
+        STDLOCK(m_mutex);
         source_locations.swap(m_source_locations);
         m_suppression_active = false;
     }
@@ -592,14 +592,14 @@ bool BCLog::Logger::SetLogLevel(std::string_view level_str)
 
 bool BCLog::Logger::SetCategoryLogLevel(std::string_view category_str, std::string_view level_str)
 {
-    BCLog::LogFlags flag;
-    if (!GetLogCategory(flag, category_str)) return false;
+    const auto flag{GetLogCategory(category_str)};
+    if (!flag) return false;
 
     const auto level = GetLogLevel(level_str);
     if (!level.has_value() || level.value() > MAX_USER_SETABLE_SEVERITY_LEVEL) return false;
 
-    StdLockGuard scoped_lock(m_cs);
-    m_category_log_levels[flag] = level.value();
+    STDLOCK(m_cs);
+    m_category_log_levels[*flag] = level.value();
     return true;
 }
 
diff --git a/src/logging.h b/src/logging.h
index e21495015b63..1f0e8889bb7b 100644
--- a/src/logging.h
+++ b/src/logging.h
@@ -8,9 +8,10 @@
 
 #include <crypto/siphash.h>
 #include <logging/categories.h> // IWYU pragma: export
-#include <threadsafety.h>
+#include <span.h>
 #include <util/fs.h>
 #include <util/log.h> // IWYU pragma: export
+#include <util/stdmutex.h>
 #include <util/string.h>
 #include <util/time.h>
 
@@ -20,6 +21,7 @@
 #include <functional>
 #include <list>
 #include <memory>
+#include <optional>
 #include <string>
 #include <unordered_map>
 #include <vector>
@@ -192,14 +194,14 @@ namespace BCLog {
         /** Returns whether logs will be written to any output */
         bool Enabled() const EXCLUSIVE_LOCKS_REQUIRED(!m_cs)
         {
-            StdLockGuard scoped_lock(m_cs);
+            STDLOCK(m_cs);
             return m_buffering || m_print_to_console || m_print_to_file || !m_print_callbacks.empty();
         }
 
         /** Connect a slot to the print signal and return the connection */
         std::list<std::function<void(const std::string&)>>::iterator PushBackCallback(std::function<void(const std::string&)> fun) EXCLUSIVE_LOCKS_REQUIRED(!m_cs)
         {
-            StdLockGuard scoped_lock(m_cs);
+            STDLOCK(m_cs);
             m_print_callbacks.push_back(std::move(fun));
             return --m_print_callbacks.end();
         }
@@ -207,13 +209,13 @@ namespace BCLog {
         /** Delete a connection */
         void DeleteCallback(std::list<std::function<void(const std::string&)>>::iterator it) EXCLUSIVE_LOCKS_REQUIRED(!m_cs)
         {
-            StdLockGuard scoped_lock(m_cs);
+            STDLOCK(m_cs);
             m_print_callbacks.erase(it);
         }
 
-        size_t NumConnections()
+        size_t NumConnections() EXCLUSIVE_LOCKS_REQUIRED(!m_cs)
         {
-            StdLockGuard scoped_lock(m_cs);
+            STDLOCK(m_cs);
             return m_print_callbacks.size();
         }
 
@@ -224,7 +226,7 @@ namespace BCLog {
 
         void SetRateLimiting(std::shared_ptr<LogRateLimiter> limiter) EXCLUSIVE_LOCKS_REQUIRED(!m_cs)
         {
-            StdLockGuard scoped_lock(m_cs);
+            STDLOCK(m_cs);
             m_limiter = std::move(limiter);
         }
 
@@ -240,17 +242,17 @@ namespace BCLog {
 
         std::unordered_map<LogFlags, Level> CategoryLevels() const EXCLUSIVE_LOCKS_REQUIRED(!m_cs)
         {
-            StdLockGuard scoped_lock(m_cs);
+            STDLOCK(m_cs);
             return m_category_log_levels;
         }
         void SetCategoryLogLevel(const std::unordered_map<LogFlags, Level>& levels) EXCLUSIVE_LOCKS_REQUIRED(!m_cs)
         {
-            StdLockGuard scoped_lock(m_cs);
+            STDLOCK(m_cs);
             m_category_log_levels = levels;
         }
-        void AddCategoryLogLevel(LogFlags category, Level level)
+        void AddCategoryLogLevel(LogFlags category, Level level) EXCLUSIVE_LOCKS_REQUIRED(!m_cs)
         {
-            StdLockGuard scoped_lock(m_cs);
+            STDLOCK(m_cs);
             m_category_log_levels[category] = level;
         }
         bool SetCategoryLogLevel(std::string_view category_str, std::string_view level_str) EXCLUSIVE_LOCKS_REQUIRED(!m_cs);
@@ -296,7 +298,7 @@ static inline bool LogAcceptCategory(BCLog::LogFlags category, BCLog::Level leve
     return LogInstance().WillLogCategoryLevel(category, level);
 }
 
-/** Return true if str parses as a log category and set the flag */
-bool GetLogCategory(BCLog::LogFlags& flag, std::string_view str);
+/// Return log flag if str parses as a log category.
+std::optional<BCLog::LogFlags> GetLogCategory(std::string_view str);
 
 #endif // BITCOIN_LOGGING_H
diff --git a/src/merkleblock.cpp b/src/merkleblock.cpp
index f6c474e018b2..6bb05a5edd31 100644
--- a/src/merkleblock.cpp
+++ b/src/merkleblock.cpp
@@ -5,13 +5,14 @@
 
 #include <merkleblock.h>
 
-#include <hash.h>
 #include <consensus/consensus.h>
+#include <hash.h>
+#include <util/overflow.h>
 
 
 std::vector<unsigned char> BitsToBytes(const std::vector<bool>& bits)
 {
-    std::vector<unsigned char> ret((bits.size() + 7) / 8);
+    std::vector<unsigned char> ret(CeilDiv(bits.size(), 8u));
     for (unsigned int p = 0; p < bits.size(); p++) {
         ret[p / 8] |= bits[p] << (p % 8);
     }
@@ -174,7 +175,7 @@ uint256 CPartialMerkleTree::ExtractMatches(std::vector<Txid> &vMatch, std::vecto
     if (fBad)
         return uint256();
     // verify that all bits were consumed (except for the padding caused by serializing it as a byte sequence)
-    if ((nBitsUsed+7)/8 != (vBits.size()+7)/8)
+    if (CeilDiv(nBitsUsed, 8u) != CeilDiv(vBits.size(), 8u))
         return uint256();
     // verify that all hashes were consumed
     if (nHashUsed != vHash.size())
diff --git a/src/net.cpp b/src/net.cpp
index 4f88aa8aab99..71befd292bde 100644
--- a/src/net.cpp
+++ b/src/net.cpp
@@ -287,7 +287,9 @@ bool AddLocal(const CService& addr_, int nScore)
     if (!g_reachable_nets.Contains(addr))
         return false;
 
-    LogInfo("AddLocal(%s,%i)\n", addr.ToStringAddrPort(), nScore);
+    if (fLogIPs) {
+        LogInfo("AddLocal(%s,%i)\n", addr.ToStringAddrPort(), nScore);
+    }
 
     {
         LOCK(g_maplocalhost_mutex);
@@ -310,7 +312,10 @@ bool AddLocal(const CNetAddr &addr, int nScore)
 void RemoveLocal(const CService& addr)
 {
     LOCK(g_maplocalhost_mutex);
-    LogInfo("RemoveLocal(%s)\n", addr.ToStringAddrPort());
+    if (fLogIPs) {
+        LogInfo("RemoveLocal(%s)\n", addr.ToStringAddrPort());
+    }
+
     mapLocalHost.erase(addr);
 }
 
@@ -434,20 +439,15 @@ CNode* CConnman::ConnectNode(CAddress addrConnect,
 
     // Connect
     std::unique_ptr<Sock> sock;
-    Proxy proxy;
     CService addr_bind;
     assert(!addr_bind.IsValid());
     std::unique_ptr<i2p::sam::Session> i2p_transient_session;
 
-    for (auto& target_addr: connect_to) {
+    for (auto& target_addr : connect_to) {
         if (target_addr.IsValid()) {
-            bool use_proxy;
-            if (proxy_override.has_value()) {
-                use_proxy = true;
-                proxy = proxy_override.value();
-            } else {
-                use_proxy = GetProxy(target_addr.GetNetwork(), proxy);
-            }
+            const std::optional<Proxy> use_proxy{
+                proxy_override.has_value() ? proxy_override : GetProxy(target_addr.GetNetwork()),
+            };
             bool proxyConnectionFailed = false;
 
             if (target_addr.IsI2P() && use_proxy) {
@@ -464,7 +464,7 @@ CNode* CConnman::ConnectNode(CAddress addrConnect,
                         LOCK(m_unused_i2p_sessions_mutex);
                         if (m_unused_i2p_sessions.empty()) {
                             i2p_transient_session =
-                                std::make_unique<i2p::sam::Session>(proxy, m_interrupt_net);
+                                std::make_unique<i2p::sam::Session>(*use_proxy, m_interrupt_net);
                         } else {
                             i2p_transient_session.swap(m_unused_i2p_sessions.front());
                             m_unused_i2p_sessions.pop();
@@ -484,8 +484,8 @@ CNode* CConnman::ConnectNode(CAddress addrConnect,
                     addr_bind = conn.me;
                 }
             } else if (use_proxy) {
-                LogDebug(BCLog::PROXY, "Using proxy: %s to connect to %s\n", proxy.ToString(), target_addr.ToStringAddrPort());
-                sock = ConnectThroughProxy(proxy, target_addr.ToStringAddr(), target_addr.GetPort(), proxyConnectionFailed);
+                LogDebug(BCLog::PROXY, "Using proxy: %s to connect to %s\n", use_proxy->ToString(), target_addr.ToStringAddrPort());
+                sock = ConnectThroughProxy(*use_proxy, target_addr.ToStringAddr(), target_addr.GetPort(), proxyConnectionFailed);
             } else {
                 // no proxy needed (none set for target network)
                 sock = ConnectDirectly(target_addr, conn_type == ConnectionType::MANUAL);
@@ -495,12 +495,14 @@ CNode* CConnman::ConnectNode(CAddress addrConnect,
                 // the proxy, mark this as an attempt.
                 addrman.get().Attempt(target_addr, fCountFailure);
             }
-        } else if (pszDest && GetNameProxy(proxy)) {
-            std::string host;
-            uint16_t port{default_port};
-            SplitHostPort(std::string(pszDest), port, host);
-            bool proxyConnectionFailed;
-            sock = ConnectThroughProxy(proxy, host, port, proxyConnectionFailed);
+        } else if (pszDest) {
+            if (const auto name_proxy = GetNameProxy()) {
+                std::string host;
+                uint16_t port{default_port};
+                SplitHostPort(pszDest, port, host);
+                bool proxyConnectionFailed;
+                sock = ConnectThroughProxy(*name_proxy, host, port, proxyConnectionFailed);
+            }
         }
         // Check any other resolved address (if any) if we fail to connect
         if (!sock) {
@@ -556,7 +558,7 @@ void CNode::CloseSocketDisconnect()
     fDisconnect = true;
     LOCK(m_sock_mutex);
     if (m_sock) {
-        LogDebug(BCLog::NET, "Resetting socket for peer=%d%s", GetId(), LogIP(fLogIPs));
+        LogDebug(BCLog::NET, "Resetting socket for %s", LogPeer());
         m_sock.reset();
 
         TRACEPOINT(net, closed_connection,
@@ -701,16 +703,19 @@ bool CNode::ReceiveMsgBytes(std::span<const uint8_t> msg_bytes, bool& complete)
     return true;
 }
 
-std::string CNode::LogIP(bool log_ip) const
+std::string CNode::LogPeer() const
 {
-    return log_ip ? strprintf(" peeraddr=%s", addr.ToStringAddrPort()) : "";
+    auto peer_info{strprintf("peer=%d", GetId())};
+    if (fLogIPs) {
+        return strprintf("%s, peeraddr=%s", peer_info, addr.ToStringAddrPort());
+    } else {
+        return peer_info;
+    }
 }
 
-std::string CNode::DisconnectMsg(bool log_ip) const
+std::string CNode::DisconnectMsg() const
 {
-    return strprintf("disconnecting peer=%d%s",
-                     GetId(),
-                     LogIP(log_ip));
+    return strprintf("disconnecting %s", LogPeer());
 }
 
 V1Transport::V1Transport(const NodeId node_id) noexcept
@@ -1656,7 +1661,7 @@ std::pair<size_t, bool> CConnman::SocketSendData(CNode& node) const
                 // error
                 int nErr = WSAGetLastError();
                 if (nErr != WSAEWOULDBLOCK && nErr != WSAEMSGSIZE && nErr != WSAEINTR && nErr != WSAEINPROGRESS) {
-                    LogDebug(BCLog::NET, "socket send error, %s: %s\n", node.DisconnectMsg(fLogIPs), NetworkErrorString(nErr));
+                    LogDebug(BCLog::NET, "socket send error, %s: %s", node.DisconnectMsg(), NetworkErrorString(nErr));
                     node.CloseSocketDisconnect();
                 }
             }
@@ -1716,7 +1721,7 @@ bool CConnman::AttemptToEvictConnection()
     LOCK(m_nodes_mutex);
     for (CNode* pnode : m_nodes) {
         if (pnode->GetId() == *node_id_to_evict) {
-            LogDebug(BCLog::NET, "selected %s connection for eviction, %s", pnode->ConnectionTypeAsString(), pnode->DisconnectMsg(fLogIPs));
+            LogDebug(BCLog::NET, "selected %s connection for eviction, %s", pnode->ConnectionTypeAsString(), pnode->DisconnectMsg());
             TRACEPOINT(net, evicted_inbound_connection,
                 pnode->GetId(),
                 pnode->m_addr_name.c_str(),
@@ -1923,7 +1928,7 @@ void CConnman::DisconnectNodes()
             // Disconnect any connected nodes
             for (CNode* pnode : m_nodes) {
                 if (!pnode->fDisconnect) {
-                    LogDebug(BCLog::NET, "Network not active, %s\n", pnode->DisconnectMsg(fLogIPs));
+                    LogDebug(BCLog::NET, "Network not active, %s", pnode->DisconnectMsg());
                     pnode->fDisconnect = true;
                 }
             }
@@ -2022,35 +2027,35 @@ bool CConnman::InactivityCheck(const CNode& node, std::chrono::microseconds now)
         if (!has_received) has_never += ", never received from peer";
         if (!has_sent) has_never += ", never sent to peer";
         LogDebug(BCLog::NET,
-            "socket no message in first %i seconds%s, %s\n",
+            "socket no message in first %i seconds%s, %s",
             count_seconds(m_peer_connect_timeout),
             has_never,
-            node.DisconnectMsg(fLogIPs)
+            node.DisconnectMsg()
         );
         return true;
     }
 
     if (now > last_send + TIMEOUT_INTERVAL) {
         LogDebug(BCLog::NET,
-            "socket sending timeout: %is, %s\n", Ticks<std::chrono::seconds>(now - last_send),
-            node.DisconnectMsg(fLogIPs)
+            "socket sending timeout: %is, %s", Ticks<std::chrono::seconds>(now - last_send),
+            node.DisconnectMsg()
         );
         return true;
     }
 
     if (now > last_recv + TIMEOUT_INTERVAL) {
         LogDebug(BCLog::NET,
-            "socket receive timeout: %is, %s\n", Ticks<std::chrono::seconds>(now - last_recv),
-            node.DisconnectMsg(fLogIPs)
+            "socket receive timeout: %is, %s", Ticks<std::chrono::seconds>(now - last_recv),
+            node.DisconnectMsg()
         );
         return true;
     }
 
     if (!node.fSuccessfullyConnected) {
         if (node.m_transport->GetInfo().transport_type == TransportProtocolType::DETECTING) {
-            LogDebug(BCLog::NET, "V2 handshake timeout, %s\n", node.DisconnectMsg(fLogIPs));
+            LogDebug(BCLog::NET, "V2 handshake timeout, %s", node.DisconnectMsg());
         } else {
-            LogDebug(BCLog::NET, "version handshake timeout, %s\n", node.DisconnectMsg(fLogIPs));
+            LogDebug(BCLog::NET, "version handshake timeout, %s", node.DisconnectMsg());
         }
         return true;
     }
@@ -2182,8 +2187,8 @@ void CConnman::SocketHandlerConnected(const std::vector<CNode*>& nodes,
                 bool notify = false;
                 if (!pnode->ReceiveMsgBytes({pchBuf, (size_t)nBytes}, notify)) {
                     LogDebug(BCLog::NET,
-                        "receiving message bytes failed, %s\n",
-                        pnode->DisconnectMsg(fLogIPs)
+                        "receiving message bytes failed, %s",
+                        pnode->DisconnectMsg()
                     );
                     pnode->CloseSocketDisconnect();
                 }
@@ -2197,7 +2202,7 @@ void CConnman::SocketHandlerConnected(const std::vector<CNode*>& nodes,
             {
                 // socket closed gracefully
                 if (!pnode->fDisconnect) {
-                    LogDebug(BCLog::NET, "socket closed, %s\n", pnode->DisconnectMsg(fLogIPs));
+                    LogDebug(BCLog::NET, "socket closed, %s", pnode->DisconnectMsg());
                 }
                 pnode->CloseSocketDisconnect();
             }
@@ -2208,7 +2213,7 @@ void CConnman::SocketHandlerConnected(const std::vector<CNode*>& nodes,
                 if (nErr != WSAEWOULDBLOCK && nErr != WSAEMSGSIZE && nErr != WSAEINTR && nErr != WSAEINPROGRESS)
                 {
                     if (!pnode->fDisconnect) {
-                        LogDebug(BCLog::NET, "socket recv error, %s: %s\n", pnode->DisconnectMsg(fLogIPs), NetworkErrorString(nErr));
+                        LogDebug(BCLog::NET, "socket recv error, %s: %s", pnode->DisconnectMsg(), NetworkErrorString(nErr));
                     }
                     pnode->CloseSocketDisconnect();
                 }
@@ -2398,7 +2403,7 @@ void CConnman::DumpAddresses()
 
     DumpPeerAddresses(::gArgs, addrman);
 
-    LogDebug(BCLog::NET, "Flushed %d addresses to peers.dat  %dms\n",
+    LogDebug(BCLog::NET, "Flushed %d addresses to peers.dat %dms",
              addrman.get().Size(), Ticks<std::chrono::milliseconds>(SteadyClock::now() - start));
 }
 
@@ -3112,9 +3117,10 @@ void CConnman::PrivateBroadcast::NumToOpenWait() const
 
 std::optional<Proxy> CConnman::PrivateBroadcast::ProxyForIPv4or6() const
 {
-    Proxy tor_proxy;
-    if (m_outbound_tor_ok_at_least_once.load() && GetProxy(NET_ONION, tor_proxy)) {
-        return tor_proxy;
+    if (m_outbound_tor_ok_at_least_once.load()) {
+        if (const auto tor_proxy = GetProxy(NET_ONION)) {
+            return tor_proxy;
+        }
     }
     return std::nullopt;
 }
@@ -3346,8 +3352,9 @@ void Discover()
         return;
 
     for (const CNetAddr &addr: GetLocalAddresses()) {
-        if (AddLocal(addr, LOCAL_IF))
+        if (AddLocal(addr, LOCAL_IF) && fLogIPs) {
             LogInfo("%s: %s\n", __func__, addr.ToStringAddr());
+        }
     }
 }
 
@@ -3470,10 +3477,11 @@ bool CConnman::Start(CScheduler& scheduler, const Options& connOptions)
         return false;
     }
 
-    Proxy i2p_sam;
-    if (GetProxy(NET_I2P, i2p_sam) && connOptions.m_i2p_accept_incoming) {
-        m_i2p_sam_session = std::make_unique<i2p::sam::Session>(gArgs.GetDataDirNet() / "i2p_private_key",
-                                                                i2p_sam, m_interrupt_net);
+    if (connOptions.m_i2p_accept_incoming) {
+        if (const auto i2p_sam = GetProxy(NET_I2P)) {
+            m_i2p_sam_session = std::make_unique<i2p::sam::Session>(gArgs.GetDataDirNet() / "i2p_private_key",
+                                                                    *i2p_sam, m_interrupt_net);
+        }
     }
 
     // Randomize the order in which we may query seednode to potentially prevent connecting to the same one every restart (and signal that we have restarted)
@@ -3652,7 +3660,7 @@ void CConnman::StopNodes()
     std::vector<CNode*> nodes;
     WITH_LOCK(m_nodes_mutex, nodes.swap(m_nodes));
     for (CNode* pnode : nodes) {
-        LogDebug(BCLog::NET, "Stopping node, %s", pnode->DisconnectMsg(fLogIPs));
+        LogDebug(BCLog::NET, "Stopping node, %s", pnode->DisconnectMsg());
         pnode->CloseSocketDisconnect();
         DeleteNode(pnode);
     }
@@ -3812,7 +3820,7 @@ bool CConnman::DisconnectNode(std::string_view strNode)
     auto it = std::ranges::find_if(m_nodes, [&strNode](CNode* node) { return node->m_addr_name == strNode; });
     if (it != m_nodes.end()) {
         CNode* node{*it};
-        LogDebug(BCLog::NET, "disconnect by address%s match, %s", (fLogIPs ? strprintf("=%s", strNode) : ""), node->DisconnectMsg(fLogIPs));
+        LogDebug(BCLog::NET, "disconnect by address%s match, %s", (fLogIPs ? strprintf("=%s", strNode) : ""), node->DisconnectMsg());
         node->fDisconnect = true;
         return true;
     }
@@ -3825,7 +3833,7 @@ bool CConnman::DisconnectNode(const CSubNet& subnet)
     LOCK(m_nodes_mutex);
     for (CNode* pnode : m_nodes) {
         if (subnet.Match(pnode->addr)) {
-            LogDebug(BCLog::NET, "disconnect by subnet%s match, %s", (fLogIPs ? strprintf("=%s", subnet.ToString()) : ""), pnode->DisconnectMsg(fLogIPs));
+            LogDebug(BCLog::NET, "disconnect by subnet%s match, %s", (fLogIPs ? strprintf("=%s", subnet.ToString()) : ""), pnode->DisconnectMsg());
             pnode->fDisconnect = true;
             disconnected = true;
         }
@@ -3843,7 +3851,7 @@ bool CConnman::DisconnectNode(NodeId id)
     LOCK(m_nodes_mutex);
     for(CNode* pnode : m_nodes) {
         if (id == pnode->GetId()) {
-            LogDebug(BCLog::NET, "disconnect by id, %s", pnode->DisconnectMsg(fLogIPs));
+            LogDebug(BCLog::NET, "disconnect by id, %s", pnode->DisconnectMsg());
             pnode->fDisconnect = true;
             return true;
         }
@@ -4060,7 +4068,7 @@ void CConnman::PushMessage(CNode* pnode, CSerializedNetMsg&& msg)
     AssertLockNotHeld(m_total_bytes_sent_mutex);
 
     if (pnode->IsPrivateBroadcastConn() && !IsOutboundMessageAllowedInPrivateBroadcast(msg.m_type)) {
-        LogDebug(BCLog::PRIVBROADCAST, "Omitting send of message '%s', peer=%d%s", msg.m_type, pnode->GetId(), pnode->LogIP(fLogIPs));
+        LogDebug(BCLog::PRIVBROADCAST, "Omitting send of message '%s', %s", msg.m_type, pnode->LogPeer());
         return;
     }
 
diff --git a/src/net.h b/src/net.h
index b209df61436a..d923e7b28fef 100644
--- a/src/net.h
+++ b/src/net.h
@@ -205,7 +205,6 @@ class CNodeStats
     bool m_bip152_highbandwidth_to;
     // Peer requested high bandwidth connection
     bool m_bip152_highbandwidth_from;
-    int m_starting_height;
     uint64_t nSendBytes;
     mapMsgTypeSize mapSendBytesPerMsgType;
     uint64_t nRecvBytes;
@@ -968,20 +967,18 @@ class CNode
     std::string ConnectionTypeAsString() const { return ::ConnectionTypeAsString(m_conn_type); }
 
     /**
-     * Helper function to optionally log the IP address.
+     * Helper function to log the peer id, optionally including IP address.
      *
-     * @param[in] log_ip whether to include the IP address
-     * @return " peeraddr=..." or ""
+     * @return "peer=..." and optionally ", peeraddr=..."
      */
-    std::string LogIP(bool log_ip) const;
+    std::string LogPeer() const;
 
     /**
      * Helper function to log disconnects.
      *
-     * @param[in] log_ip whether to include the IP address
-     * @return "disconnecting peer=..." and optionally "peeraddr=..."
+     * @return "disconnecting peer=..." and optionally ", peeraddr=..."
      */
-    std::string DisconnectMsg(bool log_ip) const;
+    std::string DisconnectMsg() const;
 
     /** A ping-pong round trip has completed successfully. Update latest and minimum ping times. */
     void PongReceived(std::chrono::microseconds ping_time) {
diff --git a/src/net_processing.cpp b/src/net_processing.cpp
index 4450ff23f55e..c7061d523486 100644
--- a/src/net_processing.cpp
+++ b/src/net_processing.cpp
@@ -272,10 +272,6 @@ struct Peer {
     /** Set to true once initial VERSION message was sent (only relevant for outbound peers). */
     bool m_outbound_version_message_sent GUARDED_BY(NetEventsInterface::g_msgproc_mutex){false};
 
-    /** This peer's reported block height when we connected */
-    // TODO: remove in v32.0, only show reported height once in "receive version message: ..." debug log
-    std::atomic<int> m_starting_height{-1};
-
     /** The pong reply we're expecting, or 0 if no pong expected. */
     std::atomic<uint64_t> m_ping_nonce_sent{0};
     /** When the last ping was sent, or 0 if no ping was ever sent */
@@ -383,7 +379,7 @@ struct Peer {
      *  permit self-announcement. */
     double m_addr_token_bucket GUARDED_BY(NetEventsInterface::g_msgproc_mutex){1.0};
     /** When m_addr_token_bucket was last updated */
-    std::chrono::microseconds m_addr_token_timestamp GUARDED_BY(NetEventsInterface::g_msgproc_mutex){GetTime<std::chrono::microseconds>()};
+    NodeClock::time_point m_addr_token_timestamp GUARDED_BY(NetEventsInterface::g_msgproc_mutex){NodeClock::now()};
     /** Total number of addresses that were dropped due to rate limiting. */
     std::atomic<uint64_t> m_addr_rate_limited{0};
     /** Total number of addresses that were processed (excludes rate-limited ones). */
@@ -1087,6 +1083,9 @@ class PeerManagerImpl final : public PeerManager
      */
     bool SetupAddressRelay(const CNode& node, Peer& peer) EXCLUSIVE_LOCKS_REQUIRED(g_msgproc_mutex);
 
+    void ProcessAddrs(std::string_view msg_type, CNode& pfrom, Peer& peer, std::vector<CAddress>&& vAddr, const std::atomic<bool>& interruptMsgProc)
+        EXCLUSIVE_LOCKS_REQUIRED(g_msgproc_mutex, !m_peer_mutex);
+
     void AddAddressKnown(Peer& peer, const CAddress& addr) EXCLUSIVE_LOCKS_REQUIRED(g_msgproc_mutex);
     void PushAddress(Peer& peer, const CAddress& addr) EXCLUSIVE_LOCKS_REQUIRED(g_msgproc_mutex);
 
@@ -1804,7 +1803,6 @@ bool PeerManagerImpl::GetNodeStateStats(NodeId nodeid, CNodeStateStats& stats) c
     PeerRef peer = GetPeerRef(nodeid);
     if (peer == nullptr) return false;
     stats.their_services = peer->m_their_services;
-    stats.m_starting_height = peer->m_starting_height;
     // It is common for nodes with good ping times to suddenly become lagged,
     // due to a new block arriving or other large transfer.
     // Merely reporting pingtime might fool the caller into thinking the node was still responsive,
@@ -1868,7 +1866,8 @@ std::vector<CTransactionRef> PeerManagerImpl::AbortPrivateBroadcast(const uint25
     std::vector<CTransactionRef> removed_txs;
 
     size_t connections_cancelled{0};
-    for (const auto& [tx, _] : snapshot) {
+    for (const auto& tx_info : snapshot) {
+        const CTransactionRef& tx{tx_info.tx};
         if (tx->GetHash().ToUint256() != id && tx->GetWitnessHash().ToUint256() != id) continue;
         if (const auto peer_acks{m_tx_for_private_broadcast.Remove(tx)}) {
             removed_txs.push_back(tx);
@@ -2377,7 +2376,7 @@ void PeerManagerImpl::ProcessGetBlockData(CNode& pfrom, Peer& peer, const CInv&
             (((m_chainman.m_best_header != nullptr) && (m_chainman.m_best_header->GetBlockTime() - pindex->GetBlockTime() > HISTORICAL_BLOCK_AGE)) || inv.IsMsgFilteredBlk()) &&
             !pfrom.HasPermission(NetPermissionFlags::Download) // nodes with the download permission may exceed target
         ) {
-            LogDebug(BCLog::NET, "historical block serving limit reached, %s\n", pfrom.DisconnectMsg(fLogIPs));
+            LogDebug(BCLog::NET, "historical block serving limit reached, %s", pfrom.DisconnectMsg());
             pfrom.fDisconnect = true;
             return;
         }
@@ -2386,7 +2385,7 @@ void PeerManagerImpl::ProcessGetBlockData(CNode& pfrom, Peer& peer, const CInv&
         if (!pfrom.HasPermission(NetPermissionFlags::NoBan) && (
                 (((peer.m_our_services & NODE_NETWORK_LIMITED) == NODE_NETWORK_LIMITED) && ((peer.m_our_services & NODE_NETWORK) != NODE_NETWORK) && (tip->nHeight - pindex->nHeight > (int)NODE_NETWORK_LIMITED_MIN_BLOCKS + 2 /* add two blocks buffer extension for possible races */) )
            )) {
-            LogDebug(BCLog::NET, "Ignore block request below NODE_NETWORK_LIMITED threshold, %s\n", pfrom.DisconnectMsg(fLogIPs));
+            LogDebug(BCLog::NET, "Ignore block request below NODE_NETWORK_LIMITED threshold, %s", pfrom.DisconnectMsg());
             //disconnect node and prevent it from stalling (would otherwise wait for the missing block)
             pfrom.fDisconnect = true;
             return;
@@ -2410,9 +2409,9 @@ void PeerManagerImpl::ProcessGetBlockData(CNode& pfrom, Peer& peer, const CInv&
             MakeAndPushMessage(pfrom, NetMsgType::BLOCK, std::span{*block_data});
         } else {
             if (WITH_LOCK(m_chainman.GetMutex(), return m_chainman.m_blockman.IsBlockPruned(*pindex))) {
-                LogDebug(BCLog::NET, "Block was pruned before it could be read, %s\n", pfrom.DisconnectMsg(fLogIPs));
+                LogDebug(BCLog::NET, "Block was pruned before it could be read, %s", pfrom.DisconnectMsg());
             } else {
-                LogError("Cannot load block from disk, %s\n", pfrom.DisconnectMsg(fLogIPs));
+                LogError("Cannot load block from disk, %s", pfrom.DisconnectMsg());
             }
             pfrom.fDisconnect = true;
             return;
@@ -2423,9 +2422,9 @@ void PeerManagerImpl::ProcessGetBlockData(CNode& pfrom, Peer& peer, const CInv&
         std::shared_ptr<CBlock> pblockRead = std::make_shared<CBlock>();
         if (!m_chainman.m_blockman.ReadBlock(*pblockRead, block_pos, inv.hash)) {
             if (WITH_LOCK(m_chainman.GetMutex(), return m_chainman.m_blockman.IsBlockPruned(*pindex))) {
-                LogDebug(BCLog::NET, "Block was pruned before it could be read, %s\n", pfrom.DisconnectMsg(fLogIPs));
+                LogDebug(BCLog::NET, "Block was pruned before it could be read, %s", pfrom.DisconnectMsg());
             } else {
-                LogError("Cannot load block from disk, %s\n", pfrom.DisconnectMsg(fLogIPs));
+                LogError("Cannot load block from disk, %s", pfrom.DisconnectMsg());
             }
             pfrom.fDisconnect = true;
             return;
@@ -2878,8 +2877,8 @@ void PeerManagerImpl::HeadersDirectFetchBlocks(CNode& pfrom, const Peer& peer, c
                 uint32_t nFetchFlags = GetFetchFlags(peer);
                 vGetData.emplace_back(MSG_BLOCK | nFetchFlags, pindex->GetBlockHash());
                 BlockRequested(pfrom.GetId(), *pindex);
-                LogDebug(BCLog::NET, "Requesting block %s from  peer=%d\n",
-                        pindex->GetBlockHash().ToString(), pfrom.GetId());
+                LogDebug(BCLog::NET, "Requesting block %s from peer=%d",
+                         pindex->GetBlockHash().ToString(), pfrom.GetId());
             }
             if (vGetData.size() > 1) {
                 LogDebug(BCLog::NET, "Downloading blocks toward %s (%d) via headers direct fetch\n",
@@ -2937,7 +2936,7 @@ void PeerManagerImpl::UpdatePeerStateForReceivedHeaders(CNode& pfrom, Peer& peer
             // the minimum chain work, even if a peer has a chain past our tip,
             // as an anti-DoS measure.
             if (pfrom.IsOutboundOrBlockRelayConn()) {
-                LogInfo("outbound peer headers chain has insufficient work, %s\n", pfrom.DisconnectMsg(fLogIPs));
+                LogInfo("outbound peer headers chain has insufficient work, %s", pfrom.DisconnectMsg());
                 pfrom.fDisconnect = true;
             }
         }
@@ -3106,8 +3105,7 @@ void PeerManagerImpl::ProcessHeadersMessage(CNode& pfrom, Peer& peer,
     if (nCount == m_opts.max_headers_result && !have_headers_sync) {
         // Headers message had its maximum size; the peer may have more headers.
         if (MaybeSendGetHeaders(pfrom, GetLocator(pindexLast), peer)) {
-            LogDebug(BCLog::NET, "more getheaders (%d) to end to peer=%d (startheight:%d)\n",
-                    pindexLast->nHeight, pfrom.GetId(), peer.m_starting_height);
+            LogDebug(BCLog::NET, "more getheaders (%d) to end to peer=%d", pindexLast->nHeight, pfrom.GetId());
         }
     }
 
@@ -3272,8 +3270,8 @@ bool PeerManagerImpl::PrepareBlockFilterRequest(CNode& node, Peer& peer,
         (filter_type == BlockFilterType::BASIC &&
          (peer.m_our_services & NODE_COMPACT_FILTERS));
     if (!supported_filter_type) {
-        LogDebug(BCLog::NET, "peer requested unsupported block filter type: %d, %s\n",
-                 static_cast<uint8_t>(filter_type), node.DisconnectMsg(fLogIPs));
+        LogDebug(BCLog::NET, "peer requested unsupported block filter type: %d, %s",
+                 static_cast<uint8_t>(filter_type), node.DisconnectMsg());
         node.fDisconnect = true;
         return false;
     }
@@ -3284,8 +3282,8 @@ bool PeerManagerImpl::PrepareBlockFilterRequest(CNode& node, Peer& peer,
 
         // Check that the stop block exists and the peer would be allowed to fetch it.
         if (!stop_index || !BlockRequestAllowed(*stop_index)) {
-            LogDebug(BCLog::NET, "peer requested invalid block hash: %s, %s\n",
-                     stop_hash.ToString(), node.DisconnectMsg(fLogIPs));
+            LogDebug(BCLog::NET, "peer requested invalid block hash: %s, %s",
+                     stop_hash.ToString(), node.DisconnectMsg());
             node.fDisconnect = true;
             return false;
         }
@@ -3294,14 +3292,14 @@ bool PeerManagerImpl::PrepareBlockFilterRequest(CNode& node, Peer& peer,
     uint32_t stop_height = stop_index->nHeight;
     if (start_height > stop_height) {
         LogDebug(BCLog::NET, "peer sent invalid getcfilters/getcfheaders with "
-                 "start height %d and stop height %d, %s\n",
-                 start_height, stop_height, node.DisconnectMsg(fLogIPs));
+                 "start height %d and stop height %d, %s",
+                 start_height, stop_height, node.DisconnectMsg());
         node.fDisconnect = true;
         return false;
     }
     if (stop_height - start_height >= max_height_diff) {
-        LogDebug(BCLog::NET, "peer requested too many cfilters/cfheaders: %d / %d, %s\n",
-                 stop_height - start_height + 1, max_height_diff, node.DisconnectMsg(fLogIPs));
+        LogDebug(BCLog::NET, "peer requested too many cfilters/cfheaders: %d / %d, %s",
+                 stop_height - start_height + 1, max_height_diff, node.DisconnectMsg());
         node.fDisconnect = true;
         return false;
     }
@@ -3540,12 +3538,11 @@ void PeerManagerImpl::LogBlockHeader(const CBlockIndex& index, const CNode& peer
     // Having this log by default when not in IBD ensures broad availability of
     // this data in case investigation is merited.
     const auto msg = strprintf(
-        "Saw new %sheader hash=%s height=%d peer=%d%s",
+        "Saw new %sheader hash=%s height=%d %s",
         via_compact_block ? "cmpctblock " : "",
         index.GetBlockHash().ToString(),
         index.nHeight,
-        peer.GetId(),
-        peer.LogIP(fLogIPs)
+        peer.LogPeer()
     );
     if (m_chainman.IsInitialBlockDownload()) {
         LogDebug(BCLog::VALIDATION, "%s", msg);
@@ -3560,15 +3557,15 @@ void PeerManagerImpl::PushPrivateBroadcastTx(CNode& node)
 
     const auto opt_tx{m_tx_for_private_broadcast.PickTxForSend(node.GetId(), CService{node.addr})};
     if (!opt_tx) {
-        LogDebug(BCLog::PRIVBROADCAST, "Disconnecting: no more transactions for private broadcast (connected in vain), peer=%d%s", node.GetId(), node.LogIP(fLogIPs));
+        LogDebug(BCLog::PRIVBROADCAST, "Disconnecting: no more transactions for private broadcast (connected in vain), %s", node.LogPeer());
         node.fDisconnect = true;
         return;
     }
     const CTransactionRef& tx{*opt_tx};
 
-    LogDebug(BCLog::PRIVBROADCAST, "P2P handshake completed, sending INV for txid=%s%s, peer=%d%s",
+    LogDebug(BCLog::PRIVBROADCAST, "P2P handshake completed, sending INV for txid=%s%s, %s",
              tx->GetHash().ToString(), tx->HasWitness() ? strprintf(", wtxid=%s", tx->GetWitnessHash().ToString()) : "",
-             node.GetId(), node.LogIP(fLogIPs));
+             node.LogPeer());
 
     MakeAndPushMessage(node, NetMsgType::INV, std::vector<CInv>{{CInv{MSG_TX, tx->GetHash().ToUint256()}}});
 }
@@ -3603,7 +3600,7 @@ void PeerManagerImpl::ProcessMessage(Peer& peer, CNode& pfrom, const std::string
         }
         vRecv.ignore(8); // Ignore the addrMe service bits sent by the peer
         vRecv >> CNetAddr::V1(addrMe);
-        if (!pfrom.IsInboundConn())
+        if (!pfrom.IsInboundConn() && !pfrom.IsPrivateBroadcastConn())
         {
             // Overwrites potentially existing services. In contrast to this,
             // unvalidated services received via gossip relay in ADDR/ADDRV2
@@ -3612,17 +3609,17 @@ void PeerManagerImpl::ProcessMessage(Peer& peer, CNode& pfrom, const std::string
         }
         if (pfrom.ExpectServicesFromConn() && !HasAllDesirableServiceFlags(nServices))
         {
-            LogDebug(BCLog::NET, "peer does not offer the expected services (%08x offered, %08x expected), %s\n",
+            LogDebug(BCLog::NET, "peer does not offer the expected services (%08x offered, %08x expected), %s",
                      nServices,
                      GetDesirableServiceFlags(nServices),
-                     pfrom.DisconnectMsg(fLogIPs));
+                     pfrom.DisconnectMsg());
             pfrom.fDisconnect = true;
             return;
         }
 
         if (nVersion < MIN_PEER_PROTO_VERSION) {
             // disconnect from peers older than this proto version
-            LogDebug(BCLog::NET, "peer using obsolete version %i, %s\n", nVersion, pfrom.DisconnectMsg(fLogIPs));
+            LogDebug(BCLog::NET, "peer using obsolete version %i, %s", nVersion, pfrom.DisconnectMsg());
             pfrom.fDisconnect = true;
             return;
         }
@@ -3676,7 +3673,6 @@ void PeerManagerImpl::ProcessMessage(Peer& peer, CNode& pfrom, const std::string
             LOCK(pfrom.m_subver_mutex);
             pfrom.cleanSubVer = cleanSubVer;
         }
-        peer.m_starting_height = starting_height;
 
         // Only initialize the Peer::TxRelay m_relay_txs data structure if:
         // - this isn't an outbound block-relay-only connection, and
@@ -3696,17 +3692,17 @@ void PeerManagerImpl::ProcessMessage(Peer& peer, CNode& pfrom, const std::string
         }
 
         const auto mapped_as{m_connman.GetMappedAS(pfrom.addr)};
-        LogDebug(BCLog::NET, "receive version message: %s: version %d, blocks=%d, us=%s, txrelay=%d, peer=%d%s%s\n",
-                  cleanSubVer, pfrom.nVersion,
-                  peer.m_starting_height, addrMe.ToStringAddrPort(), fRelay, pfrom.GetId(),
-                  pfrom.LogIP(fLogIPs), (mapped_as ? strprintf(", mapped_as=%d", mapped_as) : ""));
+        LogDebug(BCLog::NET, "receive version message: %s: version %d, blocks=%d, us=%s, txrelay=%d, %s%s",
+                  cleanSubVer.empty() ? "<no user agent>" : cleanSubVer, pfrom.nVersion,
+                  starting_height, addrMe.ToStringAddrPort(), fRelay, pfrom.LogPeer(),
+                  (mapped_as ? strprintf(", mapped_as=%d", mapped_as) : ""));
 
         if (pfrom.IsPrivateBroadcastConn()) {
             if (fRelay) {
                 MakeAndPushMessage(pfrom, NetMsgType::VERACK);
             } else {
-                LogDebug(BCLog::PRIVBROADCAST, "Disconnecting: does not support transaction relay (connected in vain), peer=%d%s",
-                         pfrom.GetId(), pfrom.LogIP(fLogIPs));
+                LogDebug(BCLog::PRIVBROADCAST, "Disconnecting: does not support transaction relay (connected in vain), %s",
+                         pfrom.LogPeer());
                 pfrom.fDisconnect = true;
             }
             return;
@@ -3806,7 +3802,7 @@ void PeerManagerImpl::ProcessMessage(Peer& peer, CNode& pfrom, const std::string
 
         // Feeler connections exist only to verify if address is online.
         if (pfrom.IsFeelerConn()) {
-            LogDebug(BCLog::NET, "feeler connection completed, %s\n", pfrom.DisconnectMsg(fLogIPs));
+            LogDebug(BCLog::NET, "feeler connection completed, %s", pfrom.DisconnectMsg());
             pfrom.fDisconnect = true;
         }
         return;
@@ -3826,11 +3822,10 @@ void PeerManagerImpl::ProcessMessage(Peer& peer, CNode& pfrom, const std::string
 
         auto new_peer_msg = [&]() {
             const auto mapped_as{m_connman.GetMappedAS(pfrom.addr)};
-            return strprintf("New %s peer connected: transport: %s, version: %d, blocks=%d peer=%d%s%s\n",
+            return strprintf("New %s peer connected: transport: %s, version: %d, %s%s",
                 pfrom.ConnectionTypeAsString(),
                 TransportTypeAsString(pfrom.m_transport->GetInfo().transport_type),
-                pfrom.nVersion.load(), peer.m_starting_height,
-                pfrom.GetId(), pfrom.LogIP(fLogIPs),
+                pfrom.nVersion.load(), pfrom.LogPeer(),
                 (mapped_as ? strprintf(", mapped_as=%d", mapped_as) : ""));
         };
 
@@ -3927,7 +3922,7 @@ void PeerManagerImpl::ProcessMessage(Peer& peer, CNode& pfrom, const std::string
     if (msg_type == NetMsgType::WTXIDRELAY) {
         if (pfrom.fSuccessfullyConnected) {
             // Disconnect peers that send a wtxidrelay message after VERACK.
-            LogDebug(BCLog::NET, "wtxidrelay received after verack, %s\n", pfrom.DisconnectMsg(fLogIPs));
+            LogDebug(BCLog::NET, "wtxidrelay received after verack, %s", pfrom.DisconnectMsg());
             pfrom.fDisconnect = true;
             return;
         }
@@ -3949,7 +3944,7 @@ void PeerManagerImpl::ProcessMessage(Peer& peer, CNode& pfrom, const std::string
     if (msg_type == NetMsgType::SENDADDRV2) {
         if (pfrom.fSuccessfullyConnected) {
             // Disconnect peers that send a SENDADDRV2 message after VERACK.
-            LogDebug(BCLog::NET, "sendaddrv2 received after verack, %s\n", pfrom.DisconnectMsg(fLogIPs));
+            LogDebug(BCLog::NET, "sendaddrv2 received after verack, %s", pfrom.DisconnectMsg());
             pfrom.fDisconnect = true;
             return;
         }
@@ -3967,14 +3962,14 @@ void PeerManagerImpl::ProcessMessage(Peer& peer, CNode& pfrom, const std::string
         }
 
         if (pfrom.fSuccessfullyConnected) {
-            LogDebug(BCLog::NET, "sendtxrcncl received after verack, %s\n", pfrom.DisconnectMsg(fLogIPs));
+            LogDebug(BCLog::NET, "sendtxrcncl received after verack, %s", pfrom.DisconnectMsg());
             pfrom.fDisconnect = true;
             return;
         }
 
         // Peer must not offer us reconciliations if we specified no tx relay support in VERSION.
         if (RejectIncomingTxs(pfrom)) {
-            LogDebug(BCLog::NET, "sendtxrcncl received to which we indicated no tx relay, %s\n", pfrom.DisconnectMsg(fLogIPs));
+            LogDebug(BCLog::NET, "sendtxrcncl received to which we indicated no tx relay, %s", pfrom.DisconnectMsg());
             pfrom.fDisconnect = true;
             return;
         }
@@ -3984,7 +3979,7 @@ void PeerManagerImpl::ProcessMessage(Peer& peer, CNode& pfrom, const std::string
         // eliminates them, so that this flag fully represents what we are looking for.
         const auto* tx_relay = peer.GetTxRelay();
         if (!tx_relay || !WITH_LOCK(tx_relay->m_bloom_filter_mutex, return tx_relay->m_relay_txs)) {
-            LogDebug(BCLog::NET, "sendtxrcncl received which indicated no tx relay to us, %s\n", pfrom.DisconnectMsg(fLogIPs));
+            LogDebug(BCLog::NET, "sendtxrcncl received which indicated no tx relay to us, %s", pfrom.DisconnectMsg());
             pfrom.fDisconnect = true;
             return;
         }
@@ -4002,11 +3997,11 @@ void PeerManagerImpl::ProcessMessage(Peer& peer, CNode& pfrom, const std::string
         case ReconciliationRegisterResult::SUCCESS:
             break;
         case ReconciliationRegisterResult::ALREADY_REGISTERED:
-            LogDebug(BCLog::NET, "txreconciliation protocol violation (sendtxrcncl received from already registered peer), %s\n", pfrom.DisconnectMsg(fLogIPs));
+            LogDebug(BCLog::NET, "txreconciliation protocol violation (sendtxrcncl received from already registered peer), %s", pfrom.DisconnectMsg());
             pfrom.fDisconnect = true;
             return;
         case ReconciliationRegisterResult::PROTOCOL_VIOLATION:
-            LogDebug(BCLog::NET, "txreconciliation protocol violation, %s\n", pfrom.DisconnectMsg(fLogIPs));
+            LogDebug(BCLog::NET, "txreconciliation protocol violation, %s", pfrom.DisconnectMsg());
             pfrom.fDisconnect = true;
             return;
         }
@@ -4020,7 +4015,7 @@ void PeerManagerImpl::ProcessMessage(Peer& peer, CNode& pfrom, const std::string
 
     if (pfrom.IsPrivateBroadcastConn()) {
         if (msg_type != NetMsgType::PONG && msg_type != NetMsgType::GETDATA) {
-            LogDebug(BCLog::PRIVBROADCAST, "Ignoring incoming message '%s', peer=%d%s", msg_type, pfrom.GetId(), pfrom.LogIP(fLogIPs));
+            LogDebug(BCLog::PRIVBROADCAST, "Ignoring incoming message '%s', %s", msg_type, pfrom.LogPeer());
             return;
         }
     }
@@ -4035,90 +4030,8 @@ void PeerManagerImpl::ProcessMessage(Peer& peer, CNode& pfrom, const std::string
         };
 
         std::vector<CAddress> vAddr;
-
         vRecv >> ser_params(vAddr);
-
-        if (!SetupAddressRelay(pfrom, peer)) {
-            LogDebug(BCLog::NET, "ignoring %s message from %s peer=%d\n", msg_type, pfrom.ConnectionTypeAsString(), pfrom.GetId());
-            return;
-        }
-
-        if (vAddr.size() > MAX_ADDR_TO_SEND)
-        {
-            Misbehaving(peer, strprintf("%s message size = %u", msg_type, vAddr.size()));
-            return;
-        }
-
-        // Store the new addresses
-        std::vector<CAddress> vAddrOk;
-        const auto current_a_time{Now<NodeSeconds>()};
-
-        // Update/increment addr rate limiting bucket.
-        const auto current_time{GetTime<std::chrono::microseconds>()};
-        if (peer.m_addr_token_bucket < MAX_ADDR_PROCESSING_TOKEN_BUCKET) {
-            // Don't increment bucket if it's already full
-            const auto time_diff = std::max(current_time - peer.m_addr_token_timestamp, 0us);
-            const double increment = Ticks<SecondsDouble>(time_diff) * MAX_ADDR_RATE_PER_SECOND;
-            peer.m_addr_token_bucket = std::min<double>(peer.m_addr_token_bucket + increment, MAX_ADDR_PROCESSING_TOKEN_BUCKET);
-        }
-        peer.m_addr_token_timestamp = current_time;
-
-        const bool rate_limited = !pfrom.HasPermission(NetPermissionFlags::Addr);
-        uint64_t num_proc = 0;
-        uint64_t num_rate_limit = 0;
-        std::shuffle(vAddr.begin(), vAddr.end(), m_rng);
-        for (CAddress& addr : vAddr)
-        {
-            if (interruptMsgProc)
-                return;
-
-            // Apply rate limiting.
-            if (peer.m_addr_token_bucket < 1.0) {
-                if (rate_limited) {
-                    ++num_rate_limit;
-                    continue;
-                }
-            } else {
-                peer.m_addr_token_bucket -= 1.0;
-            }
-            // We only bother storing full nodes, though this may include
-            // things which we would not make an outbound connection to, in
-            // part because we may make feeler connections to them.
-            if (!MayHaveUsefulAddressDB(addr.nServices) && !HasAllDesirableServiceFlags(addr.nServices))
-                continue;
-
-            if (addr.nTime <= NodeSeconds{100000000s} || addr.nTime > current_a_time + 10min) {
-                addr.nTime = current_a_time - 5 * 24h;
-            }
-            AddAddressKnown(peer, addr);
-            if (m_banman && (m_banman->IsDiscouraged(addr) || m_banman->IsBanned(addr))) {
-                // Do not process banned/discouraged addresses beyond remembering we received them
-                continue;
-            }
-            ++num_proc;
-            const bool reachable{g_reachable_nets.Contains(addr)};
-            if (addr.nTime > current_a_time - 10min && !peer.m_getaddr_sent && vAddr.size() <= 10 && addr.IsRoutable()) {
-                // Relay to a limited number of other nodes
-                RelayAddress(pfrom.GetId(), addr, reachable);
-            }
-            // Do not store addresses outside our network
-            if (reachable) {
-                vAddrOk.push_back(addr);
-            }
-        }
-        peer.m_addr_processed += num_proc;
-        peer.m_addr_rate_limited += num_rate_limit;
-        LogDebug(BCLog::NET, "Received addr: %u addresses (%u processed, %u rate-limited) from peer=%d\n",
-                 vAddr.size(), num_proc, num_rate_limit, pfrom.GetId());
-
-        m_addrman.Add(vAddrOk, pfrom.addr, /*time_penalty=*/2h);
-        if (vAddr.size() < 1000) peer.m_getaddr_sent = false;
-
-        // AddrFetch: Require multiple addresses to avoid disconnecting on self-announcements
-        if (pfrom.IsAddrFetchConn() && vAddr.size() > 1) {
-            LogDebug(BCLog::NET, "addrfetch connection completed, %s\n", pfrom.DisconnectMsg(fLogIPs));
-            pfrom.fDisconnect = true;
-        }
+        ProcessAddrs(msg_type, pfrom, peer, std::move(vAddr), interruptMsgProc);
         return;
     }
 
@@ -4152,7 +4065,7 @@ void PeerManagerImpl::ProcessMessage(Peer& peer, CNode& pfrom, const std::string
 
             if (inv.IsMsgBlk()) {
                 const bool fAlreadyHave = AlreadyHaveBlock(inv.hash);
-                LogDebug(BCLog::NET, "got inv: %s  %s peer=%d\n", inv.ToString(), fAlreadyHave ? "have" : "new", pfrom.GetId());
+                LogDebug(BCLog::NET, "got inv: %s %s peer=%d", inv.ToString(), fAlreadyHave ? "have" : "new", pfrom.GetId());
 
                 UpdateBlockAvailability(pfrom.GetId(), inv.hash);
                 if (!fAlreadyHave && !m_chainman.m_blockman.LoadingBlocks() && !IsBlockRequested(inv.hash)) {
@@ -4166,7 +4079,7 @@ void PeerManagerImpl::ProcessMessage(Peer& peer, CNode& pfrom, const std::string
                 }
             } else if (inv.IsGenTxMsg()) {
                 if (reject_tx_invs) {
-                    LogDebug(BCLog::NET, "transaction (%s) inv sent in violation of protocol, %s\n", inv.hash.ToString(), pfrom.DisconnectMsg(fLogIPs));
+                    LogDebug(BCLog::NET, "transaction (%s) inv sent in violation of protocol, %s", inv.hash.ToString(), pfrom.DisconnectMsg());
                     pfrom.fDisconnect = true;
                     return;
                 }
@@ -4175,7 +4088,7 @@ void PeerManagerImpl::ProcessMessage(Peer& peer, CNode& pfrom, const std::string
 
                 if (!m_chainman.IsInitialBlockDownload()) {
                     const bool fAlreadyHave{m_txdownloadman.AddTxAnnouncement(pfrom.GetId(), gtxid, current_time)};
-                    LogDebug(BCLog::NET, "got inv: %s  %s peer=%d\n", inv.ToString(), fAlreadyHave ? "have" : "new", pfrom.GetId());
+                    LogDebug(BCLog::NET, "got inv: %s %s peer=%d", inv.ToString(), fAlreadyHave ? "have" : "new", pfrom.GetId());
                 }
             } else {
                 LogDebug(BCLog::NET, "Unknown inv type \"%s\" received from peer=%d\n", inv.ToString(), pfrom.GetId());
@@ -4231,8 +4144,8 @@ void PeerManagerImpl::ProcessMessage(Peer& peer, CNode& pfrom, const std::string
         if (pfrom.IsPrivateBroadcastConn()) {
             const auto pushed_tx_opt{m_tx_for_private_broadcast.GetTxForNode(pfrom.GetId())};
             if (!pushed_tx_opt) {
-                LogDebug(BCLog::PRIVBROADCAST, "Disconnecting: got GETDATA without sending an INV, peer=%d%s",
-                         pfrom.GetId(), fLogIPs ? strprintf(", peeraddr=%s", pfrom.addr.ToStringAddrPort()) : "");
+                LogDebug(BCLog::PRIVBROADCAST, "Disconnecting: got GETDATA without sending an INV, %s",
+                         pfrom.LogPeer());
                 pfrom.fDisconnect = true;
                 return;
             }
@@ -4248,8 +4161,8 @@ void PeerManagerImpl::ProcessMessage(Peer& peer, CNode& pfrom, const std::string
                 peer.m_ping_queued = true; // Ensure a ping will be sent: mimic a request via RPC.
                 MaybeSendPing(pfrom, peer, GetTime<std::chrono::microseconds>());
             } else {
-                LogDebug(BCLog::PRIVBROADCAST, "Disconnecting: got an unexpected GETDATA message, peer=%d%s",
-                         pfrom.GetId(), fLogIPs ? strprintf(", peeraddr=%s", pfrom.addr.ToStringAddrPort()) : "");
+                LogDebug(BCLog::PRIVBROADCAST, "Disconnecting: got an unexpected GETDATA message, %s",
+                         pfrom.LogPeer());
                 pfrom.fDisconnect = true;
             }
             return;
@@ -4270,7 +4183,7 @@ void PeerManagerImpl::ProcessMessage(Peer& peer, CNode& pfrom, const std::string
         vRecv >> locator >> hashStop;
 
         if (locator.vHave.size() > MAX_LOCATOR_SZ) {
-            LogDebug(BCLog::NET, "getblocks locator size %lld > %d, %s\n", locator.vHave.size(), MAX_LOCATOR_SZ, pfrom.DisconnectMsg(fLogIPs));
+            LogDebug(BCLog::NET, "getblocks locator size %lld > %d, %s", locator.vHave.size(), MAX_LOCATOR_SZ, pfrom.DisconnectMsg());
             pfrom.fDisconnect = true;
             return;
         }
@@ -4308,7 +4221,7 @@ void PeerManagerImpl::ProcessMessage(Peer& peer, CNode& pfrom, const std::string
         {
             if (pindex->GetBlockHash() == hashStop)
             {
-                LogDebug(BCLog::NET, "  getblocks stopping at %d %s\n", pindex->nHeight, pindex->GetBlockHash().ToString());
+                LogDebug(BCLog::NET, " getblocks stopping at %d %s", pindex->nHeight, pindex->GetBlockHash().ToString());
                 break;
             }
             // If pruning, don't inv blocks unless we have on disk and are likely to still have
@@ -4322,7 +4235,7 @@ void PeerManagerImpl::ProcessMessage(Peer& peer, CNode& pfrom, const std::string
             if (--nLimit <= 0) {
                 // When this block is requested, we'll send an inv that'll
                 // trigger the peer to getblocks the next batch of inventory.
-                LogDebug(BCLog::NET, "  getblocks stopping at limit %d %s\n", pindex->nHeight, pindex->GetBlockHash().ToString());
+                LogDebug(BCLog::NET, " getblocks stopping at limit %d %s", pindex->nHeight, pindex->GetBlockHash().ToString());
                 WITH_LOCK(peer.m_block_inv_mutex, {peer.m_continuation_block = pindex->GetBlockHash();});
                 break;
             }
@@ -4397,7 +4310,7 @@ void PeerManagerImpl::ProcessMessage(Peer& peer, CNode& pfrom, const std::string
         vRecv >> locator >> hashStop;
 
         if (locator.vHave.size() > MAX_LOCATOR_SZ) {
-            LogDebug(BCLog::NET, "getheaders locator size %lld > %d, %s\n", locator.vHave.size(), MAX_LOCATOR_SZ, pfrom.DisconnectMsg(fLogIPs));
+            LogDebug(BCLog::NET, "getheaders locator size %lld > %d, %s", locator.vHave.size(), MAX_LOCATOR_SZ, pfrom.DisconnectMsg());
             pfrom.fDisconnect = true;
             return;
         }
@@ -4472,7 +4385,7 @@ void PeerManagerImpl::ProcessMessage(Peer& peer, CNode& pfrom, const std::string
 
     if (msg_type == NetMsgType::TX) {
         if (RejectIncomingTxs(pfrom)) {
-            LogDebug(BCLog::NET, "transaction sent in violation of protocol, %s", pfrom.DisconnectMsg(fLogIPs));
+            LogDebug(BCLog::NET, "transaction sent in violation of protocol, %s", pfrom.DisconnectMsg());
             pfrom.fDisconnect = true;
             return;
         }
@@ -4493,8 +4406,8 @@ void PeerManagerImpl::ProcessMessage(Peer& peer, CNode& pfrom, const std::string
 
         if (const auto num_broadcasted{m_tx_for_private_broadcast.Remove(ptx)}) {
             LogDebug(BCLog::PRIVBROADCAST, "Received our privately broadcast transaction (txid=%s) from the "
-                                           "network from peer=%d%s; stopping private broadcast attempts",
-                     txid.ToString(), pfrom.GetId(), pfrom.LogIP(fLogIPs));
+                                           "network from %s; stopping private broadcast attempts",
+                     txid.ToString(), pfrom.LogPeer());
             if (NUM_PRIVATE_BROADCAST_PER_TX > num_broadcasted.value()) {
                 // Not all of the initial NUM_PRIVATE_BROADCAST_PER_TX connections were needed.
                 // Tell CConnman it does not need to start the remaining ones.
@@ -4944,7 +4857,7 @@ void PeerManagerImpl::ProcessMessage(Peer& peer, CNode& pfrom, const std::string
         {
             if (!pfrom.HasPermission(NetPermissionFlags::NoBan))
             {
-                LogDebug(BCLog::NET, "mempool request with bloom filters disabled, %s\n", pfrom.DisconnectMsg(fLogIPs));
+                LogDebug(BCLog::NET, "mempool request with bloom filters disabled, %s", pfrom.DisconnectMsg());
                 pfrom.fDisconnect = true;
             }
             return;
@@ -4954,7 +4867,7 @@ void PeerManagerImpl::ProcessMessage(Peer& peer, CNode& pfrom, const std::string
         {
             if (!pfrom.HasPermission(NetPermissionFlags::NoBan))
             {
-                LogDebug(BCLog::NET, "mempool request with bandwidth limit reached, %s\n", pfrom.DisconnectMsg(fLogIPs));
+                LogDebug(BCLog::NET, "mempool request with bandwidth limit reached, %s", pfrom.DisconnectMsg());
                 pfrom.fDisconnect = true;
             }
             return;
@@ -5008,8 +4921,8 @@ void PeerManagerImpl::ProcessMessage(Peer& peer, CNode& pfrom, const std::string
                         pfrom.PongReceived(ping_time);
                         if (pfrom.IsPrivateBroadcastConn()) {
                             m_tx_for_private_broadcast.NodeConfirmedReception(pfrom.GetId());
-                            LogDebug(BCLog::PRIVBROADCAST, "Got a PONG (the transaction will probably reach the network), marking for disconnect, peer=%d%s",
-                                     pfrom.GetId(), pfrom.LogIP(fLogIPs));
+                            LogDebug(BCLog::PRIVBROADCAST, "Got a PONG (the transaction will probably reach the network), marking for disconnect, %s",
+                                     pfrom.LogPeer());
                             pfrom.fDisconnect = true;
                         }
                     } else {
@@ -5050,7 +4963,7 @@ void PeerManagerImpl::ProcessMessage(Peer& peer, CNode& pfrom, const std::string
 
     if (msg_type == NetMsgType::FILTERLOAD) {
         if (!(peer.m_our_services & NODE_BLOOM)) {
-            LogDebug(BCLog::NET, "filterload received despite not offering bloom services, %s\n", pfrom.DisconnectMsg(fLogIPs));
+            LogDebug(BCLog::NET, "filterload received despite not offering bloom services, %s", pfrom.DisconnectMsg());
             pfrom.fDisconnect = true;
             return;
         }
@@ -5075,7 +4988,7 @@ void PeerManagerImpl::ProcessMessage(Peer& peer, CNode& pfrom, const std::string
 
     if (msg_type == NetMsgType::FILTERADD) {
         if (!(peer.m_our_services & NODE_BLOOM)) {
-            LogDebug(BCLog::NET, "filteradd received despite not offering bloom services, %s\n", pfrom.DisconnectMsg(fLogIPs));
+            LogDebug(BCLog::NET, "filteradd received despite not offering bloom services, %s", pfrom.DisconnectMsg());
             pfrom.fDisconnect = true;
             return;
         }
@@ -5103,7 +5016,7 @@ void PeerManagerImpl::ProcessMessage(Peer& peer, CNode& pfrom, const std::string
 
     if (msg_type == NetMsgType::FILTERCLEAR) {
         if (!(peer.m_our_services & NODE_BLOOM)) {
-            LogDebug(BCLog::NET, "filterclear received despite not offering bloom services, %s\n", pfrom.DisconnectMsg(fLogIPs));
+            LogDebug(BCLog::NET, "filterclear received despite not offering bloom services, %s", pfrom.DisconnectMsg());
             pfrom.fDisconnect = true;
             return;
         }
@@ -5325,7 +5238,7 @@ void PeerManagerImpl::ConsiderEviction(CNode& pto, Peer& peer, std::chrono::seco
             // message to give the peer a chance to update us.
             if (state.m_chain_sync.m_sent_getheaders) {
                 // They've run out of time to catch up!
-                LogInfo("Outbound peer has old chain, best known block = %s, %s\n", state.pindexBestKnownBlock != nullptr ? state.pindexBestKnownBlock->GetBlockHash().ToString() : "<none>", pto.DisconnectMsg(fLogIPs));
+                LogInfo("Outbound peer has old chain, best known block = %s, %s", state.pindexBestKnownBlock != nullptr ? state.pindexBestKnownBlock->GetBlockHash().ToString() : "<none>", pto.DisconnectMsg());
                 pto.fDisconnect = true;
             } else {
                 assert(state.m_chain_sync.m_work_header);
@@ -5492,7 +5405,7 @@ void PeerManagerImpl::MaybeSendPing(CNode& node_to, Peer& peer, std::chrono::mic
     {
         // The ping timeout is using mocktime. To disable the check during
         // testing, increase -peertimeout.
-        LogDebug(BCLog::NET, "ping timeout: %fs, %s", 0.000001 * count_microseconds(now - peer.m_ping_start.load()), node_to.DisconnectMsg(fLogIPs));
+        LogDebug(BCLog::NET, "ping timeout: %fs, %s", 0.000001 * count_microseconds(now - peer.m_ping_start.load()), node_to.DisconnectMsg());
         node_to.fDisconnect = true;
         return;
     }
@@ -5710,6 +5623,93 @@ bool PeerManagerImpl::SetupAddressRelay(const CNode& node, Peer& peer)
     return true;
 }
 
+void PeerManagerImpl::ProcessAddrs(std::string_view msg_type, CNode& pfrom, Peer& peer, std::vector<CAddress>&& vAddr, const std::atomic<bool>& interruptMsgProc)
+{
+    AssertLockNotHeld(m_peer_mutex);
+    AssertLockHeld(g_msgproc_mutex);
+
+    if (!SetupAddressRelay(pfrom, peer)) {
+        LogDebug(BCLog::NET, "ignoring %s message from %s peer=%d\n", msg_type, pfrom.ConnectionTypeAsString(), pfrom.GetId());
+        return;
+    }
+
+    if (vAddr.size() > MAX_ADDR_TO_SEND)
+    {
+        Misbehaving(peer, strprintf("%s message size = %u", msg_type, vAddr.size()));
+        return;
+    }
+
+    // Store the new addresses
+    std::vector<CAddress> vAddrOk;
+
+    // Update/increment addr rate limiting bucket.
+    const auto current_time{NodeClock::now()};
+    if (peer.m_addr_token_bucket < MAX_ADDR_PROCESSING_TOKEN_BUCKET) {
+        // Don't increment bucket if it's already full
+        const auto time_diff{current_time - peer.m_addr_token_timestamp};
+        const double increment{std::max(Ticks<SecondsDouble>(time_diff), 0.0) * MAX_ADDR_RATE_PER_SECOND};
+        peer.m_addr_token_bucket = std::min<double>(peer.m_addr_token_bucket + increment, MAX_ADDR_PROCESSING_TOKEN_BUCKET);
+    }
+    peer.m_addr_token_timestamp = current_time;
+
+    const bool rate_limited = !pfrom.HasPermission(NetPermissionFlags::Addr);
+    uint64_t num_proc = 0;
+    uint64_t num_rate_limit = 0;
+    std::shuffle(vAddr.begin(), vAddr.end(), m_rng);
+    for (CAddress& addr : vAddr)
+    {
+        if (interruptMsgProc)
+            return;
+
+        // Apply rate limiting.
+        if (peer.m_addr_token_bucket < 1.0) {
+            if (rate_limited) {
+                ++num_rate_limit;
+                continue;
+            }
+        } else {
+            peer.m_addr_token_bucket -= 1.0;
+        }
+        // We only bother storing full nodes, though this may include
+        // things which we would not make an outbound connection to, in
+        // part because we may make feeler connections to them.
+        if (!MayHaveUsefulAddressDB(addr.nServices) && !HasAllDesirableServiceFlags(addr.nServices))
+            continue;
+
+        if (addr.nTime <= NodeSeconds{100000000s} || addr.nTime > current_time + 10min) {
+            addr.nTime = std::chrono::time_point_cast<std::chrono::seconds>(current_time - 5 * 24h);
+        }
+        AddAddressKnown(peer, addr);
+        if (m_banman && (m_banman->IsDiscouraged(addr) || m_banman->IsBanned(addr))) {
+            // Do not process banned/discouraged addresses beyond remembering we received them
+            continue;
+        }
+        ++num_proc;
+        const bool reachable{g_reachable_nets.Contains(addr)};
+        if (addr.nTime > current_time - 10min && !peer.m_getaddr_sent && vAddr.size() <= 10 && addr.IsRoutable()) {
+            // Relay to a limited number of other nodes
+            RelayAddress(pfrom.GetId(), addr, reachable);
+        }
+        // Do not store addresses outside our network
+        if (reachable) {
+            vAddrOk.push_back(addr);
+        }
+    }
+    peer.m_addr_processed += num_proc;
+    peer.m_addr_rate_limited += num_rate_limit;
+    LogDebug(BCLog::NET, "Received addr: %u addresses (%u processed, %u rate-limited) from peer=%d\n",
+             vAddr.size(), num_proc, num_rate_limit, pfrom.GetId());
+
+    m_addrman.Add(vAddrOk, pfrom.addr, /*time_penalty=*/2h);
+    if (vAddr.size() < 1000) peer.m_getaddr_sent = false;
+
+    // AddrFetch: Require multiple addresses to avoid disconnecting on self-announcements
+    if (pfrom.IsAddrFetchConn() && vAddr.size() > 1) {
+        LogDebug(BCLog::NET, "addrfetch connection completed, %s", pfrom.DisconnectMsg());
+        pfrom.fDisconnect = true;
+    }
+}
+
 bool PeerManagerImpl::SendMessages(CNode& node)
 {
     AssertLockNotHeld(m_tx_download_mutex);
@@ -5741,15 +5741,15 @@ bool PeerManagerImpl::SendMessages(CNode& node)
     // not sent. This here is just an optimization.
     if (node.IsPrivateBroadcastConn()) {
         if (node.m_connected + PRIVATE_BROADCAST_MAX_CONNECTION_LIFETIME < current_time) {
-            LogDebug(BCLog::PRIVBROADCAST, "Disconnecting: did not complete the transaction send within %d seconds, peer=%d%s",
-                     count_seconds(PRIVATE_BROADCAST_MAX_CONNECTION_LIFETIME), node.GetId(), node.LogIP(fLogIPs));
+            LogDebug(BCLog::PRIVBROADCAST, "Disconnecting: did not complete the transaction send within %d seconds, %s",
+                     count_seconds(PRIVATE_BROADCAST_MAX_CONNECTION_LIFETIME), node.LogPeer());
             node.fDisconnect = true;
         }
         return true;
     }
 
     if (node.IsAddrFetchConn() && current_time - node.m_connected > 10 * AVG_ADDRESS_BROADCAST_INTERVAL) {
-        LogDebug(BCLog::NET, "addrfetch connection timeout, %s\n", node.DisconnectMsg(fLogIPs));
+        LogDebug(BCLog::NET, "addrfetch connection timeout, %s", node.DisconnectMsg());
         node.fDisconnect = true;
         return true;
     }
@@ -5808,7 +5808,7 @@ bool PeerManagerImpl::SendMessages(CNode& node)
                 if (pindexStart->pprev)
                     pindexStart = pindexStart->pprev;
                 if (MaybeSendGetHeaders(node, GetLocator(pindexStart), peer)) {
-                    LogDebug(BCLog::NET, "initial getheaders (%d) to peer=%d (startheight:%d)\n", pindexStart->nHeight, node.GetId(), peer.m_starting_height);
+                    LogDebug(BCLog::NET, "initial getheaders (%d) to peer=%d", pindexStart->nHeight, node.GetId());
 
                     state.fSyncStarted = true;
                     peer.m_headers_sync_timeout = current_time + HEADERS_DOWNLOAD_TIMEOUT_BASE +
@@ -6097,7 +6097,7 @@ bool PeerManagerImpl::SendMessages(CNode& node)
             // Stalling only triggers when the block download window cannot move. During normal steady state,
             // the download window should be much larger than the to-be-downloaded set of blocks, so disconnection
             // should only happen during initial block download.
-            LogInfo("Peer is stalling block download, %s\n", node.DisconnectMsg(fLogIPs));
+            LogInfo("Peer is stalling block download, %s", node.DisconnectMsg());
             node.fDisconnect = true;
             // Increase timeout for the next peer so that we don't disconnect multiple peers if our own
             // bandwidth is insufficient.
@@ -6116,7 +6116,7 @@ bool PeerManagerImpl::SendMessages(CNode& node)
             QueuedBlock &queuedBlock = state.vBlocksInFlight.front();
             int nOtherPeersWithValidatedDownloads = m_peers_downloading_from - 1;
             if (current_time > state.m_downloading_since + std::chrono::seconds{consensusParams.nPowTargetSpacing} * (BLOCK_DOWNLOAD_TIMEOUT_BASE + BLOCK_DOWNLOAD_TIMEOUT_PER_PEER * nOtherPeersWithValidatedDownloads)) {
-                LogInfo("Timeout downloading block %s, %s\n", queuedBlock.pindex->GetBlockHash().ToString(), node.DisconnectMsg(fLogIPs));
+                LogInfo("Timeout downloading block %s, %s", queuedBlock.pindex->GetBlockHash().ToString(), node.DisconnectMsg());
                 node.fDisconnect = true;
                 return true;
             }
@@ -6132,11 +6132,11 @@ bool PeerManagerImpl::SendMessages(CNode& node)
                     // disconnect our sync peer for stalling; we have bigger
                     // problems if we can't get any outbound peers.
                     if (!node.HasPermission(NetPermissionFlags::NoBan)) {
-                        LogInfo("Timeout downloading headers, %s\n", node.DisconnectMsg(fLogIPs));
+                        LogInfo("Timeout downloading headers, %s", node.DisconnectMsg());
                         node.fDisconnect = true;
                         return true;
                     } else {
-                        LogInfo("Timeout downloading headers from noban peer, not %s\n", node.DisconnectMsg(fLogIPs));
+                        LogInfo("Timeout downloading headers from noban peer, not %s", node.DisconnectMsg());
                         // Reset the headers sync state so that we have a
                         // chance to try downloading from a different peer.
                         // Note: this will also result in at least one more
diff --git a/src/net_processing.h b/src/net_processing.h
index 36ae021f679d..d2050d8f3d70 100644
--- a/src/net_processing.h
+++ b/src/net_processing.h
@@ -11,7 +11,6 @@
 #include <node/txorphanage.h>
 #include <private_broadcast.h>
 #include <protocol.h>
-#include <threadsafety.h>
 #include <uint256.h>
 #include <util/expected.h>
 #include <validationinterface.h>
@@ -53,7 +52,6 @@ static const unsigned int MAX_HEADERS_RESULTS = 2000;
 struct CNodeStateStats {
     int nSyncHeight = -1;
     int nCommonHeight = -1;
-    int m_starting_height = -1;
     std::chrono::microseconds m_ping_wait;
     std::vector<int> vHeightInFlight;
     bool m_relay_txs;
diff --git a/src/netbase.cpp b/src/netbase.cpp
index c1c03c57259d..5ac7d22af348 100644
--- a/src/netbase.cpp
+++ b/src/netbase.cpp
@@ -706,13 +706,14 @@ bool SetProxy(enum Network net, const Proxy &addrProxy) {
     return true;
 }
 
-bool GetProxy(enum Network net, Proxy &proxyInfoOut) {
+std::optional<Proxy> GetProxy(enum Network net)
+{
     assert(net >= 0 && net < NET_MAX);
     LOCK(g_proxyinfo_mutex);
-    if (!proxyInfo[net].IsValid())
-        return false;
-    proxyInfoOut = proxyInfo[net];
-    return true;
+    if (!proxyInfo[net].IsValid()) {
+        return std::nullopt;
+    }
+    return proxyInfo[net];
 }
 
 bool SetNameProxy(const Proxy &addrProxy) {
@@ -723,12 +724,13 @@ bool SetNameProxy(const Proxy &addrProxy) {
     return true;
 }
 
-bool GetNameProxy(Proxy &nameProxyOut) {
+std::optional<Proxy> GetNameProxy()
+{
     LOCK(g_proxyinfo_mutex);
-    if(!nameProxy.IsValid())
-        return false;
-    nameProxyOut = nameProxy;
-    return true;
+    if (!nameProxy.IsValid()) {
+        return std::nullopt;
+    }
+    return nameProxy;
 }
 
 bool HaveNameProxy() {
diff --git a/src/netbase.h b/src/netbase.h
index 6e538a73c264..88cc69810b06 100644
--- a/src/netbase.h
+++ b/src/netbase.h
@@ -14,6 +14,7 @@
 #include <cstdint>
 #include <functional>
 #include <memory>
+#include <optional>
 #include <string>
 #include <type_traits>
 #include <unordered_set>
@@ -179,7 +180,7 @@ std::string GetNetworkName(enum Network net);
 /** Return a vector of publicly routable Network names; optionally append NET_UNROUTABLE. */
 std::vector<std::string> GetNetworkNames(bool append_unroutable = false);
 bool SetProxy(enum Network net, const Proxy &addrProxy);
-bool GetProxy(enum Network net, Proxy &proxyInfoOut);
+std::optional<Proxy> GetProxy(enum Network net);
 bool IsProxy(const CNetAddr &addr);
 /**
  * Set the name proxy to use for all connections to nodes specified by a
@@ -199,7 +200,7 @@ bool IsProxy(const CNetAddr &addr);
  */
 bool SetNameProxy(const Proxy &addrProxy);
 bool HaveNameProxy();
-bool GetNameProxy(Proxy &nameProxyOut);
+std::optional<Proxy> GetNameProxy();
 
 using DNSLookupFn = std::function<std::vector<CNetAddr>(const std::string&, bool)>;
 extern DNSLookupFn g_dns_lookup;
diff --git a/src/node/abort.cpp b/src/node/abort.cpp
index a7c815363b2d..9483e56ae9a9 100644
--- a/src/node/abort.cpp
+++ b/src/node/abort.cpp
@@ -7,6 +7,7 @@
 #include <logging.h>
 #include <node/interface_ui.h>
 #include <node/warnings.h>
+#include <util/fs.h>
 #include <util/signalinterrupt.h>
 #include <util/translation.h>
 
@@ -18,7 +19,7 @@ namespace node {
 void AbortNode(const std::function<bool()>& shutdown_request, std::atomic<int>& exit_status, const bilingual_str& message, node::Warnings* warnings)
 {
     if (warnings) warnings->Set(Warning::FATAL_INTERNAL_ERROR, message);
-    InitError(_("A fatal internal error occurred, see debug.log for details: ") + message);
+    InitError(strprintf(_("A fatal internal error occurred, see %s for details: %s"), fs::PathToString(LogInstance().m_file_path.filename()), message));
     exit_status.store(EXIT_FAILURE);
     if (shutdown_request && !shutdown_request()) {
         LogError("Failed to send shutdown signal\n");
diff --git a/src/node/blockstorage.h b/src/node/blockstorage.h
index 4fefa86a61fe..b1e5aca39f33 100644
--- a/src/node/blockstorage.h
+++ b/src/node/blockstorage.h
@@ -145,7 +145,8 @@ struct CBlockIndexHeightOnlyComparator {
 };
 
 struct PruneLockInfo {
-    int height_first{std::numeric_limits<int>::max()}; //! Height of earliest block that should be kept and not pruned
+    /// Height of earliest block that should be kept and not pruned
+    int height_first{std::numeric_limits<int>::max()};
 };
 
 enum BlockfileType {
diff --git a/src/node/chainstate.cpp b/src/node/chainstate.cpp
index ff3de2982271..0738c00aef8d 100644
--- a/src/node/chainstate.cpp
+++ b/src/node/chainstate.cpp
@@ -11,7 +11,6 @@
 #include <kernel/caches.h>
 #include <node/blockstorage.h>
 #include <sync.h>
-#include <threadsafety.h>
 #include <tinyformat.h>
 #include <txdb.h>
 #include <uint256.h>
diff --git a/src/node/context.cpp b/src/node/context.cpp
index d7d01b494ee9..164361601f9b 100644
--- a/src/node/context.cpp
+++ b/src/node/context.cpp
@@ -17,6 +17,7 @@
 #include <node/warnings.h>
 #include <policy/fees/block_policy_estimator.h>
 #include <scheduler.h>
+#include <torcontrol.h>
 #include <txmempool.h>
 #include <validation.h>
 #include <validationinterface.h>
diff --git a/src/node/context.h b/src/node/context.h
index 3a7488fd25ff..848c872fd4a9 100644
--- a/src/node/context.h
+++ b/src/node/context.h
@@ -25,6 +25,7 @@ class ChainstateManager;
 class ECC_Context;
 class NetGroupManager;
 class PeerManager;
+class TorController;
 namespace interfaces {
 class Chain;
 class ChainClient;
@@ -69,6 +70,7 @@ struct NodeContext {
     std::unique_ptr<const NetGroupManager> netgroupman;
     std::unique_ptr<CBlockPolicyEstimator> fee_estimator;
     std::unique_ptr<PeerManager> peerman;
+    std::unique_ptr<TorController> tor_controller;
     std::unique_ptr<ChainstateManager> chainman;
     std::unique_ptr<BanMan> banman;
     ArgsManager* args{nullptr}; // Currently a raw pointer because the memory is not managed by this struct
diff --git a/src/node/data/ip_asn.dat b/src/node/data/ip_asn.dat
index 9fad606c3b19..bc08f1df14d3 100644
Binary files a/src/node/data/ip_asn.dat and b/src/node/data/ip_asn.dat differ
diff --git a/src/node/interface_ui.cpp b/src/node/interface_ui.cpp
index d96c5155ab50..6b1fe72fae46 100644
--- a/src/node/interface_ui.cpp
+++ b/src/node/interface_ui.cpp
@@ -4,33 +4,31 @@
 
 #include <node/interface_ui.h>
 
+#include <btcsignals.h>
 #include <util/string.h>
 #include <util/translation.h>
 
-#include <boost/signals2/optional_last_value.hpp>
-#include <boost/signals2/signal.hpp>
-
 using util::MakeUnorderedList;
 
 CClientUIInterface uiInterface;
 
 struct UISignals {
-    boost::signals2::signal<CClientUIInterface::ThreadSafeMessageBoxSig, boost::signals2::optional_last_value<bool>> ThreadSafeMessageBox;
-    boost::signals2::signal<CClientUIInterface::ThreadSafeQuestionSig, boost::signals2::optional_last_value<bool>> ThreadSafeQuestion;
-    boost::signals2::signal<CClientUIInterface::InitMessageSig> InitMessage;
-    boost::signals2::signal<CClientUIInterface::InitWalletSig> InitWallet;
-    boost::signals2::signal<CClientUIInterface::NotifyNumConnectionsChangedSig> NotifyNumConnectionsChanged;
-    boost::signals2::signal<CClientUIInterface::NotifyNetworkActiveChangedSig> NotifyNetworkActiveChanged;
-    boost::signals2::signal<CClientUIInterface::NotifyAlertChangedSig> NotifyAlertChanged;
-    boost::signals2::signal<CClientUIInterface::ShowProgressSig> ShowProgress;
-    boost::signals2::signal<CClientUIInterface::NotifyBlockTipSig> NotifyBlockTip;
-    boost::signals2::signal<CClientUIInterface::NotifyHeaderTipSig> NotifyHeaderTip;
-    boost::signals2::signal<CClientUIInterface::BannedListChangedSig> BannedListChanged;
+    btcsignals::signal<CClientUIInterface::ThreadSafeMessageBoxSig, btcsignals::optional_last_value<bool>> ThreadSafeMessageBox;
+    btcsignals::signal<CClientUIInterface::ThreadSafeQuestionSig, btcsignals::optional_last_value<bool>> ThreadSafeQuestion;
+    btcsignals::signal<CClientUIInterface::InitMessageSig> InitMessage;
+    btcsignals::signal<CClientUIInterface::InitWalletSig> InitWallet;
+    btcsignals::signal<CClientUIInterface::NotifyNumConnectionsChangedSig> NotifyNumConnectionsChanged;
+    btcsignals::signal<CClientUIInterface::NotifyNetworkActiveChangedSig> NotifyNetworkActiveChanged;
+    btcsignals::signal<CClientUIInterface::NotifyAlertChangedSig> NotifyAlertChanged;
+    btcsignals::signal<CClientUIInterface::ShowProgressSig> ShowProgress;
+    btcsignals::signal<CClientUIInterface::NotifyBlockTipSig> NotifyBlockTip;
+    btcsignals::signal<CClientUIInterface::NotifyHeaderTipSig> NotifyHeaderTip;
+    btcsignals::signal<CClientUIInterface::BannedListChangedSig> BannedListChanged;
 };
 static UISignals g_ui_signals;
 
 #define ADD_SIGNALS_IMPL_WRAPPER(signal_name)                                                                 \
-    boost::signals2::connection CClientUIInterface::signal_name##_connect(std::function<signal_name##Sig> fn) \
+    btcsignals::connection CClientUIInterface::signal_name##_connect(std::function<signal_name##Sig> fn) \
     {                                                                                                         \
         return g_ui_signals.signal_name.connect(fn);                                                          \
     }
diff --git a/src/node/interface_ui.h b/src/node/interface_ui.h
index ce5171bb5181..8175683f9fa8 100644
--- a/src/node/interface_ui.h
+++ b/src/node/interface_ui.h
@@ -15,11 +15,9 @@ class CBlockIndex;
 enum class SynchronizationState;
 struct bilingual_str;
 
-namespace boost {
-namespace signals2 {
-class connection;
-}
-} // namespace boost
+namespace btcsignals {
+    class connection;
+} // namespace btcsignals
 
 /** Signals for UI communication. */
 class CClientUIInterface
@@ -71,7 +69,7 @@ class CClientUIInterface
 #define ADD_SIGNALS_DECL_WRAPPER(signal_name, rtype, ...)                                  \
     rtype signal_name(__VA_ARGS__);                                                        \
     using signal_name##Sig = rtype(__VA_ARGS__);                                           \
-    boost::signals2::connection signal_name##_connect(std::function<signal_name##Sig> fn)
+    btcsignals::connection signal_name##_connect(std::function<signal_name##Sig> fn)
 
     /** Show message box. */
     ADD_SIGNALS_DECL_WRAPPER(ThreadSafeMessageBox, bool, const bilingual_str& message, unsigned int style);
diff --git a/src/node/interfaces.cpp b/src/node/interfaces.cpp
index 84fd5bb79474..16db8692a154 100644
--- a/src/node/interfaces.cpp
+++ b/src/node/interfaces.cpp
@@ -5,6 +5,7 @@
 #include <addrdb.h>
 #include <banman.h>
 #include <blockfilter.h>
+#include <btcsignals.h>
 #include <chain.h>
 #include <chainparams.h>
 #include <common/args.h>
@@ -12,12 +13,14 @@
 #include <consensus/validation.h>
 #include <deploymentstatus.h>
 #include <external_signer.h>
+#include <httprpc.h>
 #include <index/blockfilterindex.h>
 #include <init.h>
 #include <interfaces/chain.h>
 #include <interfaces/handler.h>
 #include <interfaces/mining.h>
 #include <interfaces/node.h>
+#include <interfaces/rpc.h>
 #include <interfaces/types.h>
 #include <interfaces/wallet.h>
 #include <kernel/chain.h>
@@ -70,8 +73,6 @@
 #include <stdexcept>
 #include <utility>
 
-#include <boost/signals2/signal.hpp>
-
 using interfaces::BlockRef;
 using interfaces::BlockTemplate;
 using interfaces::BlockTip;
@@ -81,6 +82,7 @@ using interfaces::Handler;
 using interfaces::MakeSignalHandler;
 using interfaces::Mining;
 using interfaces::Node;
+using interfaces::Rpc;
 using interfaces::WalletLoader;
 using kernel::ChainstateRole;
 using node::BlockAssembler;
@@ -187,7 +189,7 @@ class NodeImpl : public Node
         args().WriteSettingsFile();
     }
     void mapPort(bool enable) override { StartMapPort(enable); }
-    bool getProxy(Network net, Proxy& proxy_info) override { return GetProxy(net, proxy_info); }
+    std::optional<Proxy> getProxy(Network net) override { return GetProxy(net); }
     size_t getNodeCount(ConnectionDirection flags) override
     {
         return m_context->connman ? m_context->connman->GetNodeCount(flags) : 0;
@@ -1015,6 +1017,24 @@ class MinerImpl : public Mining
     bool m_interrupt_mining{false};
     NodeContext& m_node;
 };
+
+class RpcImpl : public Rpc
+{
+public:
+    explicit RpcImpl(NodeContext& node) : m_node(node) {}
+
+    UniValue executeRpc(UniValue request, std::string uri, std::string user) override
+    {
+        JSONRPCRequest req;
+        req.context = &m_node;
+        req.URI = std::move(uri);
+        req.authUser = std::move(user);
+        HTTPStatusCode status;
+        return ExecuteHTTPRPC(request, req, status);
+    }
+
+    NodeContext& m_node;
+};
 } // namespace
 } // namespace node
 
@@ -1034,4 +1054,5 @@ std::unique_ptr<Mining> MakeMining(node::NodeContext& context, bool wait_loaded)
     }
     return std::make_unique<node::MinerImpl>(context);
 }
+std::unique_ptr<Rpc> MakeRpc(node::NodeContext& context) { return std::make_unique<node::RpcImpl>(context); }
 } // namespace interfaces
diff --git a/src/node/kernel_notifications.h b/src/node/kernel_notifications.h
index b90248bf0ab0..b152e7a476ae 100644
--- a/src/node/kernel_notifications.h
+++ b/src/node/kernel_notifications.h
@@ -8,7 +8,6 @@
 #include <kernel/notifications_interface.h>
 
 #include <sync.h>
-#include <threadsafety.h>
 #include <uint256.h>
 
 #include <atomic>
diff --git a/src/node/psbt.cpp b/src/node/psbt.cpp
index faedf0b6aabf..9d79b42f29a2 100644
--- a/src/node/psbt.cpp
+++ b/src/node/psbt.cpp
@@ -116,8 +116,7 @@ PSBTAnalysis AnalyzePSBT(PartiallySignedTransaction psbtx)
 
         // Estimate the size
         CMutableTransaction mtx(*psbtx.tx);
-        CCoinsView view_dummy;
-        CCoinsViewCache view(&view_dummy);
+        CCoinsViewCache view{&CoinsViewEmpty::Get()};
         bool success = true;
 
         for (unsigned int i = 0; i < psbtx.tx->vin.size(); ++i) {
diff --git a/src/node/utxo_snapshot.cpp b/src/node/utxo_snapshot.cpp
index e5997b7b65bb..4b61a76c6eb6 100644
--- a/src/node/utxo_snapshot.cpp
+++ b/src/node/utxo_snapshot.cpp
@@ -15,7 +15,6 @@
 #include <cassert>
 #include <cstdio>
 #include <optional>
-#include <span>
 #include <string>
 
 namespace node {
diff --git a/src/noui.cpp b/src/noui.cpp
index 327e17f8dbf2..6f33b22728d5 100644
--- a/src/noui.cpp
+++ b/src/noui.cpp
@@ -5,19 +5,17 @@
 
 #include <noui.h>
 
+#include <btcsignals.h>
 #include <logging.h>
 #include <node/interface_ui.h>
 #include <util/translation.h>
 
 #include <string>
 
-#include <boost/signals2/connection.hpp>
-#include <boost/signals2/signal.hpp>
-
 /** Store connections so we can disconnect them when suppressing output */
-boost::signals2::connection noui_ThreadSafeMessageBoxConn;
-boost::signals2::connection noui_ThreadSafeQuestionConn;
-boost::signals2::connection noui_InitMessageConn;
+btcsignals::connection noui_ThreadSafeMessageBoxConn;
+btcsignals::connection noui_ThreadSafeQuestionConn;
+btcsignals::connection noui_InitMessageConn;
 
 bool noui_ThreadSafeMessageBox(const bilingual_str& message, unsigned int style)
 {
diff --git a/src/policy/fees/block_policy_estimator.h b/src/policy/fees/block_policy_estimator.h
index 026bf1eb8420..f015bd5b6832 100644
--- a/src/policy/fees/block_policy_estimator.h
+++ b/src/policy/fees/block_policy_estimator.h
@@ -9,7 +9,6 @@
 #include <policy/feerate.h>
 #include <random.h>
 #include <sync.h>
-#include <threadsafety.h>
 #include <uint256.h>
 #include <util/fs.h>
 #include <validationinterface.h>
diff --git a/src/policy/policy.cpp b/src/policy/policy.cpp
index 46ec238c3b18..83ceb63cbcd7 100644
--- a/src/policy/policy.cpp
+++ b/src/policy/policy.cpp
@@ -18,6 +18,7 @@
 #include <script/solver.h>
 #include <serialize.h>
 #include <span.h>
+#include <tinyformat.h>
 
 #include <algorithm>
 #include <cstddef>
@@ -210,14 +211,16 @@ static bool CheckSigopsBIP54(const CTransaction& tx, const CCoinsViewCache& inpu
  *
  * We also check the total number of non-witness sigops across the whole transaction, as per BIP54.
  */
-bool AreInputsStandard(const CTransaction& tx, const CCoinsViewCache& mapInputs)
+TxValidationState ValidateInputsStandardness(const CTransaction& tx, const CCoinsViewCache& mapInputs)
 {
+    TxValidationState state;
     if (tx.IsCoinBase()) {
-        return true; // Coinbases don't use vin normally
+        return state; // Coinbases don't use vin normally
     }
 
     if (!CheckSigopsBIP54(tx, mapInputs)) {
-        return false;
+        state.Invalid(TxValidationResult::TX_INPUTS_NOT_STANDARD, "bad-txns-nonstandard-inputs", "non-witness sigops exceed bip54 limit");
+        return state;
     }
 
     for (unsigned int i = 0; i < tx.vin.size(); i++) {
@@ -225,27 +228,38 @@ bool AreInputsStandard(const CTransaction& tx, const CCoinsViewCache& mapInputs)
 
         std::vector<std::vector<unsigned char> > vSolutions;
         TxoutType whichType = Solver(prev.scriptPubKey, vSolutions);
-        if (whichType == TxoutType::NONSTANDARD || whichType == TxoutType::WITNESS_UNKNOWN) {
+        if (whichType == TxoutType::NONSTANDARD) {
+            state.Invalid(TxValidationResult::TX_INPUTS_NOT_STANDARD, "bad-txns-nonstandard-inputs", strprintf("input %u script unknown", i));
+            return state;
+        } else if (whichType == TxoutType::WITNESS_UNKNOWN) {
             // WITNESS_UNKNOWN failures are typically also caught with a policy
             // flag in the script interpreter, but it can be helpful to catch
             // this type of NONSTANDARD transaction earlier in transaction
             // validation.
-            return false;
+            state.Invalid(TxValidationResult::TX_INPUTS_NOT_STANDARD, "bad-txns-nonstandard-inputs", strprintf("input %u witness program is undefined", i));
+            return state;
         } else if (whichType == TxoutType::SCRIPTHASH) {
             std::vector<std::vector<unsigned char> > stack;
+            ScriptError serror;
             // convert the scriptSig into a stack, so we can inspect the redeemScript
-            if (!EvalScript(stack, tx.vin[i].scriptSig, SCRIPT_VERIFY_NONE, BaseSignatureChecker(), SigVersion::BASE))
-                return false;
-            if (stack.empty())
-                return false;
+            if (!EvalScript(stack, tx.vin[i].scriptSig, SCRIPT_VERIFY_NONE, BaseSignatureChecker(), SigVersion::BASE, &serror)) {
+                state.Invalid(TxValidationResult::TX_INPUTS_NOT_STANDARD, "bad-txns-nonstandard-inputs", strprintf("p2sh scriptsig malformed (input %u: %s)", i, ScriptErrorString(serror)));
+                return state;
+            }
+            if (stack.empty()) {
+                state.Invalid(TxValidationResult::TX_INPUTS_NOT_STANDARD, "bad-txns-nonstandard-inputs", strprintf("input %u P2SH redeemscript missing", i));
+                return state;
+            }
             CScript subscript(stack.back().begin(), stack.back().end());
-            if (subscript.GetSigOpCount(true) > MAX_P2SH_SIGOPS) {
-                return false;
+            unsigned int sigop_count = subscript.GetSigOpCount(true);
+            if (sigop_count > MAX_P2SH_SIGOPS) {
+                state.Invalid(TxValidationResult::TX_INPUTS_NOT_STANDARD, "bad-txns-nonstandard-inputs", strprintf("p2sh redeemscript sigops exceed limit (input %u: %u > %u)", i, sigop_count, MAX_P2SH_SIGOPS));
+                return state;
             }
         }
     }
 
-    return true;
+    return state;
 }
 
 bool IsWitnessStandard(const CTransaction& tx, const CCoinsViewCache& mapInputs)
@@ -354,7 +368,7 @@ bool SpendsNonAnchorWitnessProg(const CTransaction& tx, const CCoinsViewCache& p
         }
 
         // For P2SH extract the redeem script and check if it spends a non-Taproot witness program. Note
-        // this is fine to call EvalScript (as done in AreInputsStandard/IsWitnessStandard) because this
+        // this is fine to call EvalScript (as done in ValidateInputsStandardness/IsWitnessStandard) because this
         // function is only ever called after IsStandardTx, which checks the scriptsig is pushonly.
         if (prev_spk.IsPayToScriptHash()) {
             // If EvalScript fails or results in an empty stack, the transaction is invalid by consensus.
diff --git a/src/policy/policy.h b/src/policy/policy.h
index 0bc7b3277083..13bcf4cef750 100644
--- a/src/policy/policy.h
+++ b/src/policy/policy.h
@@ -8,6 +8,7 @@
 
 #include <consensus/amount.h>
 #include <consensus/consensus.h>
+#include <consensus/validation.h>
 #include <primitives/transaction.h>
 #include <script/interpreter.h>
 #include <script/solver.h>
@@ -95,8 +96,7 @@ static constexpr unsigned int MAX_DUST_OUTPUTS_PER_TX{1};
 
 /**
  * Mandatory script verification flags that all new transactions must comply with for
- * them to be valid. Failing one of these tests may trigger a DoS ban;
- * see CheckInputScripts() for details.
+ * them to be valid.
  *
  * Note that this does not affect consensus validity; see GetBlockScriptFlags()
  * for that.
@@ -157,11 +157,12 @@ static constexpr decltype(CTransaction::version) TX_MAX_STANDARD_VERSION{3};
 */
 bool IsStandardTx(const CTransaction& tx, const std::optional<unsigned>& max_datacarrier_bytes, bool permit_bare_multisig, const CFeeRate& dust_relay_fee, std::string& reason);
 /**
-* Check for standard transaction types
-* @param[in] mapInputs       Map of previous transactions that have outputs we're spending
-* @return True if all inputs (scriptSigs) use only standard transaction forms
-*/
-bool AreInputsStandard(const CTransaction& tx, const CCoinsViewCache& mapInputs);
+ * Check for standard transaction types
+ * @param[in] mapInputs       Map of previous transactions that have outputs we're spending
+ * @returns valid TxValidationState if all inputs (scriptSigs) use only standard transaction forms else returns
+ * invalid TxValidationState which states why the first invalid input is not standard
+ */
+TxValidationState ValidateInputsStandardness(const CTransaction& tx, const CCoinsViewCache& mapInputs);
 /**
 * Check if the transaction is over standard P2WSH resources limit:
 * 3600bytes witnessScript size, 80bytes per witness stack element, 100 witness stack elements
diff --git a/src/policy/rbf.h b/src/policy/rbf.h
index ad8a2dbfa3b9..0ba646ca8d13 100644
--- a/src/policy/rbf.h
+++ b/src/policy/rbf.h
@@ -7,7 +7,7 @@
 
 #include <consensus/amount.h>
 #include <primitives/transaction.h>
-#include <threadsafety.h>
+#include <sync.h>
 #include <txmempool.h>
 #include <util/feefrac.h>
 
diff --git a/src/prevector.h b/src/prevector.h
index d4d90c7350fb..91be488039ea 100644
--- a/src/prevector.h
+++ b/src/prevector.h
@@ -426,21 +426,8 @@ class prevector {
         }
     }
 
-    bool operator==(const prevector<N, T, Size, Diff>& other) const {
-        if (other.size() != size()) {
-            return false;
-        }
-        const_iterator b1 = begin();
-        const_iterator b2 = other.begin();
-        const_iterator e1 = end();
-        while (b1 != e1) {
-            if ((*b1) != (*b2)) {
-                return false;
-            }
-            ++b1;
-            ++b2;
-        }
-        return true;
+    constexpr bool operator==(const prevector& other) const {
+        return std::ranges::equal(*this, other);
     }
 
     bool operator<(const prevector<N, T, Size, Diff>& other) const {
diff --git a/src/primitives/block.cpp b/src/primitives/block.cpp
index dfeed29575cc..0e81b74d375b 100644
--- a/src/primitives/block.cpp
+++ b/src/primitives/block.cpp
@@ -9,7 +9,6 @@
 #include <tinyformat.h>
 
 #include <memory>
-#include <span>
 #include <sstream>
 
 uint256 CBlockHeader::GetHash() const
diff --git a/src/private_broadcast.cpp b/src/private_broadcast.cpp
index 3900f10a9324..9c107da60558 100644
--- a/src/private_broadcast.cpp
+++ b/src/private_broadcast.cpp
@@ -7,9 +7,6 @@
 
 #include <algorithm>
 
-/// If a transaction is not received back from the network for this duration
-/// after it is broadcast, then we consider it stale / for rebroadcasting.
-static constexpr auto STALE_DURATION{1min};
 
 bool PrivateBroadcast::Add(const CTransactionRef& tx)
     EXCLUSIVE_LOCKS_REQUIRED(!m_mutex)
@@ -25,7 +22,7 @@ std::optional<size_t> PrivateBroadcast::Remove(const CTransactionRef& tx)
     LOCK(m_mutex);
     const auto handle{m_transactions.extract(tx)};
     if (handle) {
-        const auto p{DerivePriority(handle.mapped())};
+        const auto p{DerivePriority(handle.mapped().send_statuses)};
         return p.num_confirmed;
     }
     return std::nullopt;
@@ -39,11 +36,11 @@ std::optional<CTransactionRef> PrivateBroadcast::PickTxForSend(const NodeId& wil
     const auto it{std::ranges::max_element(
             m_transactions,
             [](const auto& a, const auto& b) { return a < b; },
-            [](const auto& el) { return DerivePriority(el.second); })};
+            [](const auto& el) { return DerivePriority(el.second.send_statuses); })};
 
     if (it != m_transactions.end()) {
-        auto& [tx, sent_to]{*it};
-        sent_to.emplace_back(will_send_to_nodeid, will_send_to_address, NodeClock::now());
+        auto& [tx, state]{*it};
+        state.send_statuses.emplace_back(will_send_to_nodeid, will_send_to_address, NodeClock::now());
         return tx;
     }
 
@@ -93,12 +90,14 @@ std::vector<CTransactionRef> PrivateBroadcast::GetStale() const
     EXCLUSIVE_LOCKS_REQUIRED(!m_mutex)
 {
     LOCK(m_mutex);
-    const auto stale_time{NodeClock::now() - STALE_DURATION};
+    const auto now{NodeClock::now()};
     std::vector<CTransactionRef> stale;
-    for (const auto& [tx, send_status] : m_transactions) {
-        const Priority p{DerivePriority(send_status)};
-        if (p.last_confirmed < stale_time) {
-            stale.push_back(tx);
+    for (const auto& [tx, state] : m_transactions) {
+        const Priority p{DerivePriority(state.send_statuses)};
+        if (p.num_confirmed == 0) {
+            if (state.time_added < now - INITIAL_STALE_DURATION) stale.push_back(tx);
+        } else {
+            if (p.last_confirmed < now - STALE_DURATION) stale.push_back(tx);
         }
     }
     return stale;
@@ -111,13 +110,13 @@ std::vector<PrivateBroadcast::TxBroadcastInfo> PrivateBroadcast::GetBroadcastInf
     std::vector<TxBroadcastInfo> entries;
     entries.reserve(m_transactions.size());
 
-    for (const auto& [tx, sent_to] : m_transactions) {
+    for (const auto& [tx, state] : m_transactions) {
         std::vector<PeerSendInfo> peers;
-        peers.reserve(sent_to.size());
-        for (const auto& status : sent_to) {
+        peers.reserve(state.send_statuses.size());
+        for (const auto& status : state.send_statuses) {
             peers.emplace_back(PeerSendInfo{.address = status.address, .sent = status.picked, .received = status.confirmed});
         }
-        entries.emplace_back(TxBroadcastInfo{.tx = tx, .peers = std::move(peers)});
+        entries.emplace_back(TxBroadcastInfo{.tx = tx, .time_added = state.time_added, .peers = std::move(peers)});
     }
 
     return entries;
@@ -141,8 +140,8 @@ std::optional<PrivateBroadcast::TxAndSendStatusForNode> PrivateBroadcast::GetSen
     EXCLUSIVE_LOCKS_REQUIRED(m_mutex)
 {
     AssertLockHeld(m_mutex);
-    for (auto& [tx, sent_to] : m_transactions) {
-        for (auto& send_status : sent_to) {
+    for (auto& [tx, state] : m_transactions) {
+        for (auto& send_status : state.send_statuses) {
             if (send_status.nodeid == nodeid) {
                 return TxAndSendStatusForNode{.tx = tx, .send_status = send_status};
             }
diff --git a/src/private_broadcast.h b/src/private_broadcast.h
index 286344248d9c..b53a2cfb4d58 100644
--- a/src/private_broadcast.h
+++ b/src/private_broadcast.h
@@ -9,7 +9,6 @@
 #include <primitives/transaction.h>
 #include <primitives/transaction_identifier.h>
 #include <sync.h>
-#include <threadsafety.h>
 #include <util/time.h>
 
 #include <optional>
@@ -30,6 +29,15 @@
 class PrivateBroadcast
 {
 public:
+
+    /// If a transaction is not sent to any peer for this duration,
+    /// then we consider it stale / for rebroadcasting.
+    static constexpr auto INITIAL_STALE_DURATION{5min};
+
+    /// If a transaction is not received back from the network for this duration
+    /// after it is broadcast, then we consider it stale / for rebroadcasting.
+    static constexpr auto STALE_DURATION{1min};
+
     struct PeerSendInfo {
         CService address;
         NodeClock::time_point sent;
@@ -38,6 +46,7 @@ class PrivateBroadcast
 
     struct TxBroadcastInfo {
         CTransactionRef tx;
+        NodeClock::time_point time_added;
         std::vector<PeerSendInfo> peers;
     };
 
@@ -117,10 +126,14 @@ class PrivateBroadcast
 private:
     /// Status of a transaction sent to a given node.
     struct SendStatus {
-        const NodeId nodeid; /// Node to which the transaction will be sent (or was sent).
-        const CService address; /// Address of the node.
-        const NodeClock::time_point picked; ///< When was the transaction picked for sending to the node.
-        std::optional<NodeClock::time_point> confirmed; ///< When was the transaction reception confirmed by the node (by PONG).
+        /// Node to which the transaction will be sent (or was sent).
+        const NodeId nodeid;
+        /// Address of the node.
+        const CService address;
+        /// When was the transaction picked for sending to the node.
+        const NodeClock::time_point picked;
+        /// When was the transaction reception confirmed by the node (by PONG).
+        std::optional<NodeClock::time_point> confirmed;
 
         SendStatus(const NodeId& nodeid, const CService& address, const NodeClock::time_point& picked) : nodeid{nodeid}, address{address}, picked{picked} {}
     };
@@ -177,9 +190,12 @@ class PrivateBroadcast
      */
     std::optional<TxAndSendStatusForNode> GetSendStatusByNode(const NodeId& nodeid)
         EXCLUSIVE_LOCKS_REQUIRED(m_mutex);
-
+    struct TxSendStatus {
+        const NodeClock::time_point time_added{NodeClock::now()};
+        std::vector<SendStatus> send_statuses;
+    };
     mutable Mutex m_mutex;
-    std::unordered_map<CTransactionRef, std::vector<SendStatus>, CTransactionRefHash, CTransactionRefComp>
+    std::unordered_map<CTransactionRef, TxSendStatus, CTransactionRefHash, CTransactionRefComp>
         m_transactions GUARDED_BY(m_mutex);
 };
 
diff --git a/src/psbt.cpp b/src/psbt.cpp
index 4ee5f5bdd30d..58979152e659 100644
--- a/src/psbt.cpp
+++ b/src/psbt.cpp
@@ -600,8 +600,7 @@ std::string PSBTRoleName(PSBTRole role) {
     case PSBTRole::SIGNER: return "signer";
     case PSBTRole::FINALIZER: return "finalizer";
     case PSBTRole::EXTRACTOR: return "extractor";
-        // no default case, so the compiler can warn about missing cases
-    }
+    } // no default case, so the compiler can warn about missing cases
     assert(false);
 }
 
diff --git a/src/qt/bitcoin.cpp b/src/qt/bitcoin.cpp
index 92c815fe70e5..0b89c605b9ce 100644
--- a/src/qt/bitcoin.cpp
+++ b/src/qt/bitcoin.cpp
@@ -6,6 +6,7 @@
 
 #include <qt/bitcoin.h>
 
+#include <btcsignals.h>
 #include <chainparams.h>
 #include <common/args.h>
 #include <common/init.h>
@@ -44,7 +45,6 @@
 #include <wallet/types.h>
 #endif // ENABLE_WALLET
 
-#include <boost/signals2/connection.hpp>
 #include <chrono>
 #include <memory>
 
@@ -485,9 +485,9 @@ int GuiMain(int argc, char* argv[])
     util::ThreadSetInternalName("main");
 
     // Subscribe to global signals from core
-    boost::signals2::scoped_connection handler_message_box = ::uiInterface.ThreadSafeMessageBox_connect(noui_ThreadSafeMessageBox);
-    boost::signals2::scoped_connection handler_question = ::uiInterface.ThreadSafeQuestion_connect(noui_ThreadSafeQuestion);
-    boost::signals2::scoped_connection handler_init_message = ::uiInterface.InitMessage_connect(noui_InitMessage);
+    btcsignals::scoped_connection handler_message_box = ::uiInterface.ThreadSafeMessageBox_connect(noui_ThreadSafeMessageBox);
+    btcsignals::scoped_connection handler_question = ::uiInterface.ThreadSafeQuestion_connect(noui_ThreadSafeQuestion);
+    btcsignals::scoped_connection handler_init_message = ::uiInterface.InitMessage_connect(noui_InitMessage);
 
     // Do not refer to data directory yet, this can be overridden by Intro::pickDataDirectory
 
diff --git a/src/qt/bitcoin_locale.qrc b/src/qt/bitcoin_locale.qrc
index 23074147ac6a..93ee62b69863 100644
--- a/src/qt/bitcoin_locale.qrc
+++ b/src/qt/bitcoin_locale.qrc
@@ -92,9 +92,11 @@
         <file alias="uz@Latn">locale/bitcoin_uz@Latn.qm</file>
         <file alias="ve">locale/bitcoin_ve.qm</file>
         <file alias="yi">locale/bitcoin_yi.qm</file>
+        <file alias="yo">locale/bitcoin_yo.qm</file>
         <file alias="yue">locale/bitcoin_yue.qm</file>
         <file alias="zh-Hans">locale/bitcoin_zh-Hans.qm</file>
         <file alias="zh-Hant">locale/bitcoin_zh-Hant.qm</file>
+        <file alias="zh">locale/bitcoin_zh.qm</file>
         <file alias="zh_CN">locale/bitcoin_zh_CN.qm</file>
         <file alias="zh_HK">locale/bitcoin_zh_HK.qm</file>
         <file alias="zh_TW">locale/bitcoin_zh_TW.qm</file>
diff --git a/src/qt/bitcoingui.cpp b/src/qt/bitcoingui.cpp
index 3100a055bb7f..96ea3f4a7060 100644
--- a/src/qt/bitcoingui.cpp
+++ b/src/qt/bitcoingui.cpp
@@ -796,9 +796,7 @@ void BitcoinGUI::addWallet(WalletModel* walletModel)
     connect(wallet_view, &WalletView::encryptionStatusChanged, this, &BitcoinGUI::updateWalletStatus);
     connect(wallet_view, &WalletView::incomingTransaction, this, &BitcoinGUI::incomingTransaction);
     connect(this, &BitcoinGUI::setPrivacy, wallet_view, &WalletView::setPrivacy);
-    const bool privacy = isPrivacyModeActivated();
-    wallet_view->setPrivacy(privacy);
-    enableHistoryAction(privacy);
+    wallet_view->setPrivacy(isPrivacyModeActivated());
     const QString display_name = walletModel->getDisplayName();
     m_wallet_selector->addItem(display_name, QVariant::fromValue(walletModel));
 }
@@ -857,7 +855,7 @@ void BitcoinGUI::setWalletActionsEnabled(bool enabled)
     overviewAction->setEnabled(enabled);
     sendCoinsAction->setEnabled(enabled);
     receiveCoinsAction->setEnabled(enabled);
-    historyAction->setEnabled(enabled);
+    historyAction->setEnabled(enabled && !isPrivacyModeActivated());
     encryptWalletAction->setEnabled(enabled);
     backupWalletAction->setEnabled(enabled);
     changePassphraseAction->setEnabled(enabled);
diff --git a/src/qt/clientmodel.cpp b/src/qt/clientmodel.cpp
index cd7d9e325879..8c1598e702ba 100644
--- a/src/qt/clientmodel.cpp
+++ b/src/qt/clientmodel.cpp
@@ -287,10 +287,11 @@ void ClientModel::unsubscribeFromCoreSignals()
 
 bool ClientModel::getProxyInfo(std::string& ip_port) const
 {
-    Proxy ipv4, ipv6;
-    if (m_node.getProxy((Network) 1, ipv4) && m_node.getProxy((Network) 2, ipv6)) {
-      ip_port = ipv4.proxy.ToStringAddrPort();
-      return true;
+    const auto ipv4 = m_node.getProxy(NET_IPV4);
+    const auto ipv6 = m_node.getProxy(NET_IPV6);
+    if (ipv4 && ipv6) {
+        ip_port = ipv4->proxy.ToStringAddrPort();
+        return true;
     }
     return false;
 }
diff --git a/src/qt/locale/bitcoin_am.ts b/src/qt/locale/bitcoin_am.ts
index 64ce62b913ff..657ffa90121a 100644
--- a/src/qt/locale/bitcoin_am.ts
+++ b/src/qt/locale/bitcoin_am.ts
@@ -690,10 +690,24 @@ The migration process will create a backup of the wallet before migrating. This
     </context>
 <context>
     <name>PSBTOperationsDialog</name>
+    <message numerus="yes">
+        <source>Signed %n input(s), but more signatures are still required.</source>
+        <translation type="unfinished">
+            <numerusform />
+            <numerusform />
+        </translation>
+    </message>
     <message>
         <source>Sends %1 to %2</source>
         <translation type="unfinished">%1 ወደ %2 ይልካል</translation>
     </message>
+    <message numerus="yes">
+        <source>Transaction has %n unsigned input(s).</source>
+        <translation type="unfinished">
+            <numerusform />
+            <numerusform />
+        </translation>
+    </message>
     </context>
 <context>
     <name>PeerTableModel</name>
diff --git a/src/qt/locale/bitcoin_ar.ts b/src/qt/locale/bitcoin_ar.ts
index 317bc1dd81f1..0263c2052440 100644
--- a/src/qt/locale/bitcoin_ar.ts
+++ b/src/qt/locale/bitcoin_ar.ts
@@ -1,10 +1,6 @@
 <TS version="2.1" language="ar">
 <context>
     <name>AddressBookPage</name>
-    <message>
-        <source>Right-click to edit address or label</source>
-        <translation type="unfinished"> انقر زر الماوس الأيمن لتعديل العنوان أو المسمي</translation>
-    </message>
     <message>
         <source>Create a new address</source>
         <translation type="unfinished"> إنشاء عنوان جديد</translation>
@@ -21,15 +17,39 @@
         <source>Copy the currently selected address to the clipboard</source>
         <translation type="unfinished">آدرس انتخاب شده فعلی را در کلیپ بورد کپی کنید</translation>
     </message>
+    <message>
+        <source>Export the data in the current tab to a file</source>
+        <translation type="unfinished">تصدير البيانات الموجودة في علامة التبويب الحالية إلى ملف</translation>
+    </message>
+    <message>
+        <source>&amp;Export</source>
+        <translation type="unfinished">&amp; يصدّر</translation>
+    </message>
     <message>
         <source>&amp;Delete</source>
         <translation type="unfinished">حذف</translation>
     </message>
+    <message>
+        <source>Choose the address to send coins to</source>
+        <translation type="unfinished">اختر العنوان لإرسال العملات إليه.</translation>
+    </message>
+    <message>
+        <source>Choose the address to receive coins with</source>
+        <translation type="unfinished">اختر العنوان لاستلام العملات المعدنية به</translation>
+    </message>
+    <message>
+        <source>These are your Bitcoin addresses for sending payments. Always check the amount and the receiving address before sending coins.</source>
+        <translation type="unfinished">هذه هي عناوين بيتكوين الخاصة بك لإرسال المدفوعات. تأكد دائمًا من المبلغ وعنوان الاستلام قبل إرسال العملات.</translation>
+    </message>
     <message>
         <source>These are your Bitcoin addresses for receiving payments. Use the 'Create new receiving address' button in the receive tab to create new addresses.
 Signing is only possible with addresses of the type 'legacy'.</source>
         <translation type="unfinished">هذه هي العناوين الخاصة بها بك. استخدم زر "إنشاء عنوان استقبال جديد" في علامة استلام البريد الإلكتروني عناوين جديدة.التوقيع ممكن فقط مع عناوين نوع "إرث" .</translation>
     </message>
+    <message>
+        <source>Receiving addresses - %1</source>
+        <translation type="unfinished">عناوين الاستلام - %1</translation>
+    </message>
     </context>
 <context>
     <name>AskPassphraseDialog</name>
@@ -41,7 +61,38 @@ Signing is only possible with addresses of the type 'legacy'.</source>
         <source>Back</source>
         <translation type="unfinished">رجوع</translation>
     </message>
-    </context>
+    <message>
+        <source>IMPORTANT: Any previous backups you have made of your wallet file should be replaced with the newly generated, encrypted wallet file. For security reasons, previous backups of the unencrypted wallet file will become useless as soon as you start using the new, encrypted wallet.</source>
+        <translation type="unfinished">هام: يجب استبدال أي نسخ احتياطية سابقة لملف محفظتك بملف المحفظة المُشفّر المُنشأ حديثًا. لأسباب أمنية، ستصبح النسخ الاحتياطية السابقة لملف المحفظة غير المُشفّر عديمة الفائدة بمجرد بدء استخدام المحفظة الجديدة المُشفّرة.</translation>
+    </message>
+    <message>
+        <source>Wallet encryption failed</source>
+        <translation type="unfinished">فشل تشفير المحفظة</translation>
+    </message>
+    <message>
+        <source>Wallet encryption failed due to an internal error. Your wallet was not encrypted.</source>
+        <translation type="unfinished">فشل تشفير المحفظة بسبب خطأ داخلي. لم يتم تشفير محفظتك.</translation>
+    </message>
+    <message>
+        <source>The passphrase entered for the wallet decryption is incorrect. It contains a null character (ie - a zero byte). If the passphrase was set with a version of this software prior to 25.0, please try again with only the characters up to — but not including — the first null character. If this is successful, please set a new passphrase to avoid this issue in the future.</source>
+        <translation type="unfinished">عبارة المرور المُدخلة لفك تشفير المحفظة غير صحيحة. تحتوي على حرف فارغ (أي بايت صفري). إذا تم ضبط عبارة المرور مع إصدار من هذا البرنامج أقدم من 25.0، يُرجى إعادة المحاولة باستخدام الأحرف حتى الحرف الفارغ الأول فقط، ولكن دون تضمينه. في حال نجاح ذلك، يُرجى تعيين عبارة مرور جديدة لتجنب هذه المشكلة في المستقبل.</translation>
+    </message>
+    <message>
+        <source>The old passphrase entered for the wallet decryption is incorrect. It contains a null character (ie - a zero byte). If the passphrase was set with a version of this software prior to 25.0, please try again with only the characters up to — but not including — the first null character.</source>
+        <translation type="unfinished">عبارة المرور القديمة المُدخلة لفك تشفير المحفظة غير صحيحة. تحتوي على حرف فارغ (أي بايت صفري). إذا كانت عبارة المرور مُعدّة بإصدار أقدم من هذا البرنامج 25.0، يُرجى إعادة المحاولة باستخدام الأحرف حتى الحرف الفارغ الأول فقط، ولكن دون تضمينه.</translation>
+    </message>
+    <message>
+        <source>Warning: The Caps Lock key is on!</source>
+        <translation type="unfinished">تحذير: مفتاح Caps Lock قيد التشغيل!</translation>
+    </message>
+</context>
+<context>
+    <name>BanTableModel</name>
+    <message>
+        <source>Banned Until</source>
+        <translation type="unfinished">محظور حتى</translation>
+    </message>
+</context>
 <context>
     <name>QObject</name>
     <message>
@@ -349,6 +400,10 @@ Signing is only possible with addresses of the type 'legacy'.</source>
         <source>Close All Wallets…</source>
         <translation type="unfinished">اغلاق جميع المحافظ</translation>
     </message>
+    <message>
+        <source>Restore and Migrate Wallet File…</source>
+        <translation type="unfinished">استعادة ملف المحفظة وترحيله...</translation>
+    </message>
     <message>
         <source>&amp;File</source>
         <translation type="unfinished">&amp;ملف</translation>
@@ -379,19 +434,19 @@ Signing is only possible with addresses of the type 'legacy'.</source>
     </message>
     <message>
         <source>Connecting to peers…</source>
-        <translation type="unfinished">‫الاتصال بالأقران…‬</translation>
+        <translation type="unfinished">الاتصال بالأقران ...</translation>
     </message>
     <message>
         <source>Request payments (generates QR codes and bitcoin: URIs)</source>
-        <translation type="unfinished">‫أطلب مدفوعات (أنشئ رموز استجابة (QR Codes) وعناوين بتكوين)‬</translation>
+        <translation type="unfinished">أطلب دفعات (يولد كودات الرمز المربع وبيت كوين: العناوين المعطاة)</translation>
     </message>
     <message>
         <source>Show the list of used sending addresses and labels</source>
-        <translation type="unfinished">‫عرض قائمة العناوين المرسِلة والمذكرات (المستخدمة سابقا)‬</translation>
+        <translation type="unfinished">عرض قائمة عناوين الإرسال المستخدمة والملصقات</translation>
     </message>
     <message>
         <source>Show the list of used receiving addresses and labels</source>
-        <translation type="unfinished">‫عرض قائمة العناوين المستلمة والمذكرات (المستخدمة سابقا)‬</translation>
+        <translation type="unfinished">عرض قائمة عناوين الإستقبال المستخدمة والملصقات</translation>
     </message>
     <message>
         <source>&amp;Command-line options</source>
@@ -410,19 +465,19 @@ Signing is only possible with addresses of the type 'legacy'.</source>
     </message>
     <message>
         <source>%1 behind</source>
-        <translation type="unfinished">‫متأخر‬ %1</translation>
+        <translation type="unfinished">خلف %1</translation>
     </message>
     <message>
         <source>Catching up…</source>
-        <translation type="unfinished">‫يجري التدارك…‬</translation>
+        <translation type="unfinished">يمسك…</translation>
     </message>
     <message>
         <source>Last received block was generated %1 ago.</source>
-        <translation type="unfinished">‫آخر طابق مستلم تم بناءه قبل %1.</translation>
+        <translation type="unfinished">تم توليد الكتلة المستقبلة الأخيرة منذ %1.</translation>
     </message>
     <message>
         <source>Transactions after this will not yet be visible.</source>
-        <translation type="unfinished">‫المعاملات بعد هذه لن تكون ظاهرة فورا.‬</translation>
+        <translation type="unfinished">المعاملات بعد ذلك لن تكون مريئة بعد.</translation>
     </message>
     <message>
         <source>Error</source>
@@ -438,11 +493,11 @@ Signing is only possible with addresses of the type 'legacy'.</source>
     </message>
     <message>
         <source>Up to date</source>
-        <translation type="unfinished">‫حديث‬</translation>
+        <translation type="unfinished">محدث</translation>
     </message>
     <message>
         <source>Load Partially Signed Bitcoin Transaction</source>
-        <translation type="unfinished">‫تحميل معاملة بتكوين موقعة جزئيًا (PSBT)‬</translation>
+        <translation type="unfinished">تحميل معاملة بتكوين الموقعة جزئيًا</translation>
     </message>
     <message>
         <source>Load PSBT from &amp;clipboard…</source>
@@ -494,10 +549,6 @@ Signing is only possible with addresses of the type 'legacy'.</source>
         <extracomment>Status tip for Restore Wallet menu item</extracomment>
         <translation type="unfinished">‫استعادة محفظة من ملف النسخ الاحتياطي‬</translation>
     </message>
-    <message>
-        <source>Close all wallets</source>
-        <translation type="unfinished">‫إغلاق جميع المحافظ‬</translation>
-    </message>
     <message>
         <source>Show the %1 help message to get a list with possible Bitcoin command-line options</source>
         <translation type="unfinished">‫اعرض %1 رسالة المساعدة للحصول على قائمة من خيارات سطر أوامر البتكوين المحتملة‬</translation>
@@ -524,6 +575,11 @@ Signing is only possible with addresses of the type 'legacy'.</source>
         <extracomment>The title for Restore Wallet File Windows</extracomment>
         <translation type="unfinished">‫تحميل النسخة الاحتياطية لمحفظة‬</translation>
     </message>
+    <message>
+        <source>Restore Wallet</source>
+        <extracomment>Title of pop-up window shown when the user is attempting to restore a wallet.</extracomment>
+        <translation type="unfinished">استعادة المحفظة</translation>
+    </message>
     <message>
         <source>Wallet Name</source>
         <extracomment>Label of the input field where the name of the wallet is entered.</extracomment>
@@ -531,7 +587,7 @@ Signing is only possible with addresses of the type 'legacy'.</source>
     </message>
     <message>
         <source>&amp;Window</source>
-        <translation type="unfinished">&amp;نافذة</translation>
+        <translation type="unfinished">‫&amp;نافذة‬</translation>
     </message>
     <message>
         <source>Zoom</source>
@@ -593,17 +649,65 @@ Signing is only possible with addresses of the type 'legacy'.</source>
         <source>Error: %1</source>
         <translation type="unfinished">خطأ: %1</translation>
     </message>
+    <message>
+        <source>Date: %1
+</source>
+        <translation type="unfinished">التاريخ %1
+</translation>
+    </message>
+    <message>
+        <source>Amount: %1
+</source>
+        <translation type="unfinished">القيمة %1
+</translation>
+    </message>
+    <message>
+        <source>Wallet: %1
+</source>
+        <translation type="unfinished">المحفظة:  %1
+</translation>
+    </message>
+    <message>
+        <source>Type: %1
+</source>
+        <translation type="unfinished">النوع %1
+</translation>
+    </message>
+    <message>
+        <source>Label: %1
+</source>
+        <translation type="unfinished">‫المذكرة‬: %1
+</translation>
+    </message>
+    <message>
+        <source>Address: %1
+</source>
+        <translation type="unfinished">العنوان %1
+</translation>
+    </message>
+    <message>
+        <source>Sent transaction</source>
+        <translation type="unfinished">‫العمليات المرسلة‬</translation>
+    </message>
+    <message>
+        <source>Incoming transaction</source>
+        <translation type="unfinished">‫العمليات الواردة‬</translation>
+    </message>
     <message>
         <source>Private key &lt;b&gt;disabled&lt;/b&gt;</source>
         <translation type="unfinished">المفتاح الخاص &lt;b&gt;معطل&lt;/b&gt;</translation>
     </message>
+    <message>
+        <source>Wallet is &lt;b&gt;encrypted&lt;/b&gt; and currently &lt;b&gt;unlocked&lt;/b&gt;</source>
+        <translation type="unfinished">المحفظة &lt;b&gt;مشفرة&lt;/b&gt; و &lt;b&gt;مفتوحة&lt;/b&gt; حاليا</translation>
+    </message>
+    <message>
+        <source>Wallet is &lt;b&gt;encrypted&lt;/b&gt; and currently &lt;b&gt;locked&lt;/b&gt;</source>
+        <translation type="unfinished">المحفظة &lt;b&gt;مشفرة&lt;/b&gt; و &lt;b&gt;مقفلة&lt;/b&gt; حاليا</translation>
+    </message>
     </context>
 <context>
     <name>CoinControlDialog</name>
-    <message>
-        <source>After Fee:</source>
-        <translation type="unfinished">بعد الرسوم:</translation>
-    </message>
     <message>
         <source>Change:</source>
         <translation type="unfinished">تعديل:</translation>
@@ -632,10 +736,6 @@ Signing is only possible with addresses of the type 'legacy'.</source>
         <source>Received with address</source>
         <translation type="unfinished">‫مستلم مع عنوان‬</translation>
     </message>
-    <message>
-        <source>Date</source>
-        <translation type="unfinished">التاريخ</translation>
-    </message>
     <message>
         <source>Confirmations</source>
         <translation type="unfinished">التأكيدات</translation>
@@ -650,11 +750,11 @@ Signing is only possible with addresses of the type 'legacy'.</source>
     </message>
     <message>
         <source>&amp;Copy address</source>
-        <translation type="unfinished">‫&amp;نسخ العنوان‬</translation>
+        <translation type="unfinished">‫&amp;انسخ العنوان‬</translation>
     </message>
     <message>
         <source>Copy &amp;label</source>
-        <translation type="unfinished">‫نسخ &amp;اضافة مذكرة‬</translation>
+        <translation type="unfinished">‫نسخ &amp;مذكرة‬</translation>
     </message>
     <message>
         <source>Copy &amp;amount</source>
@@ -773,6 +873,61 @@ Signing is only possible with addresses of the type 'legacy'.</source>
         <translation type="unfinished">مجمعة بدون دعم توقيع خارجي (مطلوب للتوقيع الخارجي)</translation>
     </message>
 </context>
+<context>
+    <name>EditAddressDialog</name>
+    <message>
+        <source>Edit Address</source>
+        <translation type="unfinished">تعديل العنوان</translation>
+    </message>
+    <message>
+        <source>&amp;Label</source>
+        <translation type="unfinished">&amp;وصف</translation>
+    </message>
+    <message>
+        <source>The label associated with this address list entry</source>
+        <translation type="unfinished">الملصق المرتبط بقائمة العناوين المدخلة</translation>
+    </message>
+    <message>
+        <source>The address associated with this address list entry. This can only be modified for sending addresses.</source>
+        <translation type="unfinished">العنوان المرتبط بقائمة العناوين المدخلة. و التي يمكن تعديلها فقط بواسطة ارسال العناوين</translation>
+    </message>
+    <message>
+        <source>&amp;Address</source>
+        <translation type="unfinished">&amp;العنوان</translation>
+    </message>
+    <message>
+        <source>New sending address</source>
+        <translation type="unfinished">عنوان إرسال جديد</translation>
+    </message>
+    <message>
+        <source>Edit receiving address</source>
+        <translation type="unfinished">تعديل عنوان الأستلام</translation>
+    </message>
+    <message>
+        <source>Edit sending address</source>
+        <translation type="unfinished">تعديل عنوان الارسال</translation>
+    </message>
+    <message>
+        <source>The entered address "%1" is not a valid Bitcoin address.</source>
+        <translation type="unfinished">العنوان المدخل "%1" ليس عنوان بيت كوين صحيح.</translation>
+    </message>
+    <message>
+        <source>Address "%1" already exists as a receiving address with label "%2" and so cannot be added as a sending address.</source>
+        <translation type="unfinished">العنوان "%1" موجود بالفعل كعنوان إستقبال تحت مسمى "%2" ولذلك لا يمكن إضافته كعنوان إرسال.</translation>
+    </message>
+    <message>
+        <source>The entered address "%1" is already in the address book with label "%2".</source>
+        <translation type="unfinished">العنوان المدخل  "%1" موجود بالفعل في سجل العناوين تحت مسمى " "%2".</translation>
+    </message>
+    <message>
+        <source>Could not unlock wallet.</source>
+        <translation type="unfinished"> يمكن فتح المحفظة.</translation>
+    </message>
+    <message>
+        <source>New key generation failed.</source>
+        <translation type="unfinished">فشل توليد مفتاح جديد.</translation>
+    </message>
+</context>
 <context>
     <name>Intro</name>
     <message numerus="yes">
@@ -820,17 +975,17 @@ Signing is only possible with addresses of the type 'legacy'.</source>
             <numerusform>(sufficient to restore backups %n day(s) old)</numerusform>
         </translation>
     </message>
-    <message>
-        <source>Error</source>
-        <translation type="unfinished">خطأ</translation>
-    </message>
-</context>
+    </context>
 <context>
     <name>ModalOverlay</name>
     <message>
         <source>Form</source>
         <translation type="unfinished">نمودج</translation>
     </message>
+    <message>
+        <source>%1 is currently syncing.  It will download headers and blocks from peers and validate them until reaching the tip of the block chain.</source>
+        <translation type="unfinished">%1 يتم المزامنة حاليًا. سيقوم بتنزيل رؤوس الكتل والكتل من الأقران والتحقق منها حتى يصل إلى نهاية سلسلة الكتل.</translation>
+    </message>
     </context>
 <context>
     <name>OptionsDialog</name>
@@ -1168,11 +1323,11 @@ Signing is only possible with addresses of the type 'legacy'.</source>
     <name>PSBTOperationsDialog</name>
     <message>
         <source>Sign Tx</source>
-        <translation type="unfinished">تسجيل Tx</translation>
+        <translation type="unfinished">‫توقيع العملية‬</translation>
     </message>
     <message>
         <source>Broadcast Tx</source>
-        <translation type="unfinished">بث TX</translation>
+        <translation type="unfinished">‫بث العملية‬</translation>
     </message>
     <message>
         <source>Copy to Clipboard</source>
@@ -1180,7 +1335,7 @@ Signing is only possible with addresses of the type 'legacy'.</source>
     </message>
     <message>
         <source>Save…</source>
-        <translation type="unfinished">حفظ ...</translation>
+        <translation type="unfinished">‫حفظ…‬</translation>
     </message>
     <message>
         <source>Close</source>
@@ -1188,43 +1343,54 @@ Signing is only possible with addresses of the type 'legacy'.</source>
     </message>
     <message>
         <source>Failed to load transaction: %1</source>
-        <translation type="unfinished">فشل تحميل المعاملة: %1</translation>
+        <translation type="unfinished">‫فشل تحميل العملية: %1‬</translation>
     </message>
     <message>
         <source>Failed to sign transaction: %1</source>
         <translation type="unfinished">فشل توقيع المعاملة: %1</translation>
     </message>
+    <message>
+        <source>Cannot sign inputs while wallet is locked.</source>
+        <translation type="unfinished">‫لا يمكن توقيع المدخلات والمحفظة مقفلة.‬</translation>
+    </message>
     <message>
         <source>Could not sign any more inputs.</source>
         <translation type="unfinished">تعذر توقيع المزيد من المدخلات.</translation>
     </message>
-    <message>
-        <source>Signed %1 inputs, but more signatures are still required.</source>
-        <translation type="unfinished">تم توقيع %1 إدخالات، ولكن لا تزال هناك حاجة إلى المزيد من التوقيعات.</translation>
+    <message numerus="yes">
+        <source>Signed %n input(s), but more signatures are still required.</source>
+        <translation type="unfinished">
+            <numerusform />
+            <numerusform />
+            <numerusform />
+            <numerusform />
+            <numerusform />
+            <numerusform />
+        </translation>
     </message>
     <message>
         <source>Signed transaction successfully. Transaction is ready to broadcast.</source>
-        <translation type="unfinished">تم توقيع المعاملة بنجاح. المعاملة جاهزة للبث.</translation>
+        <translation type="unfinished">‫تم توقيع المعاملة بنجاح. العملية جاهزة للبث.‬</translation>
     </message>
     <message>
         <source>Unknown error processing transaction.</source>
-        <translation type="unfinished">خطأ غير معروف في معالجة المعاملة.</translation>
+        <translation type="unfinished">‫خطأ غير معروف في معالجة العملية.‬</translation>
     </message>
     <message>
         <source>Transaction broadcast successfully! Transaction ID: %1</source>
-        <translation type="unfinished">تم بث المعاملة بنجاح! معرّف المعاملة: %1</translation>
+        <translation type="unfinished">‫تم بث العملية بنجاح! معرّف العملية: %1‬</translation>
     </message>
     <message>
         <source>Transaction broadcast failed: %1</source>
-        <translation type="unfinished">فشل بث المعاملة: %1</translation>
+        <translation type="unfinished">‫فشل بث العملية: %1‬</translation>
     </message>
     <message>
         <source>PSBT copied to clipboard.</source>
-        <translation type="unfinished">نسخ PSBT إلى الحافظة.</translation>
+        <translation type="unfinished">‫نسخ المعاملة الموقعة جزئيا إلى الحافظة.‬</translation>
     </message>
     <message>
         <source>Save Transaction Data</source>
-        <translation type="unfinished">حفظ بيانات المعاملات</translation>
+        <translation type="unfinished">حفظ بيانات العملية</translation>
     </message>
     <message>
         <source>Partially Signed Transaction (Binary)</source>
@@ -1233,7 +1399,7 @@ Signing is only possible with addresses of the type 'legacy'.</source>
     </message>
     <message>
         <source>PSBT saved to disk.</source>
-        <translation type="unfinished">تم حفظ PSBT على القرص.</translation>
+        <translation type="unfinished">‫تم حفظ المعاملة الموقعة جزئيا على وحدة التخزين.‬</translation>
     </message>
     <message>
         <source>own address</source>
@@ -1255,9 +1421,16 @@ Signing is only possible with addresses of the type 'legacy'.</source>
         <source>or</source>
         <translation type="unfinished">أو</translation>
     </message>
-    <message>
-        <source>Transaction has %1 unsigned inputs.</source>
-        <translation type="unfinished">‫المعاملة تحتوي على %1 من المدخلات غير موقعة.‬</translation>
+    <message numerus="yes">
+        <source>Transaction has %n unsigned input(s).</source>
+        <translation type="unfinished">
+            <numerusform />
+            <numerusform />
+            <numerusform />
+            <numerusform />
+            <numerusform />
+            <numerusform />
+        </translation>
     </message>
     <message>
         <source>Transaction is missing some information about inputs.</source>
@@ -1325,6 +1498,11 @@ If you are receiving this error you should request the merchant provide a BIP21
 </context>
 <context>
     <name>PeerTableModel</name>
+    <message>
+        <source>User Agent</source>
+        <extracomment>Title of Peers Table column which contains the peer's User Agent string.</extracomment>
+        <translation type="unfinished">وكيل المستخدم</translation>
+    </message>
     <message>
         <source>Ping</source>
         <extracomment>Title of Peers Table column which indicates the current latency of the connection with the peer.</extracomment>
@@ -1350,11 +1528,26 @@ If you are receiving this error you should request the merchant provide a BIP21
         <extracomment>Title of Peers Table column which indicates the total amount of network information we have sent to the peer.</extracomment>
         <translation type="unfinished">تم الإرسال</translation>
     </message>
+    <message>
+        <source>Received</source>
+        <extracomment>Title of Peers Table column which indicates the total amount of network information we have received from the peer.</extracomment>
+        <translation type="unfinished">‫مستلم‬</translation>
+    </message>
+    <message>
+        <source>Address</source>
+        <extracomment>Title of Peers Table column which contains the IP/Onion/I2P address of the connected peer.</extracomment>
+        <translation type="unfinished">العنوان</translation>
+    </message>
     <message>
         <source>Type</source>
         <extracomment>Title of Peers Table column which describes the type of peer connection. The "type" describes why the connection exists.</extracomment>
         <translation type="unfinished">النوع</translation>
     </message>
+    <message>
+        <source>Network</source>
+        <extracomment>Title of Peers Table column which states the network the peer connected through.</extracomment>
+        <translation type="unfinished">الشبكة</translation>
+    </message>
     <message>
         <source>Inbound</source>
         <extracomment>An Inbound Connection from a Peer.</extracomment>
@@ -1395,6 +1588,10 @@ If you are receiving this error you should request the merchant provide a BIP21
     </context>
 <context>
     <name>ReceiveCoinsDialog</name>
+    <message>
+        <source>Copy &amp;label</source>
+        <translation type="unfinished">‫نسخ &amp;اضافة مذكرة‬</translation>
+    </message>
     <message>
         <source>Copy &amp;amount</source>
         <translation type="unfinished">‫نسخ &amp;القيمة‬</translation>
@@ -1409,6 +1606,10 @@ If you are receiving this error you should request the merchant provide a BIP21
     </context>
 <context>
     <name>RecentRequestsTableModel</name>
+    <message>
+        <source>Date</source>
+        <translation type="unfinished">التاريخ</translation>
+    </message>
     <message>
         <source>(no label)</source>
         <translation type="unfinished">(بدون وسم)</translation>
@@ -1428,10 +1629,18 @@ If you are receiving this error you should request the merchant provide a BIP21
         <source>Copy amount</source>
         <translation type="unfinished">‫نسخ القيمة‬</translation>
     </message>
+    <message>
+        <source>Copy fee</source>
+        <translation type="unfinished">نسخ الرسوم</translation>
+    </message>
     <message>
         <source>Copy after fee</source>
         <translation type="unfinished">نسخ بعد الرسوم</translation>
     </message>
+    <message>
+        <source>Copy bytes</source>
+        <translation type="unfinished">نسخ البايتات </translation>
+    </message>
     <message>
         <source>Copy change</source>
         <translation type="unfinished">نسخ التعديل</translation>
@@ -1442,7 +1651,7 @@ If you are receiving this error you should request the merchant provide a BIP21
     </message>
     <message>
         <source>Save Transaction Data</source>
-        <translation type="unfinished">حفظ بيانات العملية</translation>
+        <translation type="unfinished">حفظ بيانات المعاملات</translation>
     </message>
     <message>
         <source>Partially Signed Transaction (Binary)</source>
@@ -1520,31 +1729,16 @@ If you are receiving this error you should request the merchant provide a BIP21
 <context>
     <name>TransactionView</name>
     <message>
-        <source>Copy &amp;amount</source>
-        <translation type="unfinished">‫نسخ &amp;القيمة‬</translation>
-    </message>
-    <message>
-        <source>Confirmed</source>
-        <translation type="unfinished">‫نافذ‬</translation>
-    </message>
-    <message>
-        <source>Type</source>
-        <translation type="unfinished">النوع</translation>
+        <source>Address</source>
+        <translation type="unfinished">العنوان</translation>
     </message>
     </context>
 <context>
-    <name>WalletFrame</name>
+    <name>WalletView</name>
     <message>
-        <source>Create a new wallet</source>
-        <translation type="unfinished">إنشاء محفظة جديدة</translation>
+        <source>Export the data in the current tab to a file</source>
+        <translation type="unfinished">تصدير البيانات الموجودة في علامة التبويب الحالية إلى ملف</translation>
     </message>
-    <message>
-        <source>Error</source>
-        <translation type="unfinished">خطأ</translation>
-    </message>
-    </context>
-<context>
-    <name>WalletView</name>
     <message>
         <source>Wallet Data</source>
         <extracomment>Name of the wallet data file format.</extracomment>
@@ -1582,24 +1776,36 @@ If you are receiving this error you should request the merchant provide a BIP21
         <translation type="unfinished">گزینه «-checkpoints» تنظیم شده است اما Checkpointها حذف شده‌اند. این گزینه هیچ تاثیری ندارد.</translation>
     </message>
     <message>
-        <source>Option '-maxorphantx' is set but no longer has any effect (see release notes). Please remove it from your configuration.</source>
-        <translation type="unfinished">maxorphantx' گزینه تنظیم شده است اما دیگر هیچ تاثیری ندارد (به یادداشت‌های انتشار مراجعه کنید). لطفاً آن را از پیکربندی خود حذف کنید.</translation>
+        <source>Prune: last wallet synchronisation goes beyond pruned data. You need to -reindex (download the whole blockchain again in case of a pruned node)</source>
+        <translation type="unfinished">الو: آخرینکیف پولهمگام‌سازی فراتر از هر استداده‌هاتو باید -فهرست‌بندی مجدد(دانلودکلبلاکچیندوباره در هرس شدن)</translation>
     </message>
     <message>
-        <source>Options '-datacarrier' or '-datacarriersize' are set but are marked as deprecated. They will be removed in a future version.</source>
-        <translation type="unfinished">گزینه‌های '-datacarrier' یا '-datacarriersize' تنظیم شده‌اند اما به عنوان منسوخ علامت‌گذاری شده‌اند. آن‌ها در نسخه‌های آینده حذف خواهند شد.</translation>
+        <source>Specified -blockmaxweight (%d) exceeds consensus maximum block weight (%d)</source>
+        <translation type="unfinished">القيمة المحددة لـ -blockmaxweight (%d) تتجاوز الحد الأقصى لوزن الكتلة وفقًا لقواعد الإجماع (%d)</translation>
     </message>
     <message>
-        <source>Prune: last wallet synchronisation goes beyond pruned data. You need to -reindex (download the whole blockchain again in case of a pruned node)</source>
-        <translation type="unfinished">الو: آخرینکیف پولهمگام‌سازی فراتر از هر استداده‌هاتو باید -فهرست‌بندی مجدد(دانلودکلبلاکچیندوباره در هرس شدن)</translation>
+        <source>Specified -blockreservedweight (%d) exceeds consensus maximum block weight (%d)</source>
+        <translation type="unfinished">القيمة المحددة لـ -blockreservedweight (%d) تتجاوز الحد الأقصى لوزن الكتلة وفقًا لقواعد الإجماع (%d)</translation>
+    </message>
+    <message>
+        <source>Specified -blockreservedweight (%d) is lower than minimum safety value of (%d)</source>
+        <translation type="unfinished">القيمة المحددة لـ -blockreservedweight (%d) أقل من الحد الأدنى لقيمة الأمان (%d)</translation>
     </message>
     <message>
         <source>default wallet</source>
         <translation type="unfinished">‫محفظة افتراضية‬</translation>
     </message>
     <message>
-        <source>-paytxfee is deprecated and will be fully removed in v31.0.</source>
-        <translation type="unfinished">-paytxfee منسوخ شده و در نسخه 31.0 به طور کامل حذف خواهد شد.</translation>
+        <source>Can't spend unconfirmed version %d pre-selected input with a version 3 tx</source>
+        <translation type="unfinished">لا يمكن إنفاق إدخال مُحدد مسبقًا غير مؤكد من الإصدار %d باستخدام معاملة من الإصدار 3</translation>
+    </message>
+    <message>
+        <source>Can't spend unconfirmed version 3 pre-selected input with a version %d tx</source>
+        <translation type="unfinished">لا يمكن إنفاق إدخال مُحدد مسبقًا غير مؤكد من الإصدار 3 باستخدام معاملة من الإصدار %d</translation>
+    </message>
+    <message>
+        <source>Cannot write to directory '%s'; check permissions.</source>
+        <translation type="unfinished">لا يمكن الكتابة إلى الدليل '%s'; تحقق من الصلاحيات.</translation>
     </message>
     <message>
         <source>Config setting for %s only applied on %s network when in [%s] section.</source>
@@ -1609,6 +1815,14 @@ If you are receiving this error you should request the merchant provide a BIP21
         <source>Copyright (C) %i-%i</source>
         <translation type="unfinished">حقوق الطبع والنشر (C) %i-%i</translation>
     </message>
+    <message>
+        <source>Could not generate scriptPubKeys (cache is empty)</source>
+        <translation type="unfinished">تعذر إنشاء مفاتيح عامة للبرنامج النصي (الذاكرة المؤقتة فارغة)</translation>
+    </message>
+    <message>
+        <source>Could not top up scriptPubKeys</source>
+        <translation type="unfinished">لم يتمكن من شحن مفاتيح البرنامج النصي العامة</translation>
+    </message>
     <message>
         <source>Disk space is too low!</source>
         <translation type="unfinished">‫تحذير: مساحة التخزين منخفضة!‬</translation>
@@ -1629,14 +1843,78 @@ If you are receiving this error you should request the merchant provide a BIP21
         <source>Error reading next record from wallet database</source>
         <translation type="unfinished">خطأ قراءة السجل التالي من قاعدة بيانات المحفظة</translation>
     </message>
+    <message>
+        <source>Error: Not all address book records were migrated</source>
+        <translation type="unfinished">خطأ: لم يتم ترحيل جميع سجلات دفتر العناوين</translation>
+    </message>
+    <message>
+        <source>Error: Not all transaction records were migrated</source>
+        <translation type="unfinished">خطأ: لم يتم ترحيل جميع سجلات المعاملات</translation>
+    </message>
+    <message>
+        <source>Error: Unable to write data to disk for wallet %s</source>
+        <translation type="unfinished">خطأ: غير قادر على كتابة البيانات إلى القرص الخاص بالمحفظة %s</translation>
+    </message>
+    <message>
+        <source>Failed to acquire rescan reserver during wallet initialization</source>
+        <translation type="unfinished">فشل في الحصول على احتياطي إعادة المسح أثناء تهيئة المحفظة</translation>
+    </message>
+    <message>
+        <source>Failed to close block undo file.</source>
+        <translation type="unfinished">فشل في إغلاق ملف التراجع.</translation>
+    </message>
+    <message>
+        <source>Failed to close file when writing block.</source>
+        <translation type="unfinished">فشل في إغلاق الملف عند كتابة الكتلة.</translation>
+    </message>
+    <message>
+        <source>The %s path uses exFAT, which is known to have intermittent corruption problems on macOS. Move this directory to a different filesystem to avoid data loss.</source>
+        <translation type="unfinished">يستخدم مسار %s نظام الملفات exFAT، المعروف بمشاكل تلفه المتقطعة على نظام macOS. انقل هذا الدليل إلى نظام ملفات مختلف لتجنب فقدان البيانات.</translation>
+    </message>
     <message>
         <source>The transactions removal process can only be executed within a db txn</source>
         <translation type="unfinished">لا يمكن تنفيذ عملية إزالة المعاملات إلا داخل DB TXN</translation>
     </message>
+    <message>
+        <source>Error loading %s: Wallet is a legacy wallet. Please migrate to a descriptor wallet using the migration tool (migratewallet RPC).</source>
+        <translation type="unfinished">حدث خطأ أثناء التحميل %s : المحفظة قديمة. يُرجى الانتقال إلى محفظة وصفية باستخدام أداة الترحيل (محفظة الهجرة RPC).</translation>
+    </message>
+    <message>
+        <source>Error: Dumpfile specifies an unsupported database format (%s). Only sqlite database dumps are supported</source>
+        <translation type="unfinished">خطأ: يُحدد ملف التفريغ تنسيق قاعدة بيانات غير مدعوم (%s). تفريغات قواعد بيانات SQLite فقط مدعومة.</translation>
+    </message>
+    <message>
+        <source>Failed to calculate bump fees, because unconfirmed UTXOs depend on an enormous cluster of unconfirmed transactions.</source>
+        <translation type="unfinished">فشل في حساب رسوم الصدمة، لأن UTXOs غير المؤكدة تعتمد على مجموعة ضخمة من المعاملات غير المؤكدة.</translation>
+    </message>
+    <message>
+        <source>Transaction requires one destination of non-zero value, a non-zero feerate, or a pre-selected input</source>
+        <translation type="unfinished">تتطلب المعاملة وجهة واحدة بقيمة غير صفرية، أو معدل رسوم غير صفري، أو إدخال محدد مسبقًا</translation>
+    </message>
+    <message>
+        <source>Unrecognized descriptor found. Loading wallet %s
+
+The wallet might have been created on a newer version.
+Please try running the latest software version.
+</source>
+        <translation type="unfinished">تم العثور على واصف غير معروف. جاري تحميل المحفظة %s
+
+ربما تم إنشاء المحفظة على إصدار أحدث.
+يُرجى محاولة تشغيل أحدث إصدار من البرنامج.
+</translation>
+    </message>
     <message>
         <source>Do you want to rebuild the databases now?</source>
         <translation type="unfinished">هل تريد إعادة بناء قواعد البيانات الآن؟</translation>
     </message>
+    <message>
+        <source>Error: Could not add watchonly tx %s to watchonly wallet</source>
+        <translation type="unfinished">خطأ: تعذّر إضافة المعاملة المراقبة فقط %s إلى المحفظة المراقبة فقط</translation>
+    </message>
+    <message>
+        <source>Error: Could not delete watchonly transactions. </source>
+        <translation type="unfinished">خطأ: تعذّر حذف المعاملات المراقبة فقط.</translation>
+    </message>
     <message>
         <source>Error: Wallet does not exist</source>
         <translation type="unfinished">خطأ: محفظة غير موجودة</translation>
@@ -1645,5 +1923,21 @@ If you are receiving this error you should request the merchant provide a BIP21
         <source>Error: cannot remove legacy wallet records</source>
         <translation type="unfinished">خطأ: لا يمكن إزالة سجلات المحفظة القديمة</translation>
     </message>
+    <message>
+        <source>Failed to start indexes, shutting down…</source>
+        <translation type="unfinished">فشل في بدء الفهارس، إيقاف التشغيل…</translation>
+    </message>
+    <message>
+        <source>Invalid -proxy address or hostname, ends with '=': '%s'</source>
+        <translation type="unfinished">عنوان الوكيل أو اسم المضيف غير صالح، وينتهي بـ '=':  %s'</translation>
+    </message>
+    <message>
+        <source>Not enough file descriptors available. %d available, %d required.</source>
+        <translation type="unfinished">عدد واصفات الملفات المتاحة غير كافٍ. المتاح: (%d)، المطلوب: (%d).</translation>
+    </message>
+    <message>
+        <source>Unrecognized network in -proxy='%s': '%s'</source>
+        <translation type="unfinished">شبكة غير معروفة في - الوكيل='%s': '%s'</translation>
+    </message>
     </context>
 </TS>
\ No newline at end of file
diff --git a/src/qt/locale/bitcoin_ast_ES.ts b/src/qt/locale/bitcoin_ast_ES.ts
index 1c080987f24d..29cd3a194964 100644
--- a/src/qt/locale/bitcoin_ast_ES.ts
+++ b/src/qt/locale/bitcoin_ast_ES.ts
@@ -743,6 +743,11 @@ La firma ye possible solamentu con direcciones del tipu 'legacy'.</translation>
         <source>Migrate Wallet</source>
         <translation type="unfinished">Migrar cartera</translation>
     </message>
+    <message>
+        <source>Restore Wallet</source>
+        <extracomment>Title of progress window which is displayed when wallets are being restored.</extracomment>
+        <translation type="unfinished">Restaurar cartera</translation>
+    </message>
     </context>
 <context>
     <name>OpenWalletActivity</name>
@@ -817,6 +822,21 @@ La firma ye possible solamentu con direcciones del tipu 'legacy'.</translation>
         <translation type="unfinished">Continuar</translation>
     </message>
     </context>
+<context>
+    <name>PSBTOperationsDialog</name>
+    <message numerus="yes">
+        <source>Signed %n input(s), but more signatures are still required.</source>
+        <translation type="unfinished">
+            <numerusform />
+        </translation>
+    </message>
+    <message numerus="yes">
+        <source>Transaction has %n unsigned input(s).</source>
+        <translation type="unfinished">
+            <numerusform />
+        </translation>
+    </message>
+    </context>
 <context>
     <name>PeerTableModel</name>
     <message>
diff --git a/src/qt/locale/bitcoin_az.ts b/src/qt/locale/bitcoin_az.ts
index b6332a4c07c3..3479cb3b96f0 100644
--- a/src/qt/locale/bitcoin_az.ts
+++ b/src/qt/locale/bitcoin_az.ts
@@ -650,7 +650,7 @@ Daxil olma, yalnız 'qanuni' tipli ünvanlar ilə mümkündür.</translation>
     <message>
         <source>Restore Wallet</source>
         <extracomment>Title of pop-up window shown when the user is attempting to restore a wallet.</extracomment>
-        <translation type="unfinished">Pulqabını bərpa et</translation>
+        <translation type="unfinished">Cüzdanı bərpa et</translation>
     </message>
     <message>
         <source>Wallet Name</source>
@@ -817,7 +817,7 @@ Daxil olma, yalnız 'qanuni' tipli ünvanlar ilə mümkündür.</translation>
     </message>
     <message>
         <source>After Fee:</source>
-        <translation type="unfinished">Komissiydan sonra:</translation>
+        <translation type="unfinished">Komissiyadan sonra:</translation>
     </message>
     <message>
         <source>Change:</source>
@@ -972,6 +972,16 @@ Daxil olma, yalnız 'qanuni' tipli ünvanlar ilə mümkündür.</translation>
         <source>Migrate wallet</source>
         <translation type="unfinished">Pulqabını köçür</translation>
     </message>
+    <message>
+        <source>Restore Wallet</source>
+        <extracomment>Title of progress window which is displayed when wallets are being restored.</extracomment>
+        <translation type="unfinished">Pulqabını bərpa et</translation>
+    </message>
+    <message>
+        <source>Restoring Wallet &lt;b&gt;%1&lt;/b&gt;…</source>
+        <extracomment>Descriptive text of the restore wallets progress window which indicates to the user that wallets are currently being restored.</extracomment>
+        <translation type="unfinished">&lt;b&gt;%1&lt;/b&gt; cüzdanı bərpa olunur...</translation>
+    </message>
     </context>
 <context>
     <name>OpenWalletActivity</name>
@@ -1079,10 +1089,6 @@ Daxil olma, yalnız 'qanuni' tipli ünvanlar ilə mümkündür.</translation>
         <source>Disable Private Keys</source>
         <translation type="unfinished">Məxfi açarları söndürün</translation>
     </message>
-    <message>
-        <source>Make a blank wallet. Blank wallets do not initially have private keys or scripts. Private keys and addresses can be imported, or an HD seed can be set, at a later time.</source>
-        <translation type="unfinished">Boş pulqabı yaradın. Boş pulqabında ilkin olaraq açarlar və skriptlər yoxdur. Sonra məxfi açarlar və ünvanlar idxal edilə bilər və ya HD məxfi açarlar təyin edilə bilər.</translation>
-    </message>
     <message>
         <source>Make Blank Wallet</source>
         <translation type="unfinished">Boş pulqabı yaradın</translation>
@@ -1305,6 +1311,13 @@ Daxil olma, yalnız 'qanuni' tipli ünvanlar ilə mümkündür.</translation>
         <source>Failed to load transaction: %1</source>
         <translation type="unfinished">Əməliyyatı yükləmək alınmadı:%1</translation>
     </message>
+    <message numerus="yes">
+        <source>Signed %n input(s), but more signatures are still required.</source>
+        <translation type="unfinished">
+            <numerusform />
+            <numerusform />
+        </translation>
+    </message>
     <message>
         <source>Total Amount</source>
         <translation type="unfinished">Ümumi Miqdar</translation>
@@ -1313,6 +1326,13 @@ Daxil olma, yalnız 'qanuni' tipli ünvanlar ilə mümkündür.</translation>
         <source>or</source>
         <translation type="unfinished">və ya</translation>
     </message>
+    <message numerus="yes">
+        <source>Transaction has %n unsigned input(s).</source>
+        <translation type="unfinished">
+            <numerusform />
+            <numerusform />
+        </translation>
+    </message>
     </context>
 <context>
     <name>PaymentServer</name>
@@ -1549,6 +1569,10 @@ Daxil olma, yalnız 'qanuni' tipli ünvanlar ilə mümkündür.</translation>
         <source>Date</source>
         <translation type="unfinished">Tarix</translation>
     </message>
+    <message>
+        <source>Type</source>
+        <translation type="unfinished">Növ</translation>
+    </message>
     <message>
         <source>Label</source>
         <translation type="unfinished">Etiket</translation>
diff --git a/src/qt/locale/bitcoin_az@latin.ts b/src/qt/locale/bitcoin_az@latin.ts
index a566d95e15d3..5af28bb1a71f 100644
--- a/src/qt/locale/bitcoin_az@latin.ts
+++ b/src/qt/locale/bitcoin_az@latin.ts
@@ -286,42 +286,36 @@ Daxil olma, yalnız 'qanuni' tipli ünvanlar ilə mümkündür.</translation>
         <source>%n second(s)</source>
         <translation type="unfinished">
             <numerusform>%n second(s)</numerusform>
-            <numerusform>%n second(s)</numerusform>
         </translation>
     </message>
     <message numerus="yes">
         <source>%n minute(s)</source>
         <translation type="unfinished">
             <numerusform>%n minute(s)</numerusform>
-            <numerusform>%n minute(s)</numerusform>
         </translation>
     </message>
     <message numerus="yes">
         <source>%n hour(s)</source>
         <translation type="unfinished">
             <numerusform>%n hour(s)</numerusform>
-            <numerusform>%n hour(s)</numerusform>
         </translation>
     </message>
     <message numerus="yes">
         <source>%n day(s)</source>
         <translation type="unfinished">
             <numerusform>%n day(s)</numerusform>
-            <numerusform>%n day(s)</numerusform>
         </translation>
     </message>
     <message numerus="yes">
         <source>%n week(s)</source>
         <translation type="unfinished">
             <numerusform>%n week(s)</numerusform>
-            <numerusform>%n week(s)</numerusform>
         </translation>
     </message>
     <message numerus="yes">
         <source>%n year(s)</source>
         <translation type="unfinished">
             <numerusform>%n year(s)</numerusform>
-            <numerusform>%n year(s)</numerusform>
         </translation>
     </message>
     <message>
@@ -528,7 +522,6 @@ Daxil olma, yalnız 'qanuni' tipli ünvanlar ilə mümkündür.</translation>
         <source>Processed %n block(s) of transaction history.</source>
         <translation type="unfinished">
             <numerusform>Köçürmə tarixçəsinin %n bloku işləndi.</numerusform>
-            <numerusform>Köçürmə tarixçəsinin %n bloku işləndi.</numerusform>
         </translation>
     </message>
     <message>
@@ -686,7 +679,6 @@ Daxil olma, yalnız 'qanuni' tipli ünvanlar ilə mümkündür.</translation>
         <extracomment>A substring of the tooltip.</extracomment>
         <translation type="unfinished">
             <numerusform>Bitcoin şəbəkəsinə %n aktiv bağlantı.</numerusform>
-            <numerusform>Bitcoin şəbəkəsinə %n aktiv bağlantı.</numerusform>
         </translation>
     </message>
     <message>
@@ -966,6 +958,19 @@ Daxil olma, yalnız 'qanuni' tipli ünvanlar ilə mümkündür.</translation>
         <translation type="unfinished">Pulqabılar yüklənir...</translation>
     </message>
 </context>
+<context>
+    <name>MigrateWalletActivity</name>
+    <message>
+        <source>Restore Wallet</source>
+        <extracomment>Title of progress window which is displayed when wallets are being restored.</extracomment>
+        <translation type="unfinished">Cüzdanı bərpa et</translation>
+    </message>
+    <message>
+        <source>Restoring Wallet &lt;b&gt;%1&lt;/b&gt;…</source>
+        <extracomment>Descriptive text of the restore wallets progress window which indicates to the user that wallets are currently being restored.</extracomment>
+        <translation type="unfinished">&lt;b&gt;%1&lt;/b&gt; cüzdanı bərpa olunur...</translation>
+    </message>
+    </context>
 <context>
     <name>OpenWalletActivity</name>
     <message>
@@ -1072,10 +1077,6 @@ Daxil olma, yalnız 'qanuni' tipli ünvanlar ilə mümkündür.</translation>
         <source>Disable Private Keys</source>
         <translation type="unfinished">Məxfi açarları söndürün</translation>
     </message>
-    <message>
-        <source>Make a blank wallet. Blank wallets do not initially have private keys or scripts. Private keys and addresses can be imported, or an HD seed can be set, at a later time.</source>
-        <translation type="unfinished">Boş pulqabı yaradın. Boş pulqabında ilkin olaraq açarlar və skriptlər yoxdur. Sonra məxfi açarlar və ünvanlar idxal edilə bilər və ya HD məxfi açarlar təyin edilə bilər.</translation>
-    </message>
     <message>
         <source>Make Blank Wallet</source>
         <translation type="unfinished">Boş pulqabı yaradın</translation>
@@ -1160,21 +1161,18 @@ Daxil olma, yalnız 'qanuni' tipli ünvanlar ilə mümkündür.</translation>
         <source>%n GB of space available</source>
         <translation type="unfinished">
             <numerusform>%n GB of space available</numerusform>
-            <numerusform>%n GB of space available</numerusform>
         </translation>
     </message>
     <message numerus="yes">
         <source>(of %n GB needed)</source>
         <translation type="unfinished">
             <numerusform>(of %n GB needed)</numerusform>
-            <numerusform>(of %n GB needed)</numerusform>
         </translation>
     </message>
     <message numerus="yes">
         <source>(%n GB needed for full chain)</source>
         <translation type="unfinished">
             <numerusform>(%n GB needed for full chain)</numerusform>
-            <numerusform>(%n GB needed for full chain)</numerusform>
         </translation>
     </message>
     <message numerus="yes">
@@ -1182,7 +1180,6 @@ Daxil olma, yalnız 'qanuni' tipli ünvanlar ilə mümkündür.</translation>
         <extracomment>Explanatory text on the capability of the current prune target.</extracomment>
         <translation type="unfinished">
             <numerusform>(sufficient to restore backups %n day(s) old)</numerusform>
-            <numerusform>(sufficient to restore backups %n day(s) old)</numerusform>
         </translation>
     </message>
     <message>
@@ -1298,6 +1295,12 @@ Daxil olma, yalnız 'qanuni' tipli ünvanlar ilə mümkündür.</translation>
         <source>Failed to load transaction: %1</source>
         <translation type="unfinished">Əməliyyatı yükləmək alınmadı:%1</translation>
     </message>
+    <message numerus="yes">
+        <source>Signed %n input(s), but more signatures are still required.</source>
+        <translation type="unfinished">
+            <numerusform />
+        </translation>
+    </message>
     <message>
         <source>Total Amount</source>
         <translation type="unfinished">Ümumi Miqdar</translation>
@@ -1306,6 +1309,12 @@ Daxil olma, yalnız 'qanuni' tipli ünvanlar ilə mümkündür.</translation>
         <source>or</source>
         <translation type="unfinished">və ya</translation>
     </message>
+    <message numerus="yes">
+        <source>Transaction has %n unsigned input(s).</source>
+        <translation type="unfinished">
+            <numerusform />
+        </translation>
+    </message>
     </context>
 <context>
     <name>PaymentServer</name>
@@ -1454,7 +1463,6 @@ Daxil olma, yalnız 'qanuni' tipli ünvanlar ilə mümkündür.</translation>
         <source>Estimated to begin confirmation within %n block(s).</source>
         <translation type="unfinished">
             <numerusform>Estimated to begin confirmation within %n block(s).</numerusform>
-            <numerusform>Estimated to begin confirmation within %n block(s).</numerusform>
         </translation>
     </message>
     <message>
@@ -1476,7 +1484,6 @@ Daxil olma, yalnız 'qanuni' tipli ünvanlar ilə mümkündür.</translation>
         <source>matures in %n more block(s)</source>
         <translation type="unfinished">
             <numerusform>matures in %n more block(s)</numerusform>
-            <numerusform>matures in %n more block(s)</numerusform>
         </translation>
     </message>
     <message>
diff --git a/src/qt/locale/bitcoin_be.ts b/src/qt/locale/bitcoin_be.ts
index 20ffa98e883e..6f006ce1e664 100644
--- a/src/qt/locale/bitcoin_be.ts
+++ b/src/qt/locale/bitcoin_be.ts
@@ -678,6 +678,25 @@
         <translation type="unfinished">Форма</translation>
     </message>
     </context>
+<context>
+    <name>PSBTOperationsDialog</name>
+    <message numerus="yes">
+        <source>Signed %n input(s), but more signatures are still required.</source>
+        <translation type="unfinished">
+            <numerusform />
+            <numerusform />
+            <numerusform />
+        </translation>
+    </message>
+    <message numerus="yes">
+        <source>Transaction has %n unsigned input(s).</source>
+        <translation type="unfinished">
+            <numerusform />
+            <numerusform />
+            <numerusform />
+        </translation>
+    </message>
+    </context>
 <context>
     <name>PeerTableModel</name>
     <message>
diff --git a/src/qt/locale/bitcoin_bg.ts b/src/qt/locale/bitcoin_bg.ts
index 8481b453860f..46e540d4f929 100644
--- a/src/qt/locale/bitcoin_bg.ts
+++ b/src/qt/locale/bitcoin_bg.ts
@@ -1089,6 +1089,16 @@ Signing is only possible with addresses of the type 'legacy'.</source>
         <source>The wallet '%1' was migrated successfully.</source>
         <translation type="unfinished">Портфейлът "%1" беше мигриран успешно.</translation>
     </message>
+    <message>
+        <source>Restore Wallet</source>
+        <extracomment>Title of progress window which is displayed when wallets are being restored.</extracomment>
+        <translation type="unfinished">Възстановяване на Портфейл</translation>
+    </message>
+    <message>
+        <source>Restoring Wallet &lt;b&gt;%1&lt;/b&gt;…</source>
+        <extracomment>Descriptive text of the restore wallets progress window which indicates to the user that wallets are currently being restored.</extracomment>
+        <translation type="unfinished">Възстановяване на портфейл &lt;b&gt;%1&lt;/b&gt;…</translation>
+    </message>
     <message>
         <source>Migration failed</source>
         <translation type="unfinished">Грешка при миграцията</translation>
@@ -1212,10 +1222,6 @@ Signing is only possible with addresses of the type 'legacy'.</source>
         <source>Disable Private Keys</source>
         <translation type="unfinished">Изключете частните (тайните) ключове</translation>
     </message>
-    <message>
-        <source>Make a blank wallet. Blank wallets do not initially have private keys or scripts. Private keys and addresses can be imported, or an HD seed can be set, at a later time.</source>
-        <translation type="unfinished">Създайте празен портфейл.  Празните портфейли първоначално нямат частни ключове или скриптове. Частните ключове и адреси могат да бъдат импортирани или може да се зададе HD seed по-късно. </translation>
-    </message>
     <message>
         <source>Make Blank Wallet</source>
         <translation type="unfinished">Създайте празен портфейл</translation>
@@ -1881,6 +1887,13 @@ Signing is only possible with addresses of the type 'legacy'.</source>
         <source>Could not sign any more inputs.</source>
         <translation type="unfinished">Не можах да подпиша повече входове.</translation>
     </message>
+    <message numerus="yes">
+        <source>Signed %n input(s), but more signatures are still required.</source>
+        <translation type="unfinished">
+            <numerusform />
+            <numerusform />
+        </translation>
+    </message>
     <message>
         <source>own address</source>
         <translation type="unfinished">собствен адрес</translation>
@@ -1893,6 +1906,13 @@ Signing is only possible with addresses of the type 'legacy'.</source>
         <source>or</source>
         <translation type="unfinished">или</translation>
     </message>
+    <message numerus="yes">
+        <source>Transaction has %n unsigned input(s).</source>
+        <translation type="unfinished">
+            <numerusform />
+            <numerusform />
+        </translation>
+    </message>
     </context>
 <context>
     <name>PaymentServer</name>
@@ -2443,10 +2463,6 @@ Signing is only possible with addresses of the type 'legacy'.</source>
         <source>The amount exceeds your balance.</source>
         <translation type="unfinished">Сумата надвишава текущия баланс</translation>
     </message>
-    <message>
-        <source>The total exceeds your balance when the %1 transaction fee is included.</source>
-        <translation type="unfinished">Сумата при добавяне на данък добавена стойност по %1 транзакцията надвишава сумата по вашата сметка.</translation>
-    </message>
     <message>
         <source>Transaction creation failed!</source>
         <translation type="unfinished">Грешка при създаването на транзакция!</translation>
@@ -3019,10 +3035,6 @@ Signing is only possible with addresses of the type 'legacy'.</source>
         <source>This is the minimum transaction fee you pay on every transaction.</source>
         <translation type="unfinished">Това е минималната такса за транзакция, която плащате за всяка транзакция.</translation>
     </message>
-    <message>
-        <source>This is the transaction fee you will pay if you send a transaction.</source>
-        <translation type="unfinished">Това е таксата за транзакцията която ще платите ако изпратите транзакция.</translation>
-    </message>
     <message>
         <source>Transaction amount too small</source>
         <translation type="unfinished">Сумата на транзакцията е твърде малка</translation>
diff --git a/src/qt/locale/bitcoin_bn.ts b/src/qt/locale/bitcoin_bn.ts
index 0557306997c7..7604996310b5 100644
--- a/src/qt/locale/bitcoin_bn.ts
+++ b/src/qt/locale/bitcoin_bn.ts
@@ -465,7 +465,7 @@ Signing is only possible with addresses of the type 'legacy'.</source>
     </message>
     <message>
         <source>Copy &amp;label</source>
-        <translation type="unfinished">কপি &amp;লেবেল</translation>
+        <translation type="unfinished">কপি লেবেল</translation>
     </message>
     <message>
         <source>Copy &amp;amount</source>
@@ -637,6 +637,23 @@ The migration process will create a backup of the wallet before migrating. This
         <translation type="unfinished">এগিয়ে যান</translation>
     </message>
     </context>
+<context>
+    <name>PSBTOperationsDialog</name>
+    <message numerus="yes">
+        <source>Signed %n input(s), but more signatures are still required.</source>
+        <translation type="unfinished">
+            <numerusform />
+            <numerusform />
+        </translation>
+    </message>
+    <message numerus="yes">
+        <source>Transaction has %n unsigned input(s).</source>
+        <translation type="unfinished">
+            <numerusform />
+            <numerusform />
+        </translation>
+    </message>
+    </context>
 <context>
     <name>PeerTableModel</name>
     <message>
@@ -673,10 +690,6 @@ The migration process will create a backup of the wallet before migrating. This
         <translation type="unfinished">&amp;copy আইপি/নেটমাস্ক
 (IP/Netmask)</translation>
     </message>
-    <message>
-        <source>None</source>
-        <translation type="unfinished">কিছুই নেই</translation>
-    </message>
     <message>
         <source>Ctrl+I</source>
         <translation type="unfinished">Ctrl+l</translation>
@@ -803,14 +816,6 @@ The migration process will create a backup of the wallet before migrating. This
         <source>Date</source>
         <translation type="unfinished">তারিখ</translation>
     </message>
-    <message>
-        <source>From</source>
-        <translation type="unfinished">থেকে</translation>
-    </message>
-    <message>
-        <source>To</source>
-        <translation type="unfinished">উদ্দেশ্যে</translation>
-    </message>
     <message numerus="yes">
         <source>matures in %n more block(s)</source>
         <translation type="unfinished">
@@ -831,7 +836,7 @@ The migration process will create a backup of the wallet before migrating. This
     </message>
     <message>
         <source>Label</source>
-        <translation type="unfinished">লেবেল</translation>
+        <translation type="unfinished">টিকেট</translation>
     </message>
     </context>
 <context>
@@ -842,7 +847,7 @@ The migration process will create a backup of the wallet before migrating. This
     </message>
     <message>
         <source>Copy &amp;label</source>
-        <translation type="unfinished">কপি &amp;লেবেল</translation>
+        <translation type="unfinished">কপি লেবেল</translation>
     </message>
     <message>
         <source>Copy &amp;amount</source>
diff --git a/src/qt/locale/bitcoin_br.ts b/src/qt/locale/bitcoin_br.ts
index e0690bf7fffe..bcecaf014056 100644
--- a/src/qt/locale/bitcoin_br.ts
+++ b/src/qt/locale/bitcoin_br.ts
@@ -641,10 +641,24 @@ Signing is only possible with addresses of the type 'legacy'.</translation>
         <source>Close</source>
         <translation type="unfinished">Serriñ</translation>
     </message>
+    <message numerus="yes">
+        <source>Signed %n input(s), but more signatures are still required.</source>
+        <translation type="unfinished">
+            <numerusform />
+            <numerusform />
+        </translation>
+    </message>
     <message>
         <source>or</source>
         <translation type="unfinished">pe</translation>
     </message>
+    <message numerus="yes">
+        <source>Transaction has %n unsigned input(s).</source>
+        <translation type="unfinished">
+            <numerusform />
+            <numerusform />
+        </translation>
+    </message>
     </context>
 <context>
     <name>PeerTableModel</name>
@@ -663,11 +677,6 @@ Signing is only possible with addresses of the type 'legacy'.</translation>
         <extracomment>Title of Peers Table column which indicates the total amount of network information we have sent to the peer.</extracomment>
         <translation type="unfinished">Kaset</translation>
     </message>
-    <message>
-        <source>Address</source>
-        <extracomment>Title of Peers Table column which contains the IP/Onion/I2P address of the connected peer.</extracomment>
-        <translation type="unfinished">Adres</translation>
-    </message>
     <message>
         <source>Type</source>
         <extracomment>Title of Peers Table column which describes the type of peer connection. The "type" describes why the connection exists.</extracomment>
@@ -920,10 +929,6 @@ Signing is only possible with addresses of the type 'legacy'.</translation>
         <source>Type</source>
         <translation type="unfinished">Seurt</translation>
     </message>
-    <message>
-        <source>Address</source>
-        <translation type="unfinished">Adres</translation>
-    </message>
     <message>
         <source>to</source>
         <translation type="unfinished">da</translation>
@@ -969,10 +974,6 @@ Signing is only possible with addresses of the type 'legacy'.</translation>
         <source>Error: Transaction %s in wallet cannot be identified to belong to migrated wallets</source>
         <translation type="unfinished">Fazi: Transaction %s in wallet cannot be identified to belong to migrated wallets</translation>
     </message>
-    <message>
-        <source>Error creating %s</source>
-        <translation type="unfinished">Fazi en ur grouiñ %s</translation>
-    </message>
     <message>
         <source>Error: Cannot extract destination from the generated scriptpubkey</source>
         <translation type="unfinished">Fazi: Cannot extract destination from the generated scriptpubkey</translation>
diff --git a/src/qt/locale/bitcoin_bs.ts b/src/qt/locale/bitcoin_bs.ts
index 5b450fbf2733..33a83c832c58 100644
--- a/src/qt/locale/bitcoin_bs.ts
+++ b/src/qt/locale/bitcoin_bs.ts
@@ -917,10 +917,6 @@ Signing is only possible with addresses of the type 'legacy'.</source>
         <source>Disable Private Keys</source>
         <translation type="unfinished">Onemogućite Privatne Ključeve</translation>
     </message>
-    <message>
-        <source>Make a blank wallet. Blank wallets do not initially have private keys or scripts. Private keys and addresses can be imported, or an HD seed can be set, at a later time.</source>
-        <translation type="unfinished">Napravite prazan novčanik. Prazni novčanici u početku nemaju privatne ključeve ili skripte. Privatni ključevi i adrese mogu se kasnije uvoziti ili postaviti HD seme.</translation>
-    </message>
     <message>
         <source>Make Blank Wallet</source>
         <translation type="unfinished">Napravi Prazan Novčanik</translation>
@@ -1302,6 +1298,25 @@ Signing is only possible with addresses of the type 'legacy'.</source>
         <translation type="unfinished">Nedavne transakcije</translation>
     </message>
     </context>
+<context>
+    <name>PSBTOperationsDialog</name>
+    <message numerus="yes">
+        <source>Signed %n input(s), but more signatures are still required.</source>
+        <translation type="unfinished">
+            <numerusform />
+            <numerusform />
+            <numerusform />
+        </translation>
+    </message>
+    <message numerus="yes">
+        <source>Transaction has %n unsigned input(s).</source>
+        <translation type="unfinished">
+            <numerusform />
+            <numerusform />
+            <numerusform />
+        </translation>
+    </message>
+    </context>
 <context>
     <name>PeerTableModel</name>
     <message>
@@ -1611,10 +1626,6 @@ Signing is only possible with addresses of the type 'legacy'.</source>
         <source>This is the minimum transaction fee you pay on every transaction.</source>
         <translation type="unfinished">Ovo je minimalna naknada za transakciju koju plaćate za svaku transakciju.</translation>
     </message>
-    <message>
-        <source>This is the transaction fee you will pay if you send a transaction.</source>
-        <translation type="unfinished">Ovo je naknada za transakciju koju ćete platiti ako pošaljete transakciju.</translation>
-    </message>
     <message>
         <source>Transaction amount too small</source>
         <translation type="unfinished">Iznos transakcije je premali</translation>
diff --git a/src/qt/locale/bitcoin_ca.ts b/src/qt/locale/bitcoin_ca.ts
index 69c261fedae6..49b382f71990 100644
--- a/src/qt/locale/bitcoin_ca.ts
+++ b/src/qt/locale/bitcoin_ca.ts
@@ -59,7 +59,7 @@
     </message>
     <message>
         <source>These are your Bitcoin addresses for sending payments. Always check the amount and the receiving address before sending coins.</source>
-        <translation type="unfinished">Aquestes són les vostres adreces de Bitcoin per enviar pagaments. Sempre reviseu l'import i l'adreça del destinatari abans de transferir monedes.</translation>
+        <translation type="unfinished">Aquestes són les vostres adreces de Bitcoin per enviar pagaments. Reviseu sempre l'import i l'adreça del destinatari abans de transferir monedes.</translation>
     </message>
     <message>
         <source>These are your Bitcoin addresses for receiving payments. Use the 'Create new receiving address' button in the receive tab to create new addresses.
@@ -353,12 +353,12 @@ Només és possible firmar amb adreces del tipus "legacy".</translation>
     <message>
         <source>Full Relay</source>
         <extracomment>Peer connection type that relays all network information.</extracomment>
-        <translation type="unfinished">Transmissió completa</translation>
+        <translation type="unfinished">Trànsit completat</translation>
     </message>
     <message>
         <source>Block Relay</source>
         <extracomment>Peer connection type that relays network information about blocks and not transactions or addresses.</extracomment>
-        <translation type="unfinished">Transmissió de blocs</translation>
+        <translation type="unfinished">Bloc de trànsit</translation>
     </message>
     <message>
         <source>Feeler</source>
@@ -969,7 +969,7 @@ Només és possible firmar amb adreces del tipus "legacy".</translation>
     </message>
     <message>
         <source>Copy &amp;amount</source>
-        <translation type="unfinished">Copia &amp;l'import</translation>
+        <translation type="unfinished">Copia la &amp;quantitat</translation>
     </message>
     <message>
         <source>Copy transaction &amp;ID and output index</source>
@@ -1108,6 +1108,16 @@ El procés de migració crearà una còpia de seguretat de la cartera abans de m
         <source>Solvable but not watched scripts have been migrated to a new wallet named '%1'.</source>
         <translation type="unfinished">Els scripts resolubles però no vigilats s'han migrat a una nova cartera anomenada '%1'.</translation>
     </message>
+    <message>
+        <source>Restore Wallet</source>
+        <extracomment>Title of progress window which is displayed when wallets are being restored.</extracomment>
+        <translation type="unfinished">Restaurar cartera</translation>
+    </message>
+    <message>
+        <source>Restoring Wallet &lt;b&gt;%1&lt;/b&gt;…</source>
+        <extracomment>Descriptive text of the restore wallets progress window which indicates to the user that wallets are currently being restored.</extracomment>
+        <translation type="unfinished">Restaurant cartera &lt;b&gt;%1&lt;/b&gt;...</translation>
+    </message>
     <message>
         <source>Migration failed</source>
         <translation type="unfinished">Migració fallida</translation>
@@ -1148,7 +1158,7 @@ El procés de migració crearà una còpia de seguretat de la cartera abans de m
     <message>
         <source>Restoring Wallet &lt;b&gt;%1&lt;/b&gt;…</source>
         <extracomment>Descriptive text of the restore wallets progress window which indicates to the user that wallets are currently being restored.</extracomment>
-        <translation type="unfinished">Restaurant la cartera &lt;b&gt;%1&lt;/b&gt;...</translation>
+        <translation type="unfinished">Restaurant cartera &lt;b&gt;%1&lt;/b&gt;...</translation>
     </message>
     <message>
         <source>Restore wallet failed</source>
@@ -1232,10 +1242,6 @@ Això és ideal per a carteres de mode només lectura.</translation>
         <source>Disable Private Keys</source>
         <translation type="unfinished">Deshabilitar claus privades</translation>
     </message>
-    <message>
-        <source>Make a blank wallet. Blank wallets do not initially have private keys or scripts. Private keys and addresses can be imported, or an HD seed can be set, at a later time.</source>
-        <translation type="unfinished">Crea una cartera en blanc. Carteres en blanc no tenen claus privades inicialment o scripts. Claus privades i adreces poden ser importades, o una llavor HD, més endavant.</translation>
-    </message>
     <message>
         <source>Make Blank Wallet</source>
         <translation type="unfinished">Fes cartera en blanc</translation>
@@ -1551,6 +1557,11 @@ Això és ideal per a carteres de mode només lectura.</translation>
         <source>Enabling pruning significantly reduces the disk space required to store transactions. All blocks are still fully validated. Reverting this setting requires re-downloading the entire blockchain.</source>
         <translation type="unfinished">Habilitar la poda redueix significativament l’espai en disc necessari per a emmagatzemar les transaccions. Tots els blocs encara estan completament validats. Per a revertir aquesta configuració, cal tornar a descarregar tota la cadena de blocs.</translation>
     </message>
+    <message>
+        <source>Maximum database cache size. Make sure you have enough RAM. A larger cache can contribute to faster sync, after which the benefit is less pronounced for most use cases. Lowering the cache size will reduce memory usage. Unused mempool memory is shared for this cache.</source>
+        <extracomment>Tooltip text for Options window setting that sets the size of the database cache. Explains the corresponding effects of increasing/decreasing this value.</extracomment>
+        <translation type="unfinished">Mida màxima de la memòria cau de la base de dades.  Assegureu-vos de tenir prou RAM. Una memòria cau més gran pot contribuir a una sincronització més ràpida, després de la qual el benefici és menys pronunciat per a la majoria dels casos d'ús.  Reduir la mida de la memòria cau reduirà l'ús de memòria.  La memòria mempool no utilitzada es comparteix per a aquesta memòria cau.</translation>
+    </message>
     <message>
         <source>Size of &amp;database cache</source>
         <translation type="unfinished">Mida de la memòria cau de la base de &amp;dades</translation>
@@ -1563,6 +1574,10 @@ Això és ideal per a carteres de mode només lectura.</translation>
         <source>Full path to a %1 compatible script (e.g. C:\Downloads\hwi.exe or /Users/you/Downloads/hwi.py). Beware: malware can steal your coins!</source>
         <translation type="unfinished">Camí complet a %1 script compatible amb Bitcoin Core (per exemple, C:\Downloads\hwi.exe o /Users/you/Downloads/hwi.py). Aneu amb compte: el programari maliciós pot robar-vos les monedes!</translation>
     </message>
+    <message>
+        <source>Automatically open the Bitcoin client port on the router. This only works when your router supports PCP or NAT-PMP and it is enabled. The external port could be random.</source>
+        <translation type="unfinished">Obriu automàticament el port del client Bitcoin a l'encaminador. Només funciona quan el vostre encaminador admet PCP o NAT-PMP i està habilitat. El port extern podria ser aleatori.</translation>
+    </message>
     <message>
         <source>IP address of the proxy (e.g. IPv4: 127.0.0.1 / IPv6: ::1)</source>
         <translation type="unfinished">Adreça IP del proxy (p. ex. IPv4: 127.0.0.1 / IPv6: ::1)</translation>
@@ -1908,7 +1923,7 @@ Això és ideal per a carteres de mode només lectura.</translation>
     </message>
     <message>
         <source>Copy to Clipboard</source>
-        <translation type="unfinished">Copia al porta-retalls</translation>
+        <translation type="unfinished">Copia al Clipboard</translation>
     </message>
     <message>
         <source>Save…</source>
@@ -1934,9 +1949,12 @@ Això és ideal per a carteres de mode només lectura.</translation>
         <source>Could not sign any more inputs.</source>
         <translation type="unfinished">No s'han pogut firmar més entrades.</translation>
     </message>
-    <message>
-        <source>Signed %1 inputs, but more signatures are still required.</source>
-        <translation type="unfinished">Firmades %1 entrades, però encara es requereixen més firmes.</translation>
+    <message numerus="yes">
+        <source>Signed %n input(s), but more signatures are still required.</source>
+        <translation type="unfinished">
+            <numerusform />
+            <numerusform />
+        </translation>
     </message>
     <message>
         <source>Signed transaction successfully. Transaction is ready to broadcast.</source>
@@ -1995,9 +2013,12 @@ Això és ideal per a carteres de mode només lectura.</translation>
         <source>or</source>
         <translation type="unfinished">o</translation>
     </message>
-    <message>
-        <source>Transaction has %1 unsigned inputs.</source>
-        <translation type="unfinished">La transacció té %1 entrades no firmades.</translation>
+    <message numerus="yes">
+        <source>Transaction has %n unsigned input(s).</source>
+        <translation type="unfinished">
+            <numerusform />
+            <numerusform />
+        </translation>
     </message>
     <message>
         <source>Transaction is missing some information about inputs.</source>
@@ -2195,6 +2216,10 @@ Si rebeu aquest error, haureu de sol·licitar al comerciant que proporcioni un U
         <source>Local Addresses</source>
         <translation type="unfinished">Adreces locals</translation>
     </message>
+    <message>
+        <source>Network addresses that your Bitcoin node is currently using to communicate with other nodes.</source>
+        <translation type="unfinished">Adreces de xarxa que el vostre node Bitcoin està fent servir actualment per a comunicar-se amb altres nodes.</translation>
+    </message>
     <message>
         <source>Block chain</source>
         <translation type="unfinished">Cadena de blocs</translation>
@@ -2243,6 +2268,14 @@ Si rebeu aquest error, haureu de sol·licitar al comerciant que proporcioni un U
         <source>Select a peer to view detailed information.</source>
         <translation type="unfinished">Seleccioneu un igual per a mostrar informació detallada.</translation>
     </message>
+    <message>
+        <source>Hide Peers Detail</source>
+        <translation type="unfinished">Amaga el detall d'iguals.</translation>
+    </message>
+    <message>
+        <source>The transport layer version: %1</source>
+        <translation type="unfinished">Versió de la capa de transport: %1</translation>
+    </message>
     <message>
         <source>Transport</source>
         <translation type="unfinished">Transporta</translation>
@@ -2256,8 +2289,12 @@ Si rebeu aquest error, haureu de sol·licitar al comerciant que proporcioni un U
         <translation type="unfinished">Versió</translation>
     </message>
     <message>
-        <source>Starting Block</source>
-        <translation type="unfinished">Bloc d'inici</translation>
+        <source>Whether we relay transactions to this peer.</source>
+        <translation type="unfinished">Si transmetem transaccions cap a aquest igual.</translation>
+    </message>
+    <message>
+        <source>Transaction Relay</source>
+        <translation type="unfinished">Transmissió de la transacció.</translation>
     </message>
     <message>
         <source>Synced Headers</source>
@@ -2279,6 +2316,31 @@ Si rebeu aquest error, haureu de sol·licitar al comerciant que proporcioni un U
         <source>Mapped AS</source>
         <translation type="unfinished">Mapat com</translation>
     </message>
+    <message>
+        <source>Whether we relay addresses to this peer.</source>
+        <extracomment>Tooltip text for the Address Relay field in the peer details area, which displays whether we relay addresses to this peer (Yes/No).</extracomment>
+        <translation type="unfinished">Si transmetem adreces cap a aquest igual.</translation>
+    </message>
+    <message>
+        <source>Address Relay</source>
+        <extracomment>Text title for the Address Relay field in the peer details area, which displays whether we relay addresses to this peer (Yes/No).</extracomment>
+        <translation type="unfinished">Adreça de transmissió.</translation>
+    </message>
+    <message>
+        <source>The total number of addresses received from this peer that were processed (excludes addresses that were dropped due to rate-limiting).</source>
+        <extracomment>Tooltip text for the Addresses Processed field in the peer details area, which displays the total number of addresses received from this peer that were processed (excludes addresses that were dropped due to rate-limiting).</extracomment>
+        <translation type="unfinished">Nombre total d'adreces rebudes d'aquest igual que han sigut processades (exclou les adreces descartades per rate-limiting).</translation>
+    </message>
+    <message>
+        <source>The total number of addresses received from this peer that were dropped (not processed) due to rate-limiting.</source>
+        <extracomment>Tooltip text for the Addresses Rate-Limited field in the peer details area, which displays the total number of addresses received from this peer that were dropped (not processed) due to rate-limiting.</extracomment>
+        <translation type="unfinished">Nombre total d'adreces rebudes d'aquest igual que han sigut descartades (no processades) a conseqüència del rate-limiting.</translation>
+    </message>
+    <message>
+        <source>Addresses Processed</source>
+        <extracomment>Text title for the Addresses Processed field in the peer details area, which displays the total number of addresses received from this peer that were processed (excludes addresses that were dropped due to rate-limiting).</extracomment>
+        <translation type="unfinished">Adreces processades.</translation>
+    </message>
     <message>
         <source>User Agent</source>
         <translation type="unfinished">Agent d'usuari</translation>
@@ -2346,7 +2408,7 @@ Si rebeu aquest error, haureu de sol·licitar al comerciant que proporcioni un U
     <message>
         <source>Elapsed time since a novel transaction accepted into our mempool was received from this peer.</source>
         <extracomment>Tooltip text for the Last Transaction field in the peer details area.</extracomment>
-        <translation type="unfinished">Temps transcorregut des que es va rebre d'aquest igual una transacció nova acceptada al nostre mempool.</translation>
+        <translation type="unfinished">El temps transcorregut des que es va rebre d'aquesta transacció una nova transacció acceptada al nostre igual.</translation>
     </message>
     <message>
         <source>Last Send</source>
@@ -2417,7 +2479,7 @@ Si rebeu aquest error, haureu de sol·licitar al comerciant que proporcioni un U
     <message>
         <source>Outbound Block Relay: does not relay transactions or addresses</source>
         <extracomment>Explanatory text for an outbound peer connection that relays network information about blocks and not transactions or addresses.</extracomment>
-        <translation type="unfinished">Transmissió de blocs per iguals de sortida: no transmet transaccions ni adreces</translation>
+        <translation type="unfinished">Trànsit de blocs de sortida: no transmet trànsit ni adreces</translation>
     </message>
     <message>
         <source>Outbound Manual: added using RPC %1 or %2/%3 configuration options</source>
@@ -2434,6 +2496,11 @@ Si rebeu aquest error, haureu de sol·licitar al comerciant que proporcioni un U
         <extracomment>Explanatory text for a short-lived outbound peer connection that is used to request addresses from a peer.</extracomment>
         <translation type="unfinished">Obtenció d'adreces de sortida: de curta durada, per a sol·licitar adreces</translation>
     </message>
+    <message>
+        <source>detecting: peer could be v1 or v2</source>
+        <extracomment>Explanatory text for "detecting" transport type.</extracomment>
+        <translation type="unfinished">detectant: l'igual podria ser v1 o v2</translation>
+    </message>
     <message>
         <source>we selected the peer for high bandwidth relay</source>
         <translation type="unfinished">hem seleccionat l'igual per a un gran trànsit d'amplada de banda</translation>
@@ -3026,10 +3093,6 @@ Nota: atès que la tarifa es calcula per byte, una tarifa de "100 satoshis per k
         <source>The amount exceeds your balance.</source>
         <translation type="unfinished">L'import supera el vostre balanç.</translation>
     </message>
-    <message>
-        <source>The total exceeds your balance when the %1 transaction fee is included.</source>
-        <translation type="unfinished">El total excedeix el vostre balanç quan s'afegeix la tarifa a la transacció %1.</translation>
-    </message>
     <message>
         <source>Duplicate address found: addresses should only be used once each.</source>
         <translation type="unfinished">S'ha trobat una adreça duplicada: les adreces només s'haurien d'utilitzar una vegada cada una.</translation>
@@ -3178,6 +3241,10 @@ Nota: atès que la tarifa es calcula per byte, una tarifa de "100 satoshis per k
         <source>Signature</source>
         <translation type="unfinished">Signatura</translation>
     </message>
+    <message>
+        <source>Copy the current signature to the clipboard</source>
+        <translation type="unfinished">Copia la signatura actual al porta-retalls</translation>
+    </message>
     <message>
         <source>Sign the message to prove you own this Bitcoin address</source>
         <translation type="unfinished">Signa el missatge per a provar que ets propietari d'aquesta adreça Bitcoin</translation>
@@ -3188,7 +3255,7 @@ Nota: atès que la tarifa es calcula per byte, una tarifa de "100 satoshis per k
     </message>
     <message>
         <source>Reset all sign message fields</source>
-        <translation type="unfinished">Neteja tots els camps de signatura de missatges</translation>
+        <translation type="unfinished">Neteja tots els camps de clau</translation>
     </message>
     <message>
         <source>Clear &amp;All</source>
@@ -3618,7 +3685,7 @@ Nota: atès que la tarifa es calcula per byte, una tarifa de "100 satoshis per k
     </message>
     <message>
         <source>A&amp;bandon transaction</source>
-        <translation type="unfinished">A&amp;amp;bandona la transacció</translation>
+        <translation type="unfinished">Transacció d'a&amp;bandonar</translation>
     </message>
     <message>
         <source>&amp;Edit address label</source>
@@ -3841,15 +3908,15 @@ Ves a Arxiu &gt; Obrir Cartera per a carregar cartera.
     </message>
     <message>
         <source>More than one onion bind address is provided. Using %s for the automatically created Tor onion service.</source>
-        <translation type="unfinished">Es proporcionen més d'una adreça de vinculació onion. Utilitzant %s pel servei Tor onion creat automàticament.</translation>
+        <translation type="unfinished"> Es proporciona més d'una adreça de vinculació. Utilitzant %s pel servei Tor onion automàticament creat.</translation>
     </message>
     <message>
         <source>No dump file provided. To use createfromdump, -dumpfile=&lt;filename&gt; must be provided.</source>
-        <translation type="unfinished">No s'ha proporcionat cap fitxer de bolcat. Per a utilitzar createfromdump, cal proporcionar -dumpfile=&lt;filename&gt;.</translation>
+        <translation type="unfinished">No s'ha proporcionat cap fitxer de bolcat. Per a utilitzar createfromdump, s'ha de proporcionar&lt;filename&gt;.</translation>
     </message>
     <message>
         <source>No dump file provided. To use dump, -dumpfile=&lt;filename&gt; must be provided.</source>
-        <translation type="unfinished">No s'ha proporcionat cap fitxer de bolcat. Per utilitzar la funció de bolcat, cal proporcionar -dumpfile=&lt;filename&gt;</translation>
+        <translation type="unfinished">No s'ha proporcionat cap fitxer de bolcat. Per a bolcar, cal proporcionar&lt;filename&gt;.</translation>
     </message>
     <message>
         <source>Please contribute if you find %s useful. Visit %s for further information about the software.</source>
@@ -3899,10 +3966,6 @@ Ves a Arxiu &gt; Obrir Cartera per a carregar cartera.
         <source>Warning: Private keys detected in wallet {%s} with disabled private keys</source>
         <translation type="unfinished">Avís: Claus privades detectades en la cartera {%s} amb claus privades deshabilitades</translation>
     </message>
-    <message>
-        <source>Warning: We do not appear to fully agree with our peers! You may need to upgrade, or other nodes may need to upgrade.</source>
-        <translation type="unfinished">Avís: sembla que no estem plenament d'acord amb els nostres iguals! Podria caler que actualitzar l'aplicació, o potser que ho facin altres nodes.</translation>
-    </message>
     <message>
         <source>Witness data for blocks after height %d requires validation. Please restart with -reindex.</source>
         <translation type="unfinished">Les dades de testimoni dels blocs després de l'altura %d requereixen validació. Reinicieu amb -reindex.</translation>
@@ -3983,10 +4046,6 @@ Ves a Arxiu &gt; Obrir Cartera per a carregar cartera.
         <source>Dump file %s does not exist.</source>
         <translation type="unfinished">El fitxer de bolcat %s no existeix.</translation>
     </message>
-    <message>
-        <source>Error creating %s</source>
-        <translation type="unfinished">Error al crear %s</translation>
-    </message>
     <message>
         <source>Error initializing block database</source>
         <translation type="unfinished">Error carregant la base de dades de blocs</translation>
@@ -3995,10 +4054,6 @@ Ves a Arxiu &gt; Obrir Cartera per a carregar cartera.
         <source>Error loading %s</source>
         <translation type="unfinished">Error carregant %s</translation>
     </message>
-    <message>
-        <source>Error loading %s: Private keys can only be disabled during creation</source>
-        <translation type="unfinished">Error carregant %s: les claus privades només es poden desactivar durant la creació</translation>
-    </message>
     <message>
         <source>Error loading %s: Wallet corrupted</source>
         <translation type="unfinished">S'ha produït un error en carregar %s: la cartera és corrupta</translation>
@@ -4127,10 +4182,6 @@ Ves a Arxiu &gt; Obrir Cartera per a carregar cartera.
         <source>Invalid P2P permission: '%s'</source>
         <translation type="unfinished">Permís P2P no vàlid: '%s'</translation>
     </message>
-    <message>
-        <source>Invalid amount for %s=&lt;amount&gt;: '%s' (must be at least %s)</source>
-        <translation type="unfinished">Import no vàlid per a %s=&lt;amount&gt;: «%s» (ha de ser com a mínim %s)</translation>
-    </message>
     <message>
         <source>Invalid amount for %s=&lt;amount&gt;: '%s'</source>
         <translation type="unfinished">Import invàlid per a %s=&lt;amount&gt;: '%s'</translation>
@@ -4181,7 +4232,7 @@ Ves a Arxiu &gt; Obrir Cartera per a carregar cartera.
     </message>
     <message>
         <source>Pruning blockstore…</source>
-        <translation type="unfinished">Podant l'emmagatzematge de blocs...</translation>
+        <translation type="unfinished">Taller de poda...</translation>
     </message>
     <message>
         <source>Reducing -maxconnections from %d to %d, because of system limitations.</source>
@@ -4221,7 +4272,7 @@ Ves a Arxiu &gt; Obrir Cartera per a carregar cartera.
     </message>
     <message>
         <source>Specified -walletdir "%s" does not exist</source>
-        <translation type="unfinished">El -Walletdir "%s" especificat no existeix</translation>
+        <translation type="unfinished">-Walletdir especificat "%s" no existeix</translation>
     </message>
     <message>
         <source>Specified -walletdir "%s" is a relative path</source>
@@ -4267,10 +4318,6 @@ Ves a Arxiu &gt; Obrir Cartera per a carregar cartera.
         <source>This is the minimum transaction fee you pay on every transaction.</source>
         <translation type="unfinished">Aquesta és la tarifa mínima de transacció que paga en cada transacció.</translation>
     </message>
-    <message>
-        <source>This is the transaction fee you will pay if you send a transaction.</source>
-        <translation type="unfinished">Aquesta és la tarifa de transacció que pagareu si envieu una transacció.</translation>
-    </message>
     <message>
         <source>Transaction amount too small</source>
         <translation type="unfinished">La transacció és massa petita</translation>
@@ -4333,7 +4380,7 @@ Ves a Arxiu &gt; Obrir Cartera per a carregar cartera.
     </message>
     <message>
         <source>Error: Wallet does not exist</source>
-        <translation type="unfinished">Error: la cartera no existeix</translation>
+        <translation type="unfinished">Error: la Cartera no existeix</translation>
     </message>
     <message>
         <source>User Agent comment (%s) contains unsafe characters.</source>
diff --git a/src/qt/locale/bitcoin_cmn.ts b/src/qt/locale/bitcoin_cmn.ts
index df0dcbf54be0..52e3a1ce6f47 100644
--- a/src/qt/locale/bitcoin_cmn.ts
+++ b/src/qt/locale/bitcoin_cmn.ts
@@ -325,11 +325,29 @@ Signing is only possible with addresses of the type 'legacy'.</source>
         <source>Amount</source>
         <translation type="unfinished">金额</translation>
     </message>
+    <message>
+        <source>Enter a Bitcoin address (e.g. %1)</source>
+        <translation type="unfinished">请输入一个比特币地址 (例如 %1)</translation>
+    </message>
+    <message>
+        <source>Unroutable</source>
+        <translation type="unfinished">不可路由</translation>
+    </message>
     <message>
         <source>Inbound</source>
         <extracomment>An inbound connection from a peer. An inbound connection is a connection initiated by a peer.</extracomment>
         <translation type="unfinished">進來</translation>
     </message>
+    <message>
+        <source>Outbound</source>
+        <extracomment>An outbound connection to a peer. An outbound connection is a connection initiated by us.</extracomment>
+        <translation type="unfinished">傳出</translation>
+    </message>
+    <message>
+        <source>Full Relay</source>
+        <extracomment>Peer connection type that relays all network information.</extracomment>
+        <translation type="unfinished">完整转发</translation>
+    </message>
     <message>
         <source>Block Relay</source>
         <extracomment>Peer connection type that relays network information about blocks and not transactions or addresses.</extracomment>
@@ -340,6 +358,16 @@ Signing is only possible with addresses of the type 'legacy'.</source>
         <extracomment>Peer connection type established manually through one of several methods.</extracomment>
         <translation type="unfinished">手册</translation>
     </message>
+    <message>
+        <source>Feeler</source>
+        <extracomment>Short-lived peer connection type that tests the aliveness of known addresses.</extracomment>
+        <translation type="unfinished">触须</translation>
+    </message>
+    <message>
+        <source>Address Fetch</source>
+        <extracomment>Short-lived peer connection type that solicits known addresses from a peer.</extracomment>
+        <translation type="unfinished">地址取回</translation>
+    </message>
     <message>
         <source>%1 h</source>
         <translation type="unfinished">%1 小时</translation>
@@ -560,10 +588,6 @@ Signing is only possible with addresses of the type 'legacy'.</source>
         <source>Processing blocks on disk…</source>
         <translation type="unfinished">处理磁盘上的区块...</translation>
     </message>
-    <message>
-        <source>Connecting to peers…</source>
-        <translation type="unfinished">连接到节点...</translation>
-    </message>
     <message>
         <source>Request payments (generates QR codes and bitcoin: URIs)</source>
         <translation type="unfinished">请求支付 (生成二维码和 bitcoin: URI)</translation>
@@ -574,7 +598,7 @@ Signing is only possible with addresses of the type 'legacy'.</source>
     </message>
     <message>
         <source>Show the list of used receiving addresses and labels</source>
-        <translation type="unfinished">显示用过的收款地址和标签的列表</translation>
+        <translation type="unfinished">顯示已使用過的接收地址和標籤清單</translation>
     </message>
     <message>
         <source>&amp;Command-line options</source>
@@ -594,10 +618,6 @@ Signing is only possible with addresses of the type 'legacy'.</source>
         <source>Catching up…</source>
         <translation type="unfinished">正在追上进度...</translation>
     </message>
-    <message>
-        <source>Last received block was generated %1 ago.</source>
-        <translation type="unfinished">最新收到的区块产生于 %1 之前。</translation>
-    </message>
     <message>
         <source>Transactions after this will not yet be visible.</source>
         <translation type="unfinished">在此之后的交易尚不可见</translation>
@@ -606,18 +626,6 @@ Signing is only possible with addresses of the type 'legacy'.</source>
         <source>Error</source>
         <translation type="unfinished">错误</translation>
     </message>
-    <message>
-        <source>Warning</source>
-        <translation type="unfinished">警告</translation>
-    </message>
-    <message>
-        <source>Information</source>
-        <translation type="unfinished">信息</translation>
-    </message>
-    <message>
-        <source>Up to date</source>
-        <translation type="unfinished">已是最新</translation>
-    </message>
     <message>
         <source>Load Partially Signed Bitcoin Transaction</source>
         <translation type="unfinished">加载部分签名比特币交易（PSBT）</translation>
@@ -720,6 +728,23 @@ Signing is only possible with addresses of the type 'legacy'.</source>
         <extracomment>Label of the input field where the name of the wallet is entered.</extracomment>
         <translation type="unfinished">錢包名稱</translation>
     </message>
+    <message>
+        <source>Invalid Wallet Name</source>
+        <translation type="unfinished">無效的錢包名稱</translation>
+    </message>
+    <message>
+        <source>Wallet name cannot be empty</source>
+        <translation type="unfinished">錢包名稱不能為空白</translation>
+    </message>
+    <message>
+        <source>Restore and Migrate Wallet Backup</source>
+        <translation type="unfinished">恢復及遷移錢包備份</translation>
+    </message>
+    <message>
+        <source>Restore and Migrate Wallet</source>
+        <extracomment>Title of pop-up window shown when the user is attempting to restore a wallet.</extracomment>
+        <translation type="unfinished">恢復及遷移錢包</translation>
+    </message>
     <message>
         <source>&amp;Window</source>
         <translation type="unfinished">窗口(&amp;W)</translation>
@@ -891,6 +916,10 @@ Signing is only possible with addresses of the type 'legacy'.</source>
         <source>Received with address</source>
         <translation type="unfinished">收款地址</translation>
     </message>
+    <message>
+        <source>Date</source>
+        <translation type="unfinished">日期</translation>
+    </message>
     <message>
         <source>Copy amount</source>
         <translation type="unfinished">复制金额</translation>
@@ -915,6 +944,10 @@ Signing is only possible with addresses of the type 'legacy'.</source>
         <source>L&amp;ock unspent</source>
         <translation type="unfinished">锁定未花费(&amp;O)</translation>
     </message>
+    <message>
+        <source>&amp;Unlock unspent</source>
+        <translation type="unfinished">解鎖未花費的</translation>
+    </message>
     <message>
         <source>Copy quantity</source>
         <translation type="unfinished">复制数目</translation>
@@ -1040,6 +1073,24 @@ The migration process will create a backup of the wallet before migrating. This
         <source>Solvable but not watched scripts have been migrated to a new wallet named '%1'.</source>
         <translation type="unfinished">可解决但未被观察到的脚本已经被迁移到被命名为“%1”的新钱包。</translation>
     </message>
+    <message>
+        <source>Restore and Migrate wallet</source>
+        <translation type="unfinished">恢復及遷移錢包</translation>
+    </message>
+    <message>
+        <source>Are you sure you wish to restore the wallet file &lt;i&gt;%1&lt;/i&gt; to &lt;i&gt;%2&lt;/i&gt; and migrate it?</source>
+        <translation type="unfinished">您確定要恢復錢包檔案&lt;i&gt;%1&lt;/i&gt;到&lt;i&gt;%2&lt;/i&gt;及遷移它嗎？</translation>
+    </message>
+    <message>
+        <source>Restore Wallet</source>
+        <extracomment>Title of progress window which is displayed when wallets are being restored.</extracomment>
+        <translation type="unfinished">恢復錢包</translation>
+    </message>
+    <message>
+        <source>Restoring Wallet &lt;b&gt;%1&lt;/b&gt;…</source>
+        <extracomment>Descriptive text of the restore wallets progress window which indicates to the user that wallets are currently being restored.</extracomment>
+        <translation type="unfinished">正在恢復錢包&lt;b&gt;%1&lt;/b&gt;...</translation>
+    </message>
     <message>
         <source>Migration failed</source>
         <translation type="unfinished">迁移失败</translation>
@@ -1155,10 +1206,6 @@ The migration process will create a backup of the wallet before migrating. This
         <source>Disable Private Keys</source>
         <translation type="unfinished">禁用私钥</translation>
     </message>
-    <message>
-        <source>Make a blank wallet. Blank wallets do not initially have private keys or scripts. Private keys and addresses can be imported, or an HD seed can be set, at a later time.</source>
-        <translation type="unfinished">製作一個空白的錢包。空白錢包最初沒有私鑰或腳本。以後可以匯入私鑰和地址，或者可以設定HD種子。</translation>
-    </message>
     <message>
         <source>Make Blank Wallet</source>
         <translation type="unfinished">製作空白錢包</translation>
@@ -1826,7 +1873,7 @@ The migration process will create a backup of the wallet before migrating. This
     </message>
     <message>
         <source>Sign Tx</source>
-        <translation type="unfinished">签名交易</translation>
+        <translation type="unfinished">簽名交易</translation>
     </message>
     <message>
         <source>Broadcast Tx</source>
@@ -1834,15 +1881,15 @@ The migration process will create a backup of the wallet before migrating. This
     </message>
     <message>
         <source>Copy to Clipboard</source>
-        <translation type="unfinished">复制到剪贴板</translation>
+        <translation type="unfinished">複製到剪貼簿</translation>
     </message>
     <message>
         <source>Save…</source>
-        <translation type="unfinished">保存...</translation>
+        <translation type="unfinished">拯救...</translation>
     </message>
     <message>
         <source>Close</source>
-        <translation type="unfinished">关闭</translation>
+        <translation type="unfinished">關閉</translation>
     </message>
     <message>
         <source>Failed to load transaction: %1</source>
@@ -1860,9 +1907,11 @@ The migration process will create a backup of the wallet before migrating. This
         <source>Could not sign any more inputs.</source>
         <translation type="unfinished">没有交易输入项可供签名了。</translation>
     </message>
-    <message>
-        <source>Signed %1 inputs, but more signatures are still required.</source>
-        <translation type="unfinished">已签名 %1 个交易输入项，但是仍然还有余下的项目需要签名。</translation>
+    <message numerus="yes">
+        <source>Signed %n input(s), but more signatures are still required.</source>
+        <translation type="unfinished">
+            <numerusform />
+        </translation>
     </message>
     <message>
         <source>Signed transaction successfully. Transaction is ready to broadcast.</source>
@@ -1874,11 +1923,11 @@ The migration process will create a backup of the wallet before migrating. This
     </message>
     <message>
         <source>Transaction broadcast successfully! Transaction ID: %1</source>
-        <translation type="unfinished">已成功广播交易！交易ID: %1</translation>
+        <translation type="unfinished">交易成功廣播！交易 ID：%1</translation>
     </message>
     <message>
         <source>Transaction broadcast failed: %1</source>
-        <translation type="unfinished">交易广播失败: %1</translation>
+        <translation type="unfinished">交易廣播失敗：%1</translation>
     </message>
     <message>
         <source>PSBT copied to clipboard.</source>
@@ -1905,6 +1954,10 @@ The migration process will create a backup of the wallet before migrating. This
         <source>own address</source>
         <translation type="unfinished">自己的地址</translation>
     </message>
+    <message>
+        <source>Unable to calculate transaction fee or total transaction amount.</source>
+        <translation type="unfinished">无法计算交易费用或总交易金额。</translation>
+    </message>
     <message>
         <source>Pays transaction fee: </source>
         <translation type="unfinished">支付交易费用:</translation>
@@ -1917,6 +1970,12 @@ The migration process will create a backup of the wallet before migrating. This
         <source>or</source>
         <translation type="unfinished">或</translation>
     </message>
+    <message numerus="yes">
+        <source>Transaction has %n unsigned input(s).</source>
+        <translation type="unfinished">
+            <numerusform />
+        </translation>
+    </message>
     <message>
         <source>Transaction is missing some information about inputs.</source>
         <translation type="unfinished">交易中有输入项缺失某些信息。</translation>
@@ -1933,6 +1992,14 @@ The migration process will create a backup of the wallet before migrating. This
         <source>(But this wallet cannot sign transactions.)</source>
         <translation type="unfinished">(但这个钱包不能签名交易)</translation>
     </message>
+    <message>
+        <source>(But this wallet does not have the right keys.)</source>
+        <translation type="unfinished">(但这个钱包没有正确的密钥)</translation>
+    </message>
+    <message>
+        <source>Transaction is fully signed and ready for broadcast.</source>
+        <translation type="unfinished">交易已经完全签名，可以广播。</translation>
+    </message>
     <message>
         <source>Transaction status is unknown.</source>
         <translation type="unfinished">交易状态未知。</translation>
@@ -1944,6 +2011,10 @@ The migration process will create a backup of the wallet before migrating. This
         <source>Payment request error</source>
         <translation type="unfinished">支付请求出错</translation>
     </message>
+    <message>
+        <source>Cannot start bitcoin: click-to-pay handler</source>
+        <translation type="unfinished">无法启动 bitcoin: 协议的“一键支付”处理程序</translation>
+    </message>
     <message>
         <source>URI handling</source>
         <translation type="unfinished">URI 處理</translation>
@@ -2021,7 +2092,12 @@ If you are receiving this error you should request the merchant provide a BIP21
         <extracomment>An Inbound Connection from a Peer.</extracomment>
         <translation type="unfinished">進來</translation>
     </message>
-    </context>
+    <message>
+        <source>Outbound</source>
+        <extracomment>An Outbound Connection to a Peer.</extracomment>
+        <translation type="unfinished">傳出</translation>
+    </message>
+</context>
 <context>
     <name>QRImageWidget</name>
     <message>
@@ -2188,10 +2264,6 @@ If you are receiving this error you should request the merchant provide a BIP21
         <source>Transaction Relay</source>
         <translation type="unfinished">交易转发</translation>
     </message>
-    <message>
-        <source>Starting Block</source>
-        <translation type="unfinished">起步区块</translation>
-    </message>
     <message>
         <source>Synced Headers</source>
         <translation type="unfinished">已同步前導資料</translation>
@@ -2474,10 +2546,6 @@ If you are receiving this error you should request the merchant provide a BIP21
         <source>Network activity disabled</source>
         <translation type="unfinished">网络活动已禁用</translation>
     </message>
-    <message>
-        <source>None</source>
-        <translation type="unfinished">无</translation>
-    </message>
     <message>
         <source>Executing command without any wallet</source>
         <translation type="unfinished">不使用任何钱包执行命令</translation>
@@ -2725,10 +2793,6 @@ For more information on using this console, type %6.
 </context>
 <context>
     <name>RecentRequestsTableModel</name>
-    <message>
-        <source>Date</source>
-        <translation type="unfinished"> 日期</translation>
-    </message>
     <message>
         <source>Label</source>
         <translation type="unfinished">标签</translation>
@@ -3046,10 +3110,6 @@ Note:  Since the fee is calculated on a per-byte basis, a fee rate of "100 satos
         <source>The amount exceeds your balance.</source>
         <translation type="unfinished">金额超出您的余额。</translation>
     </message>
-    <message>
-        <source>The total exceeds your balance when the %1 transaction fee is included.</source>
-        <translation type="unfinished">计入 %1 手续费后，金额超出了您的余额。</translation>
-    </message>
     <message>
         <source>Duplicate address found: addresses should only be used once each.</source>
         <translation type="unfinished">发现重复地址:每个地址应该只使用一次。</translation>
@@ -3342,7 +3402,7 @@ Note:  Since the fee is calculated on a per-byte basis, a fee rate of "100 satos
     </message>
     <message>
         <source>Date</source>
-        <translation type="unfinished"> 日期</translation>
+        <translation type="unfinished">日期</translation>
     </message>
     <message>
         <source>Source</source>
@@ -3478,7 +3538,7 @@ Note:  Since the fee is calculated on a per-byte basis, a fee rate of "100 satos
     <name>TransactionTableModel</name>
     <message>
         <source>Date</source>
-        <translation type="unfinished"> 日期</translation>
+        <translation type="unfinished">日期</translation>
     </message>
     <message>
         <source>Type</source>
@@ -3661,9 +3721,13 @@ Note:  Since the fee is calculated on a per-byte basis, a fee rate of "100 satos
         <extracomment>Expanded name of the CSV file format. See: https://en.wikipedia.org/wiki/Comma-separated_values.</extracomment>
         <translation type="unfinished">逗號分隔文件</translation>
     </message>
+    <message>
+        <source>Confirmed</source>
+        <translation type="unfinished">已確認</translation>
+    </message>
     <message>
         <source>Date</source>
-        <translation type="unfinished"> 日期</translation>
+        <translation type="unfinished">日期</translation>
     </message>
     <message>
         <source>Type</source>
@@ -3973,10 +4037,6 @@ Go to File &gt; Open Wallet to load a wallet.
         <source>Warning: Private keys detected in wallet {%s} with disabled private keys</source>
         <translation type="unfinished">警告：在已经禁用私钥的钱包 {%s} 中仍然检测到私钥</translation>
     </message>
-    <message>
-        <source>Warning: We do not appear to fully agree with our peers! You may need to upgrade, or other nodes may need to upgrade.</source>
-        <translation type="unfinished">警告：我们和其他节点似乎没达成共识！您可能需要升级，或者就是其他节点可能需要升级。</translation>
-    </message>
     <message>
         <source>Witness data for blocks after height %d requires validation. Please restart with -reindex.</source>
         <translation type="unfinished">需要验证高度在%d之后的区块见证数据。请使用 -reindex 重新启动。</translation>
@@ -4057,14 +4117,6 @@ Go to File &gt; Open Wallet to load a wallet.
         <source>Option '-checkpoints' is set but checkpoints were removed. This option has no effect.</source>
         <translation type="unfinished">选项“-checkpoints”已设置，但检查点已被移除。该选项不再生效。 </translation>
     </message>
-    <message>
-        <source>Option '-maxorphantx' is set but no longer has any effect (see release notes). Please remove it from your configuration.</source>
-        <translation type="unfinished">选项“-maxorphantx”已设置，但已不再生效（参见发行说明）。请从您的配置中移除该选项。 </translation>
-    </message>
-    <message>
-        <source>Options '-datacarrier' or '-datacarriersize' are set but are marked as deprecated. They will be removed in a future version.</source>
-        <translation type="unfinished">选项“-datacarrier”或“-datacarriersize”已设置，但已标记为弃用。它们将在未来版本中移除。 </translation>
-    </message>
     <message>
         <source>Outbound connections restricted to CJDNS (-onlynet=cjdns) but -cjdnsreachable is not provided</source>
         <translation type="unfinished">传出连接被限制为仅使用CJDNS (-onlynet=cjdns) ，但却未提供 -cjdnsreachable 参数。</translation>
@@ -4123,10 +4175,6 @@ Unable to restore backup of wallet.</source>
         <translation type="unfinished">
 无法还原钱包备份</translation>
     </message>
-    <message>
-        <source>-paytxfee is deprecated and will be fully removed in v31.0.</source>
-        <translation type="unfinished">“-paytxfee”已弃用，并将在 v31.0 中完全移除。 </translation>
-    </message>
     <message>
         <source>A fatal internal error occurred, see debug.log for details: </source>
         <translation type="unfinished">發生致命的內部錯誤，有關詳情請查看 debug.log：</translation>
@@ -4136,8 +4184,12 @@ Unable to restore backup of wallet.</source>
         <translation type="unfinished">区块验证已中断</translation>
     </message>
     <message>
-        <source>Cannot add WalletDescriptor to a non-descriptor wallet</source>
-        <translation type="unfinished">无法将钱包描述符添加到非描述符钱包。</translation>
+        <source>Can't spend unconfirmed version %d pre-selected input with a version 3 tx</source>
+        <translation type="unfinished">无法使用版本3交易花费未确认版本1%d的预选输入。</translation>
+    </message>
+    <message>
+        <source>Can't spend unconfirmed version 3 pre-selected input with a version %d tx</source>
+        <translation type="unfinished">无法使用版本1%d交易花费未确认版本3的预选输入。</translation>
     </message>
     <message>
         <source>Cannot write to directory '%s'; check permissions.</source>
@@ -4183,10 +4235,6 @@ Unable to restore backup of wallet.</source>
         <source>Dump file %s does not exist.</source>
         <translation type="unfinished">转储文件 %s 不存在</translation>
     </message>
-    <message>
-        <source>Error creating %s</source>
-        <translation type="unfinished">创建%s时出错</translation>
-    </message>
     <message>
         <source>Error initializing block database</source>
         <translation type="unfinished">初始化区块数据库时出错</translation>
@@ -4195,10 +4243,6 @@ Unable to restore backup of wallet.</source>
         <source>Error loading %s</source>
         <translation type="unfinished">載入檔案 %s 時發生錯誤</translation>
     </message>
-    <message>
-        <source>Error loading %s: Private keys can only be disabled during creation</source>
-        <translation type="unfinished">載入 %s 時發生錯誤: 只有在造新錢包時能夠指定不允許私鑰</translation>
-    </message>
     <message>
         <source>Error loading %s: Wallet corrupted</source>
         <translation type="unfinished">載入檔案 %s 時發生錯誤: 錢包損毀了</translation>
@@ -4359,10 +4403,6 @@ Unable to restore backup of wallet.</source>
         <source>Failed to write block.</source>
         <translation type="unfinished">寫入區塊失敗。</translation>
     </message>
-    <message>
-        <source>Failed to write to block index database.</source>
-        <translation type="unfinished">寫入區塊索引資料庫失敗。</translation>
-    </message>
     <message>
         <source>Failure removing transaction: %s</source>
         <translation type="unfinished">%s删除交易时失败: </translation>
@@ -4403,14 +4443,14 @@ Unable to restore backup of wallet.</source>
         <source>Invalid P2P permission: '%s'</source>
         <translation type="unfinished">无效的 P2P 权限：'%s'</translation>
     </message>
-    <message>
-        <source>Invalid amount for %s=&lt;amount&gt;: '%s' (must be at least %s)</source>
-        <translation type="unfinished">%s=&lt;amount&gt;: '%s' 中指定了非法的金额 (必须至少达到 %s)</translation>
-    </message>
     <message>
         <source>Invalid amount for %s=&lt;amount&gt;: '%s'</source>
         <translation type="unfinished">%s=&lt;amount&gt;: '%s' 中指定了非法的金额</translation>
     </message>
+    <message>
+        <source>Creating wallet…</source>
+        <translation type="unfinished">創建錢包...</translation>
+    </message>
     <message>
         <source>Invalid amount for -%s=&lt;amount&gt;: '%s'</source>
         <translation type="unfinished">参数 -%s=&lt;amount&gt;: '%s' 指定了无效的金额</translation>
@@ -4511,6 +4551,10 @@ Unable to restore backup of wallet.</source>
         <source>Starting network threads…</source>
         <translation type="unfinished">正在開始網路線程...</translation>
     </message>
+    <message>
+        <source>The %s path uses exFAT, which is known to have intermittent corruption problems on macOS. Move this directory to a different filesystem to avoid data loss.</source>
+        <translation type="unfinished">%s路径使用exFAT，该格式在macOS上已知会出现间歇性损坏问题。请将此目录移动到其他文件系统以避免数据丢失。</translation>
+    </message>
     <message>
         <source>The source code is available from %s.</source>
         <translation type="unfinished">可以从 %s 获取源代码。</translation>
diff --git a/src/qt/locale/bitcoin_cs.ts b/src/qt/locale/bitcoin_cs.ts
index e59451856c6e..4c948699ad0e 100644
--- a/src/qt/locale/bitcoin_cs.ts
+++ b/src/qt/locale/bitcoin_cs.ts
@@ -7,7 +7,7 @@
     </message>
     <message>
         <source>Create a new address</source>
-        <translation type="unfinished">Vytvoř novou adresu</translation>
+        <translation type="unfinished">Vytvořit novou adresu</translation>
     </message>
     <message>
         <source>&amp;New</source>
@@ -15,7 +15,7 @@
     </message>
     <message>
         <source>&amp;Copy</source>
-        <translation type="unfinished">&amp;Kopíruj</translation>
+        <translation type="unfinished">&amp;Kopírovat</translation>
     </message>
     <message>
         <source>C&amp;lose</source>
@@ -23,7 +23,7 @@
     </message>
     <message>
         <source>Delete the currently selected address from the list</source>
-        <translation type="unfinished">Smaž tuto adresu ze seznamu</translation>
+        <translation type="unfinished">Smazat vybranou adresu ze seznamu</translation>
     </message>
     <message>
         <source>Enter address or label to search</source>
@@ -35,15 +35,15 @@
     </message>
     <message>
         <source>Export the data in the current tab to a file</source>
-        <translation type="unfinished">Exportuj data z tohoto panelu do souboru</translation>
+        <translation type="unfinished">Exportovat data z tohoto panelu do souboru</translation>
     </message>
     <message>
         <source>&amp;Delete</source>
-        <translation type="unfinished">&amp;Smaž</translation>
+        <translation type="unfinished">&amp;Smazat</translation>
     </message>
     <message>
         <source>Choose the address to send coins to</source>
-        <translation type="unfinished">Zvol adresu, na kterou pošleš mince</translation>
+        <translation type="unfinished">Zvolte adresu, na kterou chcete poslat mince</translation>
     </message>
     <message>
         <source>Choose the address to receive coins with</source>
@@ -51,7 +51,7 @@
     </message>
     <message>
         <source>C&amp;hoose</source>
-        <translation type="unfinished">&amp;Zvol</translation>
+        <translation type="unfinished">&amp;Zvolit</translation>
     </message>
     <message>
         <source>These are your Bitcoin addresses for sending payments. Always check the amount and the receiving address before sending coins.</source>
@@ -64,15 +64,15 @@ Signing is only possible with addresses of the type 'legacy'.</source>
     </message>
     <message>
         <source>&amp;Copy Address</source>
-        <translation type="unfinished">&amp;Kopíruj adresu</translation>
+        <translation type="unfinished">&amp;Kopírovat Adresu</translation>
     </message>
     <message>
         <source>Copy &amp;Label</source>
-        <translation type="unfinished">Kopíruj &amp;označení</translation>
+        <translation type="unfinished">Kopírovat &amp;Štítek</translation>
     </message>
     <message>
         <source>&amp;Edit</source>
-        <translation type="unfinished">&amp;Uprav</translation>
+        <translation type="unfinished">&amp;Upravit</translation>
     </message>
     <message>
         <source>Export Address List</source>
@@ -120,23 +120,23 @@ Signing is only possible with addresses of the type 'legacy'.</source>
     <name>AskPassphraseDialog</name>
     <message>
         <source>Passphrase Dialog</source>
-        <translation type="unfinished">Změna hesla</translation>
+        <translation type="unfinished">Dialog pro zadání přístupové fráze</translation>
     </message>
     <message>
         <source>Enter passphrase</source>
-        <translation type="unfinished">Zadej platné heslo</translation>
+        <translation type="unfinished">Zadej přístupovou frázi</translation>
     </message>
     <message>
         <source>New passphrase</source>
-        <translation type="unfinished">Zadej nové heslo</translation>
+        <translation type="unfinished">Zadej novou přístupovou frázi</translation>
     </message>
     <message>
         <source>Repeat new passphrase</source>
-        <translation type="unfinished">Totéž heslo ještě jednou</translation>
+        <translation type="unfinished">Zopakuj novou přístupovou frázi</translation>
     </message>
     <message>
         <source>Show passphrase</source>
-        <translation type="unfinished">Ukaž heslo</translation>
+        <translation type="unfinished">Ukaž přístupovou frázi</translation>
     </message>
     <message>
         <source>Encrypt wallet</source>
@@ -152,7 +152,7 @@ Signing is only possible with addresses of the type 'legacy'.</source>
     </message>
     <message>
         <source>Change passphrase</source>
-        <translation type="unfinished">Změň heslo</translation>
+        <translation type="unfinished">Změň přístupovou frázi</translation>
     </message>
     <message>
         <source>Confirm wallet encryption</source>
@@ -315,54 +315,12 @@ Signing is only possible with addresses of the type 'legacy'.</source>
     </message>
     <message>
         <source>Custom…</source>
-        <translation type="unfinished">Volitelný...</translation>
+        <translation type="unfinished">Vlastní...</translation>
     </message>
     <message>
-        <source>Amount</source>
-        <translation type="unfinished">Částka</translation>
-    </message>
-    <message>
-        <source>Enter a Bitcoin address (e.g. %1)</source>
-        <translation type="unfinished">Zadej bitcoinovou adresu (např. %1)</translation>
-    </message>
-    <message>
-        <source>Unroutable</source>
-        <translation type="unfinished">Nesměrovatelné</translation>
-    </message>
-    <message>
-        <source>Inbound</source>
-        <extracomment>An inbound connection from a peer. An inbound connection is a connection initiated by a peer.</extracomment>
-        <translation type="unfinished">Sem</translation>
-    </message>
-    <message>
-        <source>Outbound</source>
-        <extracomment>An outbound connection to a peer. An outbound connection is a connection initiated by us.</extracomment>
-        <translation type="unfinished">Ven</translation>
-    </message>
-    <message>
-        <source>Full Relay</source>
-        <extracomment>Peer connection type that relays all network information.</extracomment>
-        <translation type="unfinished">Plná štafeta</translation>
-    </message>
-    <message>
-        <source>Block Relay</source>
-        <extracomment>Peer connection type that relays network information about blocks and not transactions or addresses.</extracomment>
-        <translation type="unfinished">Blokové relé</translation>
-    </message>
-    <message>
-        <source>Manual</source>
-        <extracomment>Peer connection type established manually through one of several methods.</extracomment>
-        <translation type="unfinished">Manuální</translation>
-    </message>
-    <message>
-        <source>Feeler</source>
-        <extracomment>Short-lived peer connection type that tests the aliveness of known addresses.</extracomment>
-        <translation type="unfinished">Tykadlo</translation>
-    </message>
-    <message>
-        <source>Address Fetch</source>
-        <extracomment>Short-lived peer connection type that solicits known addresses from a peer.</extracomment>
-        <translation type="unfinished">Načtení adresy</translation>
+        <source>Private Broadcast</source>
+        <extracomment>Short-lived peer connection type that is used for broadcasting privacy-sensitive data.</extracomment>
+        <translation type="unfinished">Soukromý broadcast</translation>
     </message>
     <message>
         <source>None</source>
@@ -572,6 +530,10 @@ Signing is only possible with addresses of the type 'legacy'.</source>
         <source>Close All Wallets…</source>
         <translation type="unfinished">Zavřít všechny peněženky...</translation>
     </message>
+    <message>
+        <source>Restore and Migrate Wallet File…</source>
+        <translation type="unfinished">Obnovení a migrace souboru peněženky...</translation>
+    </message>
     <message>
         <source>&amp;File</source>
         <translation type="unfinished">&amp;Soubor</translation>
@@ -582,7 +544,7 @@ Signing is only possible with addresses of the type 'legacy'.</source>
     </message>
     <message>
         <source>&amp;Help</source>
-        <translation type="unfinished">Nápověd&amp;a</translation>
+        <translation type="unfinished">&amp;Nápověda</translation>
     </message>
     <message>
         <source>Tabs toolbar</source>
@@ -676,21 +638,17 @@ Signing is only possible with addresses of the type 'legacy'.</source>
         <source>Load Partially Signed Bitcoin Transaction from clipboard</source>
         <translation type="unfinished">Načíst částečně podepsanou Bitcoinovou transakci ze schránky</translation>
     </message>
-    <message>
-        <source>Node window</source>
-        <translation type="unfinished">Okno uzlu</translation>
-    </message>
     <message>
         <source>Open node debugging and diagnostic console</source>
         <translation type="unfinished">Otevřít konzolu pro ladění a diagnostiku uzlů</translation>
     </message>
     <message>
         <source>&amp;Sending addresses</source>
-        <translation type="unfinished">Odesílací adresy</translation>
+        <translation type="unfinished">&amp;Odesílací adresy</translation>
     </message>
     <message>
         <source>&amp;Receiving addresses</source>
-        <translation type="unfinished">Přijímací adresy</translation>
+        <translation type="unfinished">&amp;Přijímací adresy</translation>
     </message>
     <message>
         <source>Open a bitcoin: URI</source>
@@ -766,6 +724,23 @@ Signing is only possible with addresses of the type 'legacy'.</source>
         <extracomment>Label of the input field where the name of the wallet is entered.</extracomment>
         <translation type="unfinished">Název peněženky</translation>
     </message>
+    <message>
+        <source>Invalid Wallet Name</source>
+        <translation type="unfinished">Neplatný název peněženky</translation>
+    </message>
+    <message>
+        <source>Wallet name cannot be empty</source>
+        <translation type="unfinished">Název peněženky nemůže být prázdný</translation>
+    </message>
+    <message>
+        <source>Restore and Migrate Wallet Backup</source>
+        <translation type="unfinished">Obnovení a migrace zálohy peněženky</translation>
+    </message>
+    <message>
+        <source>Restore and Migrate Wallet</source>
+        <extracomment>Title of pop-up window shown when the user is attempting to restore a wallet.</extracomment>
+        <translation type="unfinished">Obnovení a migrace peněženky</translation>
+    </message>
     <message>
         <source>&amp;Window</source>
         <translation type="unfinished">O&amp;kno</translation>
@@ -784,11 +759,11 @@ Signing is only possible with addresses of the type 'legacy'.</source>
     </message>
     <message>
         <source>&amp;Hide</source>
-        <translation type="unfinished">Skryj</translation>
+        <translation type="unfinished">&amp;Skrýt</translation>
     </message>
     <message>
         <source>S&amp;how</source>
-        <translation type="unfinished">Zobraz</translation>
+        <translation type="unfinished">&amp;Zobrazit</translation>
     </message>
     <message numerus="yes">
         <source>%n active connection(s) to Bitcoin network.</source>
@@ -961,10 +936,6 @@ Signing is only possible with addresses of the type 'legacy'.</source>
         <source>Received with address</source>
         <translation type="unfinished">Příjem na adrese</translation>
     </message>
-    <message>
-        <source>Date</source>
-        <translation type="unfinished">Datum</translation>
-    </message>
     <message>
         <source>Confirmations</source>
         <translation type="unfinished">Potvrzení</translation>
@@ -1011,7 +982,7 @@ Signing is only possible with addresses of the type 'legacy'.</source>
     </message>
     <message>
         <source>Copy after fee</source>
-        <translation type="unfinished">Kopíruj čistou částku</translation>
+        <translation type="unfinished">Zkopírovat částku po odečtení poplatku</translation>
     </message>
     <message>
         <source>Copy bytes</source>
@@ -1100,11 +1071,11 @@ If this wallet contains any watchonly scripts, a new wallet will be created whic
 If this wallet contains any solvable but not watched scripts, a different and new wallet will be created which contains those scripts.
 
 The migration process will create a backup of the wallet before migrating. This backup file will be named &lt;wallet name&gt;-&lt;timestamp&gt;.legacy.bak and can be found in the directory for this wallet. In the event of an incorrect migration, the backup can be restored with the "Restore Wallet" functionality.</source>
-        <translation type="unfinished">Migrace peněženky povede k její přeměně na jednu nebo více deskriptorových peněženek. Bude třeba vytvořit novou zálohu peněženky.
-Pokud peněženka obsahuje jakékoliv skripty, které lze pouze sledovat, bude vytvořena nová peněženka pouze pro tyto skripty.
-Pokud tato peněženka obsahuje jakékoliv řešitelné skripty, které nejdou sledovat, bude vytvořena nová jiná peněženka, která bude obsahovat tyto skripty.
+        <translation type="unfinished">Migrace peněženky ji převede na jednu nebo více deskriptorových peněženek. Bude třeba vytvořit novou zálohu peněženky.
+Pokud tato peněženka obsahuje jakékoli skripty určené pouze ke sledování, bude vytvořena nová peněženka, která bude tyto skripty obsahovat.
+Pokud tato peněženka obsahuje jakékoli řešitelné, ale nesledované skripty, bude vytvořena další nová peněženka, která bude tyto skripty obsahovat.
 
-Proces migrace vytvoří zálohu peněženky přes samotnou migrací. Soubor se zálohou se bude nazývat &lt;wallet name&gt;-&lt;timestamp&gt;.legacy.bak a bude umístěn v adresáři s touto peněženkou. V případě nepovedené migrace je možné provést obnovu prostřednitvím funkce "Obnovit peněženku".</translation>
+Proces migrace vytvoří zálohu peněženky před samotnou migrací. Tento záložní soubor se bude jmenovat &lt;wallet name&gt;-&lt;timestamp&gt;.legacy.bak a bude umístěn v adresáři této peněženky. V případě chybné migrace lze zálohu obnovit pomocí funkce "Obnovit peněženku".</translation>
     </message>
     <message>
         <source>Migrate Wallet</source>
@@ -1126,6 +1097,40 @@ Proces migrace vytvoří zálohu peněženky přes samotnou migrací. Soubor se
         <source>Solvable but not watched scripts have been migrated to a new wallet named '%1'.</source>
         <translation type="unfinished">Řešitelné, avšak nesledované skripty byly migrovány do nové peněženky nazvané '%1'.</translation>
     </message>
+    <message>
+        <source>Restore and Migrate wallet</source>
+        <translation type="unfinished">Obnovení a migrace peněženky</translation>
+    </message>
+    <message>
+        <source>Are you sure you wish to restore the wallet file &lt;i&gt;%1&lt;/i&gt; to &lt;i&gt;%2&lt;/i&gt; and migrate it?</source>
+        <translation type="unfinished">Opravdu chcete obnovit soubor peněženky &lt;i&gt;%1&lt;/i&gt; do &lt;i&gt;%2&lt;/i&gt; a migrovat jej?</translation>
+    </message>
+    <message>
+        <source>Restoring the wallet will copy the backup file to the wallets directory and place it in the standard wallet directory layout. The original file will not be modified.
+
+Migrating the wallet will convert the restored wallet to one or more descriptor wallets. A new wallet backup will need to be made.
+If this wallet contains any watchonly scripts, a new wallet will be created which contains those watchonly scripts.
+If this wallet contains any solvable but not watched scripts, a different and new wallet will be created which contains those scripts.
+
+The migration process will create a backup of the wallet before migrating. This backup file will be named &lt;wallet name&gt;-&lt;timestamp&gt;.legacy.bak and can be found in the directory for this wallet. In the event of an incorrect migration, the backup can be restored with the "Restore Wallet" functionality.</source>
+        <translation type="unfinished">Obnovení peněženky nakopíruje záložní soubor do jejího adresáře a umístí jej do standardního adresářového stromu. Původní soubor nebude pozměněn.
+
+Migrace peněženky převede obnovenou peněženku na jednu nebo více deskriptorových peněženek. Zároveň bude třeba vytvořit novou zálohu peněženky.
+Pokud obsahuje tato peněženka jakékoliv skripty určené pouze ke sledování, bude vytvořena nová peněženka, která bude tyto skripty obsahovat.
+Pokud tato peněženka obsahuje jakékoli řešitelné, ale nesledované skripty, bude vytvořena další nová peněženka, která bude tyto skripty obsahovat.
+
+Proces migrace vytvoří zálohu peněženky před samotnou migrací. Tento záložní soubor se bude jmenovat &lt;wallet name&gt;-&lt;timestamp&gt;.legacy.bak a bude umístěn v adresáři této peněženky. V případě chybné migrace lze zálohu obnovit pomocí funkce "Obnovit peněženku".</translation>
+    </message>
+    <message>
+        <source>Restore Wallet</source>
+        <extracomment>Title of progress window which is displayed when wallets are being restored.</extracomment>
+        <translation type="unfinished">Obnovit peněženku</translation>
+    </message>
+    <message>
+        <source>Restoring Wallet &lt;b&gt;%1&lt;/b&gt;…</source>
+        <extracomment>Descriptive text of the restore wallets progress window which indicates to the user that wallets are currently being restored.</extracomment>
+        <translation type="unfinished">Obnovuji peněženku &lt;b&gt;%1&lt;/b&gt; ...</translation>
+    </message>
     <message>
         <source>Migration failed</source>
         <translation type="unfinished">Migrace se nezdařila</translation>
@@ -1250,8 +1255,8 @@ Proces migrace vytvoří zálohu peněženky přes samotnou migrací. Soubor se
         <translation type="unfinished">Zrušit soukromé klíče</translation>
     </message>
     <message>
-        <source>Make a blank wallet. Blank wallets do not initially have private keys or scripts. Private keys and addresses can be imported, or an HD seed can be set, at a later time.</source>
-        <translation type="unfinished">Vytvořit prázdnou peněženku. Prázdné peněženky na začátku nemají žádné soukromé klíče ani skripty. Později mohou být importovány soukromé klíče a adresy nebo nastavená HD inicializace.</translation>
+        <source>Make a blank wallet. Blank wallets do not initially have private keys or scripts. Private keys and addresses can be imported using descriptors at a later time.</source>
+        <translation type="unfinished">Vytvořit prázdnou peněženku. Prázdné peněženky zpočátku nemají žádné soukromé klíče ani skripty. Později mohou být importovány soukromé klíče a adresy pomocí deskriptorů.</translation>
     </message>
     <message>
         <source>Make Blank Wallet</source>
@@ -1499,7 +1504,7 @@ Proces migrace vytvoří zálohu peněženky přes samotnou migrací. Soubor se
     </message>
     <message>
         <source>Attempting to spend bitcoins that are affected by not-yet-displayed transactions will not be accepted by the network.</source>
-        <translation type="unfinished">Utrácení bitcoinů, které už utratily zatím nezobrazené transakce, nebude bitcoinovou sítí umožněno.</translation>
+        <translation type="unfinished">Pokus o utracení bitcoinů, které jsou ovlivněny dosud nezobrazenými transakcemi, nebude sítí akceptován.</translation>
     </message>
     <message>
         <source>Number of blocks left</source>
@@ -1603,7 +1608,7 @@ Proces migrace vytvoří zálohu peněženky přes samotnou migrací. Soubor se
     </message>
     <message>
         <source>Automatically open the Bitcoin client port on the router. This only works when your router supports PCP or NAT-PMP and it is enabled. The external port could be random.</source>
-        <translation type="unfinished">Automaticky otevřít port klienta Bitcoinu na routeru. To funguje pouze tehdy, pokud váš router podporuje PCP nebo NAT-PMP a jsou povoleny. Externí port může být náhodný. </translation>
+        <translation type="unfinished">Automaticky otevřít port klienta Bitcoinu na routeru. To funguje pouze tehdy, pokud váš router podporuje PCP nebo NAT-PMP a je to povoleno. Externí port může být náhodný. </translation>
     </message>
     <message>
         <source>Map port using PCP or NA&amp;T-PMP</source>
@@ -1623,7 +1628,7 @@ Proces migrace vytvoří zálohu peněženky přes samotnou migrací. Soubor se
     </message>
     <message>
         <source>Font in the Overview tab: </source>
-        <translation type="unfinished">Písmo s pevnou šířkou v panelu Přehled:</translation>
+        <translation type="unfinished">Písmo na kartě Přehled: </translation>
     </message>
     <message>
         <source>Options set in this dialog are overridden by the command line:</source>
@@ -1664,7 +1669,7 @@ Proces migrace vytvoří zálohu peněženky přes samotnou migrací. Soubor se
     </message>
     <message>
         <source>(0 = auto, &lt;0 = leave that many cores free)</source>
-        <translation type="unfinished">(0 = automaticky, &lt;0 = nechat daný počet jader volný)</translation>
+        <translation type="unfinished">(0 = automaticky, &lt;0 = nechat daný počet jader volných)</translation>
     </message>
     <message>
         <source>This allows you or a third party tool to communicate with the node through command-line and JSON-RPC commands.</source>
@@ -1688,7 +1693,7 @@ Proces migrace vytvoří zálohu peněženky přes samotnou migrací. Soubor se
     <message>
         <source>Subtract &amp;fee from amount by default</source>
         <extracomment>An Options window setting to set subtracting the fee from a sending amount as default.</extracomment>
-        <translation type="unfinished">Odečíst &amp;poplatek od výchozí částky</translation>
+        <translation type="unfinished">Ve výchozím nastavení odečíst &amp;poplatek z částky</translation>
     </message>
     <message>
         <source>Enable coin &amp;control features</source>
@@ -1770,7 +1775,7 @@ Proces migrace vytvoří zálohu peněženky přes samotnou migrací. Soubor se
     </message>
     <message>
         <source>&amp;Minimize to the tray instead of the taskbar</source>
-        <translation type="unfinished">&amp;Minimalizovávat do ikony v panelu</translation>
+        <translation type="unfinished">&amp;Minimalizovat do oznamovací oblasti místo na hlavní panel</translation>
     </message>
     <message>
         <source>M&amp;inimize on close</source>
@@ -1816,10 +1821,6 @@ Proces migrace vytvoří zálohu peněženky přes samotnou migrací. Soubor se
         <source>Use separate SOCKS&amp;5 proxy to reach peers via Tor onion services:</source>
         <translation type="unfinished">Použít samostatnou SOCKS&amp;5 proxy ke spojení s protějšky přes skryté služby v Toru:</translation>
     </message>
-    <message>
-        <source>&amp;OK</source>
-        <translation type="unfinished">&amp;Budiž</translation>
-    </message>
     <message>
         <source>&amp;Cancel</source>
         <translation type="unfinished">&amp;Zrušit</translation>
@@ -1949,245 +1950,26 @@ Proces migrace vytvoří zálohu peněženky přes samotnou migrací. Soubor se
         <source>Recent transactions</source>
         <translation type="unfinished">Poslední transakce</translation>
     </message>
-    <message>
-        <source>Privacy mode activated for the Overview tab. To unmask the values, uncheck Settings-&gt;Mask values.</source>
-        <translation type="unfinished">Pro kartu Přehled je aktivovaný režim soukromí. Pro zobrazení částek, odškrtněte Nastavení -&gt; Skrýt částky.</translation>
-    </message>
-</context>
+    </context>
 <context>
     <name>PSBTOperationsDialog</name>
-    <message>
-        <source>PSBT Operations</source>
-        <translation type="unfinished">PSBT Operace</translation>
-    </message>
-    <message>
-        <source>Sign Tx</source>
-        <translation type="unfinished">Podepsat transakci</translation>
-    </message>
-    <message>
-        <source>Broadcast Tx</source>
-        <translation type="unfinished">Odeslat transakci do sítě</translation>
-    </message>
-    <message>
-        <source>Copy to Clipboard</source>
-        <translation type="unfinished">Kopírovat do schránky</translation>
-    </message>
-    <message>
-        <source>Save…</source>
-        <translation type="unfinished">Uložit...</translation>
-    </message>
-    <message>
-        <source>Close</source>
-        <translation type="unfinished">Zavřít</translation>
-    </message>
-    <message>
-        <source>Failed to load transaction: %1</source>
-        <translation type="unfinished">Nepodařilo se načíst transakci: %1</translation>
-    </message>
-    <message>
-        <source>Failed to sign transaction: %1</source>
-        <translation type="unfinished">Nepodařilo se podepsat transakci: %1</translation>
-    </message>
-    <message>
-        <source>Cannot sign inputs while wallet is locked.</source>
-        <translation type="unfinished">Nelze podepsat vstup, když je peněženka uzamčena.</translation>
-    </message>
-    <message>
-        <source>Could not sign any more inputs.</source>
-        <translation type="unfinished">Nelze podepsat další vstupy.</translation>
-    </message>
-    <message>
-        <source>Signed %1 inputs, but more signatures are still required.</source>
-        <translation type="unfinished">Podepsáno %1 výstupů, ale jsou ještě potřeba další podpisy.</translation>
-    </message>
-    <message>
-        <source>Signed transaction successfully. Transaction is ready to broadcast.</source>
-        <translation type="unfinished">Transakce byla úspěšně podepsána. Transakce je připravena k odeslání.</translation>
-    </message>
-    <message>
-        <source>Unknown error processing transaction.</source>
-        <translation type="unfinished">Neznámá chyba při zpracování transakce.</translation>
-    </message>
-    <message>
-        <source>Transaction broadcast successfully! Transaction ID: %1</source>
-        <translation type="unfinished">Transakce byla úspěšně odeslána! ID transakce: %1</translation>
-    </message>
-    <message>
-        <source>Transaction broadcast failed: %1</source>
-        <translation type="unfinished">Odeslání transakce se nezdařilo: %1</translation>
-    </message>
-    <message>
-        <source>PSBT copied to clipboard.</source>
-        <translation type="unfinished">PSBT zkopírována do schránky.</translation>
-    </message>
-    <message>
-        <source>Save Transaction Data</source>
-        <translation type="unfinished">Zachovaj procesní data</translation>
-    </message>
-    <message>
-        <source>Partially Signed Transaction (Binary)</source>
-        <extracomment>Expanded name of the binary PSBT file format. See: BIP 174.</extracomment>
-        <translation type="unfinished">částečně podepsaná transakce (binární)</translation>
-    </message>
-    <message>
-        <source>PSBT saved to disk.</source>
-        <translation type="unfinished">PSBT uložena na disk.</translation>
-    </message>
-    <message>
-        <source>Sends %1 to %2</source>
-        <translation type="unfinished">Odešle %1 na %2</translation>
-    </message>
-    <message>
-        <source>own address</source>
-        <translation type="unfinished">vlastní adresa</translation>
-    </message>
-    <message>
-        <source>Unable to calculate transaction fee or total transaction amount.</source>
-        <translation type="unfinished">Nelze vypočítat transakční poplatek nebo celkovou výši transakce.</translation>
-    </message>
-    <message>
-        <source>Pays transaction fee: </source>
-        <translation type="unfinished">Platí transakční poplatek:</translation>
-    </message>
-    <message>
-        <source>Total Amount</source>
-        <translation type="unfinished">Celková částka</translation>
-    </message>
-    <message>
-        <source>or</source>
-        <translation type="unfinished">nebo</translation>
-    </message>
-    <message>
-        <source>Transaction has %1 unsigned inputs.</source>
-        <translation type="unfinished">Transakce %1 má nepodepsané vstupy.</translation>
-    </message>
-    <message>
-        <source>Transaction is missing some information about inputs.</source>
-        <translation type="unfinished">Transakci chybí některé informace o vstupech.</translation>
-    </message>
-    <message>
-        <source>Transaction still needs signature(s).</source>
-        <translation type="unfinished">Transakce stále potřebuje podpis(y).</translation>
-    </message>
-    <message>
-        <source>(But no wallet is loaded.)</source>
-        <translation type="unfinished">(Ale žádná peněženka není načtená.)</translation>
-    </message>
-    <message>
-        <source>(But this wallet cannot sign transactions.)</source>
-        <translation type="unfinished">(Ale tato peněženka nemůže podepisovat transakce.)</translation>
-    </message>
-    <message>
-        <source>(But this wallet does not have the right keys.)</source>
-        <translation type="unfinished">Ale tenhle vstup nemá správné klíče</translation>
-    </message>
-    <message>
-        <source>Transaction is fully signed and ready for broadcast.</source>
-        <translation type="unfinished">Transakce je plně podepsána a připravena k odeslání.</translation>
-    </message>
-    <message>
-        <source>Transaction status is unknown.</source>
-        <translation type="unfinished">Stav transakce není známý.</translation>
-    </message>
-</context>
-<context>
-    <name>PaymentServer</name>
-    <message>
-        <source>Payment request error</source>
-        <translation type="unfinished">Chyba platebního požadavku</translation>
-    </message>
-    <message>
-        <source>Cannot start bitcoin: click-to-pay handler</source>
-        <translation type="unfinished">Nemůžu spustit bitcoin: obsluha click-to-pay</translation>
-    </message>
-    <message>
-        <source>URI handling</source>
-        <translation type="unfinished">Zpracování URI</translation>
-    </message>
-    <message>
-        <source>'bitcoin://' is not a valid URI. Use 'bitcoin:' instead.</source>
-        <translation type="unfinished">'bitcoin://' není platné URI. Místo toho použij 'bitcoin:'.</translation>
-    </message>
-    <message>
-        <source>Cannot process payment request because BIP70 is not supported.
-Due to widespread security flaws in BIP70 it's strongly recommended that any merchant instructions to switch wallets be ignored.
-If you are receiving this error you should request the merchant provide a BIP21 compatible URI.</source>
-        <translation type="unfinished">Nelze zpracovat žádost o platbu, protože BIP70 není podporován.
-Vzhledem k rozšířeným bezpečnostním chybám v BIP70 je důrazně doporučeno ignorovat jakékoli požadavky obchodníka na přepnutí peněženek.
-Pokud vidíte tuto chybu, měli byste požádat, aby obchodník poskytl adresu kompatibilní s BIP21.</translation>
-    </message>
-    <message>
-        <source>URI cannot be parsed! This can be caused by an invalid Bitcoin address or malformed URI parameters.</source>
-        <translation type="unfinished">Nepodařilo se analyzovat URI! Důvodem může být neplatná bitcoinová adresa nebo poškozené parametry URI.</translation>
-    </message>
-    <message>
-        <source>Payment request file handling</source>
-        <translation type="unfinished">Zpracování souboru platebního požadavku</translation>
-    </message>
-</context>
-<context>
-    <name>PeerTableModel</name>
-    <message>
-        <source>User Agent</source>
-        <extracomment>Title of Peers Table column which contains the peer's User Agent string.</extracomment>
-        <translation type="unfinished">Typ klienta</translation>
-    </message>
-    <message>
-        <source>Ping</source>
-        <extracomment>Title of Peers Table column which indicates the current latency of the connection with the peer.</extracomment>
-        <translation type="unfinished">Odezva</translation>
-    </message>
-    <message>
-        <source>Peer</source>
-        <extracomment>Title of Peers Table column which contains a unique number used to identify a connection.</extracomment>
-        <translation type="unfinished">Protějšek</translation>
-    </message>
-    <message>
-        <source>Age</source>
-        <extracomment>Title of Peers Table column which indicates the duration (length of time) since the peer connection started.</extracomment>
-        <translation type="unfinished">Trvání</translation>
-    </message>
-    <message>
-        <source>Direction</source>
-        <extracomment>Title of Peers Table column which indicates the direction the peer connection was initiated from.</extracomment>
-        <translation type="unfinished">Směr</translation>
-    </message>
-    <message>
-        <source>Sent</source>
-        <extracomment>Title of Peers Table column which indicates the total amount of network information we have sent to the peer.</extracomment>
-        <translation type="unfinished">Odesláno</translation>
-    </message>
-    <message>
-        <source>Received</source>
-        <extracomment>Title of Peers Table column which indicates the total amount of network information we have received from the peer.</extracomment>
-        <translation type="unfinished">Přijato</translation>
-    </message>
-    <message>
-        <source>Address</source>
-        <extracomment>Title of Peers Table column which contains the IP/Onion/I2P address of the connected peer.</extracomment>
-        <translation type="unfinished">Adresa</translation>
-    </message>
-    <message>
-        <source>Type</source>
-        <extracomment>Title of Peers Table column which describes the type of peer connection. The "type" describes why the connection exists.</extracomment>
-        <translation type="unfinished">Typ</translation>
-    </message>
-    <message>
-        <source>Network</source>
-        <extracomment>Title of Peers Table column which states the network the peer connected through.</extracomment>
-        <translation type="unfinished">Síť</translation>
-    </message>
-    <message>
-        <source>Inbound</source>
-        <extracomment>An Inbound Connection from a Peer.</extracomment>
-        <translation type="unfinished">Sem</translation>
+    <message numerus="yes">
+        <source>Signed %n input(s), but more signatures are still required.</source>
+        <translation type="unfinished">
+            <numerusform>Podepsán %n vstup, ale jsou ještě potřeba další podpisy.</numerusform>
+            <numerusform>Podepsány %n vstupy, ale jsou ještě potřeba další podpisy.</numerusform>
+            <numerusform>Podepsáno %n vstupů, ale jsou ještě potřeba další podpisy.</numerusform>
+        </translation>
     </message>
-    <message>
-        <source>Outbound</source>
-        <extracomment>An Outbound Connection to a Peer.</extracomment>
-        <translation type="unfinished">Ven</translation>
+    <message numerus="yes">
+        <source>Transaction has %n unsigned input(s).</source>
+        <translation type="unfinished">
+            <numerusform>Transakce má %n nepodepsaný vstup.</numerusform>
+            <numerusform>Transakce má %n nepodepsané vstupy.</numerusform>
+            <numerusform>Transakce má %n nepodepsaných vstupů.</numerusform>
+        </translation>
     </message>
-</context>
+    </context>
 <context>
     <name>QRImageWidget</name>
     <message>
@@ -2244,11 +2026,11 @@ Pokud vidíte tuto chybu, měli byste požádat, aby obchodník poskytl adresu k
     </message>
     <message>
         <source>To specify a non-default location of the data directory use the '%1' option.</source>
-        <translation type="unfinished">Pro specifikaci neklasické lokace pro data použij možnost '%1'</translation>
+        <translation type="unfinished">Chcete-li zadat nevýchozí umístění adresáře dat, použijte volbu '%1'.</translation>
     </message>
     <message>
         <source>To specify a non-default location of the blocks directory use the '%1' option.</source>
-        <translation type="unfinished">Pro specifikaci neklasické lokace pro data použij možnost '%1'</translation>
+        <translation type="unfinished">Chcete-li zadat nevýchozí umístění adresáře bloků, použijte volbu '%1'.</translation>
     </message>
     <message>
         <source>Startup time</source>
@@ -2343,302 +2125,90 @@ Pokud vidíte tuto chybu, měli byste požádat, aby obchodník poskytl adresu k
         <translation type="unfinished">Transakční přenos</translation>
     </message>
     <message>
-        <source>Starting Block</source>
-        <translation type="unfinished">Počáteční blok</translation>
-    </message>
-    <message>
-        <source>Synced Headers</source>
-        <translation type="unfinished">Aktuálně hlaviček</translation>
-    </message>
-    <message>
-        <source>Synced Blocks</source>
-        <translation type="unfinished">Aktuálně bloků</translation>
-    </message>
-    <message>
-        <source>Last Transaction</source>
-        <translation type="unfinished">Poslední transakce</translation>
-    </message>
-    <message>
-        <source>The mapped Autonomous System used for diversifying peer selection.</source>
-        <translation type="unfinished">Mapovaný nezávislý - Autonomní Systém používaný pro rozšírení vzájemného výběru protějsků.</translation>
+        <source>Private broadcast: short-lived, for broadcasting privacy-sensitive transactions</source>
+        <extracomment>Explanatory text for a short-lived outbound peer connection that is used to broadcast privacy-sensitive data (like our transactions).</extracomment>
+        <translation type="unfinished">Soukromý broadcast: krátkodobé spojení pro přenos citlivých transakcí</translation>
     </message>
     <message>
-        <source>Mapped AS</source>
-        <translation type="unfinished">Mapovaný AS</translation>
-    </message>
-    <message>
-        <source>Whether we relay addresses to this peer.</source>
-        <extracomment>Tooltip text for the Address Relay field in the peer details area, which displays whether we relay addresses to this peer (Yes/No).</extracomment>
-        <translation type="unfinished">Zda předáváme adresy tomuto uzlu.</translation>
-    </message>
-    <message>
-        <source>Address Relay</source>
-        <extracomment>Text title for the Address Relay field in the peer details area, which displays whether we relay addresses to this peer (Yes/No).</extracomment>
-        <translation type="unfinished">Přenášení adres</translation>
+        <source>detecting: peer could be v1 or v2</source>
+        <extracomment>Explanatory text for "detecting" transport type.</extracomment>
+        <translation type="unfinished">detekováno: protějšek může být v1 nebo v2</translation>
     </message>
     <message>
-        <source>The total number of addresses received from this peer that were processed (excludes addresses that were dropped due to rate-limiting).</source>
-        <extracomment>Tooltip text for the Addresses Processed field in the peer details area, which displays the total number of addresses received from this peer that were processed (excludes addresses that were dropped due to rate-limiting).</extracomment>
-        <translation type="unfinished">Celkový počet adres obdržených od tohoto uzlu, které byly zpracovány (nezahrnuje adresy, které byly zahozeny díky omezení ovládání toku provozu)</translation>
+        <source>v1: unencrypted, plaintext transport protocol</source>
+        <extracomment>Explanatory text for v1 transport type.</extracomment>
+        <translation type="unfinished">v1: nešifrovaný, transportní protokol využívající volný text</translation>
     </message>
     <message>
-        <source>The total number of addresses received from this peer that were dropped (not processed) due to rate-limiting.</source>
-        <extracomment>Tooltip text for the Addresses Rate-Limited field in the peer details area, which displays the total number of addresses received from this peer that were dropped (not processed) due to rate-limiting.</extracomment>
-        <translation type="unfinished">Celkový počet adres obdržených od tohoto uzlu, který byly zahozeny (nebyly zpracovány) díky omezení ovládání toku provozu.</translation>
+        <source>v2: BIP324 encrypted transport protocol</source>
+        <extracomment>Explanatory text for v2 transport type.</extracomment>
+        <translation type="unfinished">v2: transportní protokol využívající šifrování pomocí BIP324</translation>
     </message>
     <message>
-        <source>Addresses Processed</source>
-        <extracomment>Text title for the Addresses Processed field in the peer details area, which displays the total number of addresses received from this peer that were processed (excludes addresses that were dropped due to rate-limiting).</extracomment>
-        <translation type="unfinished">Zpracováno adres</translation>
+        <source>we selected the peer for high bandwidth relay</source>
+        <translation type="unfinished">vybrali jsme protějšek pro přenos s velkou šířkou pásma</translation>
     </message>
     <message>
-        <source>Addresses Rate-Limited</source>
-        <extracomment>Text title for the Addresses Rate-Limited field in the peer details area, which displays the total number of addresses received from this peer that were dropped (not processed) due to rate-limiting.</extracomment>
-        <translation type="unfinished">Adresy s omezením počtu přijatých adres</translation>
+        <source>the peer selected us for high bandwidth relay</source>
+        <translation type="unfinished">protějšek nás vybral pro přenos s vysokou šířkou pásma</translation>
     </message>
     <message>
-        <source>User Agent</source>
-        <translation type="unfinished">Typ klienta</translation>
+        <source>no high bandwidth relay selected</source>
+        <translation type="unfinished">není vybráno žádné širokopásmové relé</translation>
     </message>
     <message>
-        <source>Node window</source>
-        <translation type="unfinished">Okno uzlu</translation>
+        <source>&amp;Copy address</source>
+        <extracomment>Context menu action to copy the address of a peer.</extracomment>
+        <translation type="unfinished">&amp;Zkopírovat adresu</translation>
     </message>
     <message>
-        <source>Current block height</source>
-        <translation type="unfinished">Velikost aktuálního bloku</translation>
+        <source>&amp;Disconnect</source>
+        <translation type="unfinished">&amp;Odpoj</translation>
     </message>
     <message>
-        <source>Open the %1 debug log file from the current data directory. This can take a few seconds for large log files.</source>
-        <translation type="unfinished">Otevři soubor s ladicími záznamy %1 z aktuálního datového adresáře. U velkých žurnálů to může pár vteřin zabrat.</translation>
+        <source>1 &amp;hour</source>
+        <translation type="unfinished">1 &amp;hodinu</translation>
     </message>
     <message>
-        <source>Decrease font size</source>
-        <translation type="unfinished">Zmenšit písmo</translation>
+        <source>1 d&amp;ay</source>
+        <translation type="unfinished">1 &amp;den</translation>
     </message>
     <message>
-        <source>Increase font size</source>
-        <translation type="unfinished">Zvětšit písmo</translation>
+        <source>1 &amp;week</source>
+        <translation type="unfinished">1 &amp;týden</translation>
     </message>
     <message>
-        <source>Permissions</source>
-        <translation type="unfinished">Oprávnění</translation>
+        <source>1 &amp;year</source>
+        <translation type="unfinished">1 &amp;rok</translation>
     </message>
     <message>
-        <source>The direction and type of peer connection: %1</source>
-        <translation type="unfinished">Směr a typ spojení s protějškem: %1</translation>
+        <source>&amp;Copy IP/Netmask</source>
+        <extracomment>Context menu action to copy the IP/Netmask of a banned peer. IP/Netmask is the combination of a peer's IP address and its Netmask. For IP address, see: https://en.wikipedia.org/wiki/IP_address.</extracomment>
+        <translation type="unfinished">&amp;Zkopíruj IP/Masku</translation>
     </message>
     <message>
-        <source>Direction/Type</source>
-        <translation type="unfinished">Směr/Typ</translation>
+        <source>&amp;Unban</source>
+        <translation type="unfinished">&amp;Odblokuj</translation>
     </message>
     <message>
-        <source>The network protocol this peer is connected through: IPv4, IPv6, Onion, I2P, or CJDNS.</source>
-        <translation type="unfinished">Síťový protokol, přes který je protějšek připojen: IPv4, IPv6, Onion, I2P, nebo CJDNS.</translation>
+        <source>Network activity disabled</source>
+        <translation type="unfinished">Síť je vypnutá</translation>
     </message>
     <message>
-        <source>Services</source>
-        <translation type="unfinished">Služby</translation>
+        <source>None</source>
+        <translation type="unfinished">Žádné</translation>
     </message>
     <message>
-        <source>High bandwidth BIP152 compact block relay: %1</source>
-        <translation type="unfinished">Kompaktní blokové relé BIP152 s vysokou šířkou pásma: %1</translation>
+        <source>Executing command without any wallet</source>
+        <translation type="unfinished">Spouštění příkazu bez jakékoliv peněženky</translation>
     </message>
     <message>
-        <source>High Bandwidth</source>
-        <translation type="unfinished">Velká šířka pásma</translation>
+        <source>Node window - [%1]</source>
+        <translation type="unfinished">Okno uzlu - [%1]</translation>
     </message>
     <message>
-        <source>Connection Time</source>
-        <translation type="unfinished">Doba spojení</translation>
-    </message>
-    <message>
-        <source>Elapsed time since a novel block passing initial validity checks was received from this peer.</source>
-        <translation type="unfinished">Doba, před kterou byl od tohoto protějšku přijat nový blok, který prošel základní kontrolou platnosti.</translation>
-    </message>
-    <message>
-        <source>Last Block</source>
-        <translation type="unfinished">Poslední blok</translation>
-    </message>
-    <message>
-        <source>Elapsed time since a novel transaction accepted into our mempool was received from this peer.</source>
-        <extracomment>Tooltip text for the Last Transaction field in the peer details area.</extracomment>
-        <translation type="unfinished">Doba, před kterou byla od tohoto protějšku přijata nová transakce, která byla přijata do našeho mempoolu.</translation>
-    </message>
-    <message>
-        <source>Last Send</source>
-        <translation type="unfinished">Poslední odeslání</translation>
-    </message>
-    <message>
-        <source>Last Receive</source>
-        <translation type="unfinished">Poslední příjem</translation>
-    </message>
-    <message>
-        <source>Ping Time</source>
-        <translation type="unfinished">Odezva</translation>
-    </message>
-    <message>
-        <source>The duration of a currently outstanding ping.</source>
-        <translation type="unfinished">Jak dlouho už čekám na ping.</translation>
-    </message>
-    <message>
-        <source>Ping Wait</source>
-        <translation type="unfinished">Doba čekání na odezvu</translation>
-    </message>
-    <message>
-        <source>Min Ping</source>
-        <translation type="unfinished">Nejrychlejší odezva</translation>
-    </message>
-    <message>
-        <source>Time Offset</source>
-        <translation type="unfinished">Časový posun</translation>
-    </message>
-    <message>
-        <source>Last block time</source>
-        <translation type="unfinished">Čas posledního bloku</translation>
-    </message>
-    <message>
-        <source>&amp;Open</source>
-        <translation type="unfinished">&amp;Otevřít</translation>
-    </message>
-    <message>
-        <source>&amp;Console</source>
-        <translation type="unfinished">&amp;Konzole</translation>
-    </message>
-    <message>
-        <source>&amp;Network Traffic</source>
-        <translation type="unfinished">&amp;Síťový provoz</translation>
-    </message>
-    <message>
-        <source>Totals</source>
-        <translation type="unfinished">Součty</translation>
-    </message>
-    <message>
-        <source>Debug log file</source>
-        <translation type="unfinished">Soubor s ladicími záznamy</translation>
-    </message>
-    <message>
-        <source>Clear console</source>
-        <translation type="unfinished">Vyčistit konzoli</translation>
-    </message>
-    <message>
-        <source>In:</source>
-        <translation type="unfinished">Sem:</translation>
-    </message>
-    <message>
-        <source>Out:</source>
-        <translation type="unfinished">Ven:</translation>
-    </message>
-    <message>
-        <source>Inbound: initiated by peer</source>
-        <extracomment>Explanatory text for an inbound peer connection.</extracomment>
-        <translation type="unfinished">Příchozí: iniciováno uzlem</translation>
-    </message>
-    <message>
-        <source>Outbound Full Relay: default</source>
-        <extracomment>Explanatory text for an outbound peer connection that relays all network information. This is the default behavior for outbound connections.</extracomment>
-        <translation type="unfinished">Outbound Full Relay: výchozí</translation>
-    </message>
-    <message>
-        <source>Outbound Block Relay: does not relay transactions or addresses</source>
-        <extracomment>Explanatory text for an outbound peer connection that relays network information about blocks and not transactions or addresses.</extracomment>
-        <translation type="unfinished">Outbound Block Relay: nepřenáší transakce ani adresy</translation>
-    </message>
-    <message>
-        <source>Outbound Manual: added using RPC %1 or %2/%3 configuration options</source>
-        <extracomment>Explanatory text for an outbound peer connection that was established manually through one of several methods. The numbered arguments are stand-ins for the methods available to establish manual connections.</extracomment>
-        <translation type="unfinished">Outbound Manual: přidáno pomocí RPC %1 nebo %2/%3 konfiguračních možností</translation>
-    </message>
-    <message>
-        <source>Outbound Feeler: short-lived, for testing addresses</source>
-        <extracomment>Explanatory text for a short-lived outbound peer connection that is used to test the aliveness of known addresses.</extracomment>
-        <translation type="unfinished">Outbound Feeler: krátkodobý, pro testování adres</translation>
-    </message>
-    <message>
-        <source>Outbound Address Fetch: short-lived, for soliciting addresses</source>
-        <extracomment>Explanatory text for a short-lived outbound peer connection that is used to request addresses from a peer.</extracomment>
-        <translation type="unfinished">Odchozí načítání adresy: krátkodobé, pro získávání adres</translation>
-    </message>
-    <message>
-        <source>detecting: peer could be v1 or v2</source>
-        <extracomment>Explanatory text for "detecting" transport type.</extracomment>
-        <translation type="unfinished">detekováno: protějšek může být v1 nebo v2</translation>
-    </message>
-    <message>
-        <source>v1: unencrypted, plaintext transport protocol</source>
-        <extracomment>Explanatory text for v1 transport type.</extracomment>
-        <translation type="unfinished">v1: nešifrovaný, transportní protokol využívající volný text</translation>
-    </message>
-    <message>
-        <source>v2: BIP324 encrypted transport protocol</source>
-        <extracomment>Explanatory text for v2 transport type.</extracomment>
-        <translation type="unfinished">v2: transportní protokol využívající šifrování pomocí BIP324</translation>
-    </message>
-    <message>
-        <source>we selected the peer for high bandwidth relay</source>
-        <translation type="unfinished">vybrali jsme protějšek pro přenos s velkou šířkou pásma</translation>
-    </message>
-    <message>
-        <source>the peer selected us for high bandwidth relay</source>
-        <translation type="unfinished">protějšek nás vybral pro přenos s vysokou šířkou pásma</translation>
-    </message>
-    <message>
-        <source>no high bandwidth relay selected</source>
-        <translation type="unfinished">není vybráno žádné širokopásmové relé</translation>
-    </message>
-    <message>
-        <source>&amp;Copy address</source>
-        <extracomment>Context menu action to copy the address of a peer.</extracomment>
-        <translation type="unfinished">&amp;Zkopírovat adresu</translation>
-    </message>
-    <message>
-        <source>&amp;Disconnect</source>
-        <translation type="unfinished">&amp;Odpoj</translation>
-    </message>
-    <message>
-        <source>1 &amp;hour</source>
-        <translation type="unfinished">1 &amp;hodinu</translation>
-    </message>
-    <message>
-        <source>1 d&amp;ay</source>
-        <translation type="unfinished">1 &amp;den</translation>
-    </message>
-    <message>
-        <source>1 &amp;week</source>
-        <translation type="unfinished">1 &amp;týden</translation>
-    </message>
-    <message>
-        <source>1 &amp;year</source>
-        <translation type="unfinished">1 &amp;rok</translation>
-    </message>
-    <message>
-        <source>&amp;Copy IP/Netmask</source>
-        <extracomment>Context menu action to copy the IP/Netmask of a banned peer. IP/Netmask is the combination of a peer's IP address and its Netmask. For IP address, see: https://en.wikipedia.org/wiki/IP_address.</extracomment>
-        <translation type="unfinished">&amp;Zkopíruj IP/Masku</translation>
-    </message>
-    <message>
-        <source>&amp;Unban</source>
-        <translation type="unfinished">&amp;Odblokuj</translation>
-    </message>
-    <message>
-        <source>Network activity disabled</source>
-        <translation type="unfinished">Síť je vypnutá</translation>
-    </message>
-    <message>
-        <source>None</source>
-        <translation type="unfinished">Žádné</translation>
-    </message>
-    <message>
-        <source>Executing command without any wallet</source>
-        <translation type="unfinished">Spouštění příkazu bez jakékoliv peněženky</translation>
-    </message>
-    <message>
-        <source>Node window - [%1]</source>
-        <translation type="unfinished">Okno uzlu - [%1]</translation>
-    </message>
-    <message>
-        <source>Executing command using "%1" wallet</source>
-        <translation type="unfinished">Příkaz se vykonává s použitím peněženky "%1"</translation>
+        <source>Executing command using "%1" wallet</source>
+        <translation type="unfinished">Příkaz se vykonává s použitím peněženky "%1"</translation>
     </message>
     <message>
         <source>Welcome to the %1 RPC console.
@@ -2684,7 +2254,7 @@ For more information on using this console, type %6.
     </message>
     <message>
         <source>Ban for</source>
-        <translation type="unfinished">Uval klatbu na</translation>
+        <translation type="unfinished">Zakázat na</translation>
     </message>
     <message>
         <source>Never</source>
@@ -2701,10 +2271,6 @@ For more information on using this console, type %6.
         <source>&amp;Amount:</source>
         <translation type="unfinished">Čás&amp;tka:</translation>
     </message>
-    <message>
-        <source>&amp;Label:</source>
-        <translation type="unfinished">&amp;Označení:</translation>
-    </message>
     <message>
         <source>&amp;Message:</source>
         <translation type="unfinished">&amp;Zpráva:</translation>
@@ -2715,7 +2281,7 @@ For more information on using this console, type %6.
     </message>
     <message>
         <source>An optional label to associate with the new receiving address.</source>
-        <translation type="unfinished">Volitelné označení, které se má přiřadit k nové adrese.</translation>
+        <translation type="unfinished">Nepovinný štítek, který se má přiřadit k nové přijímací adrese.</translation>
     </message>
     <message>
         <source>Use this form to request payments. All fields are &lt;b&gt;optional&lt;/b&gt;.</source>
@@ -2727,7 +2293,7 @@ For more information on using this console, type %6.
     </message>
     <message>
         <source>An optional label to associate with the new receiving address (used by you to identify an invoice).  It is also attached to the payment request.</source>
-        <translation type="unfinished">Volitelný popis který sa přidá k téjo nové přijímací adrese (pro jednoduchší identifikaci). Tenhle popis bude také přidán do výzvy k platbě.</translation>
+        <translation type="unfinished">Volitelný štítek pro přiřazení k nové adrese pro příjem (použijete jej k identifikaci faktury). Je také připojen k platební žádosti.</translation>
     </message>
     <message>
         <source>An optional message that is attached to the payment request and may be displayed to the sender.</source>
@@ -2759,7 +2325,7 @@ For more information on using this console, type %6.
     </message>
     <message>
         <source>Remove the selected entries from the list</source>
-        <translation type="unfinished">Smaž zvolené požadavky ze seznamu</translation>
+        <translation type="unfinished">Odstranit vybrané položky ze seznamu</translation>
     </message>
     <message>
         <source>Remove</source>
@@ -3000,7 +2566,7 @@ For more information on using this console, type %6.
     </message>
     <message>
         <source>Hide transaction fee settings</source>
-        <translation type="unfinished">Schovat nastavení poplatků transakce - transaction fee</translation>
+        <translation type="unfinished">Skrýt nastavení poplatků za transakci</translation>
     </message>
     <message>
         <source>Specify a custom fee per kB (1,000 bytes) of the transaction's virtual size.
@@ -3012,7 +2578,7 @@ Note:  Since the fee is calculated on a per-byte basis, a fee rate of "100 satos
     </message>
     <message>
         <source>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.</source>
-        <translation type="unfinished">Když je zde měně transakcí než místa na bloky, mineři stejně tak relay-e mohou nasadit minimální poplatky. Zaplacením pouze minimálního poplatku je v pohodě, ale mějte na paměti že toto může mít za následek nikdy neověřenou transakci pokud zde bude více bitcoinových transakcí než může síť zvládnout.</translation>
+        <translation type="unfinished">Když je menší objem transakcí než je místa v blocích, mohou těžaři i uzly, které transakce předávají, vyžadovat minimální poplatek. Zaplatit pouze tento minimální poplatek je v pořádku, ale mějte na paměti, že to může vést k tomu, že vaše transakce nikdy nebude potvrzena, pokud bude větší poptávka po bitcoinových transakcích, než kolik síť zvládne zpracovat.</translation>
     </message>
     <message>
         <source>A too low fee might result in a never confirming transaction (read the tooltip)</source>
@@ -3036,7 +2602,7 @@ Note:  Since the fee is calculated on a per-byte basis, a fee rate of "100 satos
     </message>
     <message>
         <source>Clear &amp;All</source>
-        <translation type="unfinished">Všechno &amp;smaž</translation>
+        <translation type="unfinished">Smazat &amp;vše</translation>
     </message>
     <message>
         <source>Balance:</source>
@@ -3064,7 +2630,7 @@ Note:  Since the fee is calculated on a per-byte basis, a fee rate of "100 satos
     </message>
     <message>
         <source>Copy after fee</source>
-        <translation type="unfinished">Kopíruj čistou částku</translation>
+        <translation type="unfinished">Zkopírovat částku po odečtení poplatku</translation>
     </message>
     <message>
         <source>Copy bytes</source>
@@ -3094,7 +2660,7 @@ Note:  Since the fee is calculated on a per-byte basis, a fee rate of "100 satos
     </message>
     <message>
         <source>Cr&amp;eate Unsigned</source>
-        <translation type="unfinished">Vytvořit bez podpisu</translation>
+        <translation type="unfinished">Vytvořit &amp;bez podpisu</translation>
     </message>
     <message>
         <source>Creates a Partially Signed Bitcoin Transaction (PSBT) for use with e.g. an offline %1 wallet, or a PSBT-compatible hardware wallet.</source>
@@ -3128,12 +2694,12 @@ Note:  Since the fee is calculated on a per-byte basis, a fee rate of "100 satos
     </message>
     <message>
         <source>Save Transaction Data</source>
-        <translation type="unfinished">Zachovej procesní data</translation>
+        <translation type="unfinished">Uložit transakční data</translation>
     </message>
     <message>
         <source>Partially Signed Transaction (Binary)</source>
         <extracomment>Expanded name of the binary PSBT file format. See: BIP 174.</extracomment>
-        <translation type="unfinished">Částečně podepsaná transakce (binární)</translation>
+        <translation type="unfinished">částečně podepsaná transakce (binární)</translation>
     </message>
     <message>
         <source>PSBT saved</source>
@@ -3206,34 +2772,6 @@ Note:  Since the fee is calculated on a per-byte basis, a fee rate of "100 satos
         <source>Confirm send coins</source>
         <translation type="unfinished">Potvrď odeslání mincí</translation>
     </message>
-    <message>
-        <source>The recipient address is not valid. Please recheck.</source>
-        <translation type="unfinished">Adresa příjemce je neplatná – překontroluj ji prosím.</translation>
-    </message>
-    <message>
-        <source>The amount to pay must be larger than 0.</source>
-        <translation type="unfinished">Odesílaná částka musí být větší než 0.</translation>
-    </message>
-    <message>
-        <source>The amount exceeds your balance.</source>
-        <translation type="unfinished">Částka překračuje stav účtu.</translation>
-    </message>
-    <message>
-        <source>The total exceeds your balance when the %1 transaction fee is included.</source>
-        <translation type="unfinished">Celková částka při připočítání poplatku %1 překročí stav účtu.</translation>
-    </message>
-    <message>
-        <source>Duplicate address found: addresses should only be used once each.</source>
-        <translation type="unfinished">Zaznamenána duplicitní adresa: každá adresa by ale měla být použita vždy jen jednou.</translation>
-    </message>
-    <message>
-        <source>Transaction creation failed!</source>
-        <translation type="unfinished">Vytvoření transakce selhalo!</translation>
-    </message>
-    <message>
-        <source>A fee higher than %1 is considered an absurdly high fee.</source>
-        <translation type="unfinished">Poplatek vyšší než %1 je považován za absurdně vysoký.</translation>
-    </message>
     <message numerus="yes">
         <source>Estimated to begin confirmation within %n block(s).</source>
         <translation type="unfinished">
@@ -3242,315 +2780,24 @@ Note:  Since the fee is calculated on a per-byte basis, a fee rate of "100 satos
             <numerusform>Estimated to begin confirmation within %n block(s).</numerusform>
         </translation>
     </message>
-    <message>
-        <source>Warning: Invalid Bitcoin address</source>
-        <translation type="unfinished">Upozornění: Neplatná bitcoinová adresa</translation>
-    </message>
-    <message>
-        <source>Warning: Unknown change address</source>
-        <translation type="unfinished">Upozornění: Neznámá adresa pro drobné</translation>
-    </message>
-    <message>
-        <source>Confirm custom change address</source>
-        <translation type="unfinished">Potvrď vlastní adresu pro drobné</translation>
-    </message>
-    <message>
-        <source>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?</source>
-        <translation type="unfinished">Adresa, kterou jsi zvolil pro drobné, není součástí této peněženky. Potenciálně všechny prostředky z tvé peněženky mohou být na tuto adresu odeslány. Souhlasíš, aby se tak stalo?</translation>
-    </message>
     <message>
         <source>(no label)</source>
         <translation type="unfinished">(bez označení)</translation>
     </message>
 </context>
-<context>
-    <name>SendCoinsEntry</name>
-    <message>
-        <source>A&amp;mount:</source>
-        <translation type="unfinished">Čás&amp;tka:</translation>
-    </message>
-    <message>
-        <source>Pay &amp;To:</source>
-        <translation type="unfinished">&amp;Komu:</translation>
-    </message>
-    <message>
-        <source>&amp;Label:</source>
-        <translation type="unfinished">&amp;Označení:</translation>
-    </message>
-    <message>
-        <source>Choose previously used address</source>
-        <translation type="unfinished">Vyber již použitou adresu</translation>
-    </message>
-    <message>
-        <source>The Bitcoin address to send the payment to</source>
-        <translation type="unfinished">Bitcoinová adresa příjemce</translation>
-    </message>
-    <message>
-        <source>Paste address from clipboard</source>
-        <translation type="unfinished">Vlož adresu ze schránky</translation>
-    </message>
-    <message>
-        <source>Remove this entry</source>
-        <translation type="unfinished">Smaž tento záznam</translation>
-    </message>
-    <message>
-        <source>The amount to send in the selected unit</source>
-        <translation type="unfinished">Částka k odeslání ve vybrané měně</translation>
-    </message>
-    <message>
-        <source>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.</source>
-        <translation type="unfinished">Poplatek se odečte od posílané částky. Příjemce tak dostane méně bitcoinů, než zadáš do pole Částka. Pokud vybereš více příjemců, tak se poplatek rovnoměrně rozloží.</translation>
-    </message>
-    <message>
-        <source>S&amp;ubtract fee from amount</source>
-        <translation type="unfinished">Od&amp;ečíst poplatek od částky</translation>
-    </message>
-    <message>
-        <source>Use available balance</source>
-        <translation type="unfinished">Použít dostupný zůstatek</translation>
-    </message>
-    <message>
-        <source>Message:</source>
-        <translation type="unfinished">Zpráva:</translation>
-    </message>
-    <message>
-        <source>Enter a label for this address to add it to the list of used addresses</source>
-        <translation type="unfinished">Zadej označení této adresy; obojí se ti pak uloží do adresáře</translation>
-    </message>
-    <message>
-        <source>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.</source>
-        <translation type="unfinished">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.</translation>
-    </message>
-</context>
-<context>
-    <name>SendConfirmationDialog</name>
-    <message>
-        <source>Send</source>
-        <translation type="unfinished">Odeslat</translation>
-    </message>
-    <message>
-        <source>Create Unsigned</source>
-        <translation type="unfinished">Vytvořit bez podpisu</translation>
-    </message>
-</context>
 <context>
     <name>SignVerifyMessageDialog</name>
-    <message>
-        <source>Signatures - Sign / Verify a Message</source>
-        <translation type="unfinished">Podpisy - podepsat/ověřit zprávu</translation>
-    </message>
-    <message>
-        <source>&amp;Sign Message</source>
-        <translation type="unfinished">&amp;Podepiš zprávu</translation>
-    </message>
-    <message>
-        <source>You can sign messages/agreements with your legacy (P2PKH) 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.</source>
-        <translation type="unfinished">Můžete podepisovat zprávy/dohody se svými zastaralými adresami (typu P2PKH), abyste prokázali, že můžete přijímat bitcoiny, které tam byly zaslány. Buďte obezřetní a nepodepisujte nic neurčitého nebo náhodného, protože phishingové útoky mohou vést k přepsání vaší identity na někoho jiného. Podepisujte pouze záležitosti, jejichž detaily plně znáte a s nimiž souhlasíte.</translation>
-    </message>
-    <message>
-        <source>The Bitcoin address to sign the message with</source>
-        <translation type="unfinished">Bitcoinová adresa, kterou se zpráva podepíše</translation>
-    </message>
-    <message>
-        <source>Choose previously used address</source>
-        <translation type="unfinished">Vyber již použitou adresu</translation>
-    </message>
-    <message>
-        <source>Paste address from clipboard</source>
-        <translation type="unfinished">Vlož adresu ze schránky</translation>
-    </message>
-    <message>
-        <source>Enter the message you want to sign here</source>
-        <translation type="unfinished">Sem vepiš zprávu, kterou chceš podepsat</translation>
-    </message>
-    <message>
-        <source>Signature</source>
-        <translation type="unfinished">Podpis</translation>
-    </message>
     <message>
         <source>Copy the current signature to the clipboard</source>
-        <translation type="unfinished">Zkopírovat právě vybraný podpis do schránky</translation>
-    </message>
-    <message>
-        <source>Sign the message to prove you own this Bitcoin address</source>
-        <translation type="unfinished">Podepiš zprávu, čímž prokážeš, že jsi vlastníkem této bitcoinové adresy</translation>
-    </message>
-    <message>
-        <source>Sign &amp;Message</source>
-        <translation type="unfinished">Po&amp;depiš zprávu</translation>
-    </message>
-    <message>
-        <source>Reset all sign message fields</source>
-        <translation type="unfinished">Vymaž všechna pole formuláře pro podepsání zrávy</translation>
-    </message>
-    <message>
-        <source>Clear &amp;All</source>
-        <translation type="unfinished">Všechno &amp;smaž</translation>
-    </message>
-    <message>
-        <source>&amp;Verify Message</source>
-        <translation type="unfinished">&amp;Ověř zprávu</translation>
-    </message>
-    <message>
-        <source>Enter the receiver's address, message (ensure you copy line breaks, spaces, tabs, etc. exactly) and signature below to verify the message. Be careful not to read more into the signature than what is in the signed message itself, to avoid being tricked by a man-in-the-middle attack. Note that this only proves the signing party receives with the address, it cannot prove sendership of any transaction!</source>
-        <translation type="unfinished">K ověření podpisu zprávy zadej adresu příjemce, zprávu (ověř si, že správně kopíruješ zalomení řádků, mezery, tabulátory apod.) a podpis. Dávej pozor na to, abys nezkopíroval do podpisu víc, než co je v samotné podepsané zprávě, abys nebyl napálen man-in-the-middle útokem. Poznamenejme však, že takto lze pouze prokázat, že podepisující je schopný na dané adrese přijmout platbu, ale není možnéprokázat, že odeslal jakoukoli transakci!</translation>
-    </message>
-    <message>
-        <source>The Bitcoin address the message was signed with</source>
-        <translation type="unfinished">Bitcoinová adresa, kterou je zpráva podepsána</translation>
-    </message>
-    <message>
-        <source>The signed message to verify</source>
-        <translation type="unfinished">Podepsaná zpráva na ověření</translation>
-    </message>
-    <message>
-        <source>The signature given when the message was signed</source>
-        <translation type="unfinished">Podpis daný při podpisu zprávy</translation>
-    </message>
-    <message>
-        <source>Verify the message to ensure it was signed with the specified Bitcoin address</source>
-        <translation type="unfinished">Ověř zprávu, aby ses ujistil, že byla podepsána danou bitcoinovou adresou</translation>
-    </message>
-    <message>
-        <source>Verify &amp;Message</source>
-        <translation type="unfinished">O&amp;věř zprávu</translation>
-    </message>
-    <message>
-        <source>Reset all verify message fields</source>
-        <translation type="unfinished">Vymaž všechna pole formuláře pro ověření zrávy</translation>
-    </message>
-    <message>
-        <source>Click "Sign Message" to generate signature</source>
-        <translation type="unfinished">Kliknutím na „Podepiš zprávu“ vygeneruješ podpis</translation>
-    </message>
-    <message>
-        <source>The entered address is invalid.</source>
-        <translation type="unfinished">Zadaná adresa je neplatná.</translation>
-    </message>
-    <message>
-        <source>Please check the address and try again.</source>
-        <translation type="unfinished">Zkontroluj ji prosím a zkus to pak znovu.</translation>
-    </message>
-    <message>
-        <source>The entered address does not refer to a legacy (P2PKH) key. Message signing for SegWit and other non-P2PKH address types is not supported in this version of %1. Please check the address and try again.</source>
-        <translation type="unfinished">Zadaná adresa neodpovídá zastaralému typu klíče (P2PKH). Zpráva podepisovaná pomocí SegWit nebo jiným typem adresy mimo-P2PKH není podporovaná v této verzi %1. Prosím zkontrolujte adresu a zkuste to znovu.</translation>
+        <translation type="unfinished">Zkopírovat aktuální podpis do schránky</translation>
     </message>
-    <message>
-        <source>Wallet unlock was cancelled.</source>
-        <translation type="unfinished">Odemčení peněženky bylo zrušeno.</translation>
-    </message>
-    <message>
-        <source>No error</source>
-        <translation type="unfinished">Bez chyby</translation>
-    </message>
-    <message>
-        <source>Private key for the entered address is not available.</source>
-        <translation type="unfinished">Soukromý klíč pro zadanou adresu není dostupný.</translation>
-    </message>
-    <message>
-        <source>Message signing failed.</source>
-        <translation type="unfinished">Nepodařilo se podepsat zprávu.</translation>
-    </message>
-    <message>
-        <source>Message signed.</source>
-        <translation type="unfinished">Zpráva podepsána.</translation>
-    </message>
-    <message>
-        <source>The signature could not be decoded.</source>
-        <translation type="unfinished">Podpis nejde dekódovat.</translation>
-    </message>
-    <message>
-        <source>Please check the signature and try again.</source>
-        <translation type="unfinished">Zkontroluj ho prosím a zkus to pak znovu.</translation>
-    </message>
-    <message>
-        <source>The signature did not match the message digest.</source>
-        <translation type="unfinished">Podpis se neshoduje s hašem zprávy.</translation>
-    </message>
-    <message>
-        <source>Message verification failed.</source>
-        <translation type="unfinished">Nepodařilo se ověřit zprávu.</translation>
-    </message>
-    <message>
-        <source>Message verified.</source>
-        <translation type="unfinished">Zpráva ověřena.</translation>
-    </message>
-</context>
-<context>
-    <name>SplashScreen</name>
-    <message>
-        <source>(press q to shutdown and continue later)</source>
-        <translation type="unfinished">(stiskni q pro ukončení a pokračování později)</translation>
-    </message>
-    <message>
-        <source>press q to shutdown</source>
-        <translation type="unfinished">stiskněte q pro vypnutí</translation>
-    </message>
-</context>
+    </context>
 <context>
     <name>TransactionDesc</name>
-    <message>
-        <source>conflicted with a transaction with %1 confirmations</source>
-        <extracomment>Text explaining the current status of a transaction, shown in the status field of the details window for this transaction. This status represents an unconfirmed transaction that conflicts with a confirmed transaction.</extracomment>
-        <translation type="unfinished">koliduje s transakcí o %1 konfirmacích</translation>
-    </message>
-    <message>
-        <source>0/unconfirmed, in memory pool</source>
-        <extracomment>Text explaining the current status of a transaction, shown in the status field of the details window for this transaction. This status represents an unconfirmed transaction that is in the memory pool.</extracomment>
-        <translation type="unfinished">0/nepotvrzené, je v transakčním zásobníku</translation>
-    </message>
-    <message>
-        <source>0/unconfirmed, not in memory pool</source>
-        <extracomment>Text explaining the current status of a transaction, shown in the status field of the details window for this transaction. This status represents an unconfirmed transaction that is not in the memory pool.</extracomment>
-        <translation type="unfinished">0/nepotvrzené, není v transakčním zásobníku</translation>
-    </message>
-    <message>
-        <source>abandoned</source>
-        <extracomment>Text explaining the current status of a transaction, shown in the status field of the details window for this transaction. This status represents an abandoned transaction.</extracomment>
-        <translation type="unfinished">zanechaná</translation>
-    </message>
-    <message>
-        <source>%1/unconfirmed</source>
-        <extracomment>Text explaining the current status of a transaction, shown in the status field of the details window for this transaction. This status represents a transaction confirmed in at least one block, but less than 6 blocks.</extracomment>
-        <translation type="unfinished">%1/nepotvrzeno</translation>
-    </message>
-    <message>
-        <source>%1 confirmations</source>
-        <extracomment>Text explaining the current status of a transaction, shown in the status field of the details window for this transaction. This status represents a transaction confirmed in 6 or more blocks.</extracomment>
-        <translation type="unfinished">%1 potvrzení</translation>
-    </message>
-    <message>
-        <source>Status</source>
-        <translation type="unfinished">Stav</translation>
-    </message>
     <message>
         <source>Date</source>
         <translation type="unfinished">Datum</translation>
     </message>
-    <message>
-        <source>Source</source>
-        <translation type="unfinished">Zdroj</translation>
-    </message>
-    <message>
-        <source>Generated</source>
-        <translation type="unfinished">Vygenerováno</translation>
-    </message>
-    <message>
-        <source>From</source>
-        <translation type="unfinished">Od</translation>
-    </message>
-    <message>
-        <source>unknown</source>
-        <translation type="unfinished">neznámo</translation>
-    </message>
-    <message>
-        <source>To</source>
-        <translation type="unfinished">Pro</translation>
-    </message>
-    <message>
-        <source>own address</source>
-        <translation type="unfinished">vlastní adresa</translation>
-    </message>
     <message>
         <source>label</source>
         <translation type="unfinished">označení</translation>
@@ -3858,10 +3105,6 @@ Note:  Since the fee is calculated on a per-byte basis, a fee rate of "100 satos
         <source>Label</source>
         <translation type="unfinished">Označení</translation>
     </message>
-    <message>
-        <source>Address</source>
-        <translation type="unfinished">Adresa</translation>
-    </message>
     <message>
         <source>Exporting Failed</source>
         <translation type="unfinished">Exportování selhalo</translation>
@@ -3938,7 +3181,7 @@ Přejděte do Soubor &gt; Otevřít peněženku pro načtení peněženky.
     </message>
     <message>
         <source>Increasing transaction fee failed</source>
-        <translation type="unfinished">Nepodařilo se navýšeit poplatek</translation>
+        <translation type="unfinished">Nepodařilo se navýšit transakční poplatek</translation>
     </message>
     <message>
         <source>Do you want to increase the fee?</source>
@@ -3979,7 +3222,7 @@ Přejděte do Soubor &gt; Otevřít peněženku pro načtení peněženky.
     </message>
     <message>
         <source>Could not commit transaction</source>
-        <translation type="unfinished">Nemohl jsem uložit transakci do peněženky</translation>
+        <translation type="unfinished">Nepodařilo se zapsat transakci</translation>
     </message>
     <message>
         <source>Signer error</source>
@@ -3994,7 +3237,7 @@ Přejděte do Soubor &gt; Otevřít peněženku pro načtení peněženky.
     <name>WalletView</name>
     <message>
         <source>Export the data in the current tab to a file</source>
-        <translation type="unfinished">Exportuj data z tohoto panelu do souboru</translation>
+        <translation type="unfinished">Exportovat data z tohoto panelu do souboru</translation>
     </message>
     <message>
         <source>Backup Wallet</source>
@@ -4032,14 +3275,6 @@ Přejděte do Soubor &gt; Otevřít peněženku pro načtení peněženky.
         <source>The %s developers</source>
         <translation type="unfinished">Vývojáři %s</translation>
     </message>
-    <message>
-        <source>%s failed to validate the -assumeutxo snapshot state. This indicates a hardware problem, or a bug in the software, or a bad software modification that allowed an invalid snapshot to be loaded. As a result of this, the node will shut down and stop using any state that was built on the snapshot, resetting the chain height from %d to %d. On the next restart, the node will resume syncing from %d without using any snapshot data. Please report this incident to %s, including how you obtained the snapshot. The invalid snapshot chainstate will be left on disk in case it is helpful in diagnosing the issue that caused this error.</source>
-        <translation type="unfinished">%sse nepodařilo ověřit -assumeutxo stav snímku. Tohle značí hardwarový problém, chybu v softwaru nebo špatnou úpravu softwaru, která dovolila nahrání neplatného snímku. Došlo proto k vypnutí uzlu a vy přestaňte používat jakékoliv verze, které byly postaveny na tomto snímku, resetování délky řetězce od %d do %d. Při příštím restartu bude uzel pokračovat v synchronizování od %d bez jakýchkoliv dat snímku. Prosím, nahlašte tento incident %s, včetně toho, jak jste získali tento snímek. Neplatný snímek stavu řetězce byl ponechán na disku v případě, že by to bylo nápomocné při odhalení potíže, která způsobila tuto chybu.</translation>
-    </message>
-    <message>
-        <source>%s request to listen on port %u. This port is considered "bad" and thus it is unlikely that any peer will connect to it. See doc/p2p-bad-ports.md for details and a full list.</source>
-        <translation type="unfinished"> %s Žádost o poslech na portu 2 %u . Tento port je považován za "špatný", a proto je nepravděpodobné, že by se k němu připojil nějaký peer. Viz doc/p2p-bad-ports.md pro podrobnosti a úplný seznam.</translation>
-    </message>
     <message>
         <source>Disk space for %s may not accommodate the block files. Approximately %u GB of data will be stored in this directory.</source>
         <translation type="unfinished">Místo na disku pro  %s nemusí obsahovat soubory bloku. V tomto adresáři bude uloženo přibližně  %u GB dat.</translation>
@@ -4131,7 +3366,7 @@ Ověřuji peněženku.</translation>
     </message>
     <message>
         <source>This is the maximum transaction fee you pay (in addition to the normal fee) to prioritize partial spend avoidance over regular coin selection.</source>
-        <translation type="unfinished">Jedná se o maximální poplatek, který zaplatíte (navíc k běžnému poplatku), aby se upřednostnila útrata z dosud nepoužitých adres oproti těm už jednou použitých.</translation>
+        <translation type="unfinished">Jedná se o maximální transakční poplatek, který zaplatíte (navíc k běžnému poplatku), abyste upřednostnili vyhýbání se částečnému utrácení před běžným výběrem mincí.</translation>
     </message>
     <message>
         <source>This is the transaction fee you may discard if change is smaller than dust at this level</source>
@@ -4161,10 +3396,6 @@ Ověřuji peněženku.</translation>
         <source>Warning: Private keys detected in wallet {%s} with disabled private keys</source>
         <translation type="unfinished">Upozornění: Byly zjištěné soukromé klíče v peněžence {%s} se zakázanými soukromými klíči.</translation>
     </message>
-    <message>
-        <source>Warning: We do not appear to fully agree with our peers! You may need to upgrade, or other nodes may need to upgrade.</source>
-        <translation type="unfinished">Upozornění: Nesouhlasím zcela se svými protějšky! Možná potřebuji aktualizovat nebo ostatní uzly potřebují aktualizovat.</translation>
-    </message>
     <message>
         <source>Witness data for blocks after height %d requires validation. Please restart with -reindex.</source>
         <translation type="unfinished">Svědecká data pro bloky po výšce %d vyžadují ověření.  Restartujte prosím pomocí -reindex.</translation>
@@ -4207,7 +3438,7 @@ Ověřuji peněženku.</translation>
     </message>
     <message>
         <source>Error loading %s: External signer wallet being loaded without external signer support compiled</source>
-        <translation type="unfinished">Chyba při načtení %s: Peněženka externího podepisovatele se načítá bez zkompilované podpory externího podpisovatele.</translation>
+        <translation type="unfinished">Chyba při načtení %s: Externí podepisovací peněženka se načítá bez zkompilované podpory externího podpisovatele.</translation>
     </message>
     <message>
         <source>Error reading %s! All keys read correctly, but transaction data or address metadata may be missing or incorrect.</source>
@@ -4228,7 +3459,7 @@ Ověřuji peněženku.</translation>
     <message>
         <source>Failed to remove snapshot chainstate dir (%s). Manually remove it before restarting.
 </source>
-        <translation type="unfinished">Nepodařilo se odstranit adresář snímku stavu řetězce (%s). Před restartem jej ručně jej odstraňte.
+        <translation type="unfinished">Nepodařilo se odstranit adresář snímku stavu řetězce (%s). Před restartem jej ručně odstraňte.
 </translation>
     </message>
     <message>
@@ -4241,11 +3472,11 @@ Ověřuji peněženku.</translation>
     </message>
     <message>
         <source>Flushing block file to disk failed. This is likely the result of an I/O error.</source>
-        <translation type="unfinished">Nepodařilo se vyprázdnit blokový soubor na disk. Toto je patrně výsledek I/O chyby.</translation>
+        <translation type="unfinished">Vyprázdnění (flush) souboru s bloky na disk selhalo. Pravděpodobně došlo k chybě vstupu/výstupu.</translation>
     </message>
     <message>
         <source>Flushing undo file to disk failed. This is likely the result of an I/O error.</source>
-        <translation type="unfinished">Nepodařilo se vyprázdnit soubor s daty pro návrat na disk. Toto je patrně výsledek I/O chyby.</translation>
+        <translation type="unfinished">Zápis undo souboru na disk selhal. Pravděpodobně jde o důsledek chyby vstupu/výstupu.</translation>
     </message>
     <message>
         <source>Incompatible options: -dnsseed=1 was explicitly specified, but -onlynet forbids connections to IPv4/IPv6</source>
@@ -4261,23 +3492,15 @@ Ověřuji peněženku.</translation>
     </message>
     <message>
         <source>Maximum transaction weight is too low, can not accommodate change output</source>
-        <translation type="unfinished">Maximální váha transakce je příliš nízká, nemůže pojmout změnu výstupu</translation>
+        <translation type="unfinished">Maximální váha transakce je příliš nízká, nelze zahrnout výstup na vrácení</translation>
     </message>
     <message>
         <source>Option '-checkpoints' is set but checkpoints were removed. This option has no effect.</source>
         <translation type="unfinished">Je nastavena volba '-checkpoints', ale kontrolní body byly odstraněny. Tato volba nemá žádný efekt.</translation>
     </message>
-    <message>
-        <source>Option '-maxorphantx' is set but no longer has any effect (see release notes). Please remove it from your configuration.</source>
-        <translation type="unfinished">Je nastavena volba '-maxorphantx', ale tato volba již nemá žádný efekt (viz. poznámky k vydání). Odstraňte ji prosím ze své konfigurace.</translation>
-    </message>
-    <message>
-        <source>Options '-datacarrier' or '-datacarriersize' are set but are marked as deprecated. They will be removed in a future version.</source>
-        <translation type="unfinished">Možnosti '-datacarrier' a '-datacarriersize' jsou nastaveny, ale jsou označené za zastaralé. V budoucí verzi budou odstraněny.</translation>
-    </message>
     <message>
         <source>Outbound connections restricted to CJDNS (-onlynet=cjdns) but -cjdnsreachable is not provided</source>
-        <translation type="unfinished">Odchozí připojení omezená na CJDNS (-onlynet=cjdns), ale -cjdnsreachable nejsou k dispozici</translation>
+        <translation type="unfinished">Odchozí připojení jsou omezena na CJDNS (-onlynet=cjdns), ale -cjdnsreachable není zadán</translation>
     </message>
     <message>
         <source>Outbound connections restricted to Tor (-onlynet=onion) but the proxy for reaching the Tor network is explicitly forbidden: -onion=0</source>
@@ -4293,11 +3516,11 @@ Ověřuji peněženku.</translation>
     </message>
     <message>
         <source>Prune: last wallet synchronisation goes beyond pruned data. You need to -reindex (download the whole blockchain again in case of a pruned node)</source>
-        <translation type="unfinished">Prořezávání: poslední synchronizace peněženky proběhla před už prořezanými daty. Je třeba provést -reindex (tedy v případě režimu prořezávání stáhnout celý blockchain znovu)</translation>
+        <translation type="unfinished">Prořezávání: poslední synchronizace peněženky spadá do již prořezaných dat. Je třeba provést -reindex (v případě prořezávaného uzlu se znovu stáhne celý blockchain).</translation>
     </message>
     <message>
         <source>Rename of '%s' -&gt; '%s' failed. Cannot clean up the background chainstate leveldb directory.</source>
-        <translation type="unfinished">Přejmenování '%s' -&gt; '%s' selhalo. Nemohu vyčistit adresář leveldb se stavem řetězce.</translation>
+        <translation type="unfinished">Přejmenování '%s' -&gt; '%s' selhalo. Nelze vyčistit adresář chainstate LevelDB na pozadí.</translation>
     </message>
     <message>
         <source>Specified -blockmaxweight (%d) exceeds consensus maximum block weight (%d)</source>
@@ -4313,15 +3536,7 @@ Ověřuji peněženku.</translation>
     </message>
     <message>
         <source>The combination of the pre-selected inputs and the wallet automatic inputs selection exceeds the transaction maximum weight. Please try sending a smaller amount or manually consolidating your wallet's UTXOs</source>
-        <translation type="unfinished">Kombinace předzvolených vstupů a volba automatických vstupů peněženky přesahuje maximální váhu transakce. Prosím zkuste poslat nižší částku nebo ručně konsolidujte UTXO své peněženky</translation>
-    </message>
-    <message>
-        <source>The inputs size exceeds the maximum weight. Please try sending a smaller amount or manually consolidating your wallet's UTXOs</source>
-        <translation type="unfinished">Velikost vstupů přesahuje maximální váhu. Zkuste poslat menší částku nebo ručně konsolidovat UTXO peněženky</translation>
-    </message>
-    <message>
-        <source>The preselected coins total amount does not cover the transaction target. Please allow other inputs to be automatically selected or include more coins manually</source>
-        <translation type="unfinished">Celková částka předem vybraných mincí nepokrývá cíl transakce. Povolte automatický výběr dalších vstupů nebo ručně zahrňte více mincí</translation>
+        <translation type="unfinished">Kombinace předvybraných vstupů a automatického výběru vstupů peněženky přesahuje maximální váhu transakce. Zkuste prosím poslat nižší částku nebo ručně konsolidovat UTXO své peněženky</translation>
     </message>
     <message>
         <source>UTXO snapshot failed to validate. Restart to resume normal initial block download, or try loading a different snapshot.</source>
@@ -4363,19 +3578,15 @@ Nelze obnovit zálohu peněženky.</translation>
     </message>
     <message>
         <source>whitebind may only be used for incoming connections ("out" was passed)</source>
-        <translation type="unfinished">whitebind může být použit pouze pro příchozí spojení (odchozí byla schválena)</translation>
-    </message>
-    <message>
-        <source>-paytxfee is deprecated and will be fully removed in v31.0.</source>
-        <translation type="unfinished">Možnost -paytxfee je zastaralá a bude v příští verzi v31.0 plně odstraněna</translation>
+        <translation type="unfinished">whitebind smí být použit pouze pro příchozí spojení („out“ byl předán)</translation>
     </message>
     <message>
         <source>A fatal internal error occurred, see debug.log for details: </source>
-        <translation type="unfinished">Nastala závažná vnitřní chyba, podrobnosti viz debug.log:</translation>
+        <translation type="unfinished">Nastala závažná vnitřní chyba, podrobnosti viz debug.log: </translation>
     </message>
     <message>
         <source>Assumeutxo data not found for the given blockhash '%s'.</source>
-        <translation type="unfinished">Data assumeutxo nenalezena pro zvolený blockhash '%s'.</translation>
+        <translation type="unfinished">Data assumeutxo nebyla nalezena pro daný hash bloku '%s'.</translation>
     </message>
     <message>
         <source>Block verification was interrupted</source>
@@ -4383,15 +3594,11 @@ Nelze obnovit zálohu peněženky.</translation>
     </message>
     <message>
         <source>Can't spend unconfirmed version %d pre-selected input with a version 3 tx</source>
-        <translation type="unfinished">Nemohu použít nepotvrzenou verzi %d předvybraného vstupu s verzí 3 tx</translation>
+        <translation type="unfinished">Nelze utratit nepotvrzený předvybraný vstup verze %d s transakcí verze 3</translation>
     </message>
     <message>
         <source>Can't spend unconfirmed version 3 pre-selected input with a version %d tx</source>
-        <translation type="unfinished">Nemohu použít nepotvrzenou verzi 3 předvybraného vstupu s verzí %d tx</translation>
-    </message>
-    <message>
-        <source>Cannot add WalletDescriptor to a non-descriptor wallet</source>
-        <translation type="unfinished">Nelze přidat WalletDescriptor do nedeskriptorové peněženky</translation>
+        <translation type="unfinished">Nelze utratit nepotvrzený předvybraný vstup verze 3 pomocí transakce verze %d</translation>
     </message>
     <message>
         <source>Cannot write to directory '%s'; check permissions.</source>
@@ -4403,7 +3610,7 @@ Nelze obnovit zálohu peněženky.</translation>
     </message>
     <message>
         <source>Corrupt block found indicating potential hardware failure.</source>
-        <translation type="unfinished">Nalezen poškožený blok, může to znamenat hw problém.</translation>
+        <translation type="unfinished">Byl nalezen poškozený blok, což může znamenat selhání hardwaru.</translation>
     </message>
     <message>
         <source>Corrupted block database detected</source>
@@ -4421,6 +3628,10 @@ Nelze obnovit zálohu peněženky.</translation>
         <source>Could not parse asmap file %s</source>
         <translation type="unfinished">Soubor asmap nelze analyzovat %s</translation>
     </message>
+    <message>
+        <source>Could not read embedded asmap data</source>
+        <translation type="unfinished">Nelze přečíst vložená asmap data</translation>
+    </message>
     <message>
         <source>Could not top up scriptPubKeys</source>
         <translation type="unfinished">Není možné doplnit scriptPubKeys</translation>
@@ -4439,11 +3650,11 @@ Nelze obnovit zálohu peněženky.</translation>
     </message>
     <message>
         <source>Elliptic curve cryptography sanity check failure. %s is shutting down.</source>
-        <translation type="unfinished">Selhala zevrubná prověrka elyptické kryptografie. %s se ukončuje.</translation>
+        <translation type="unfinished">Selhala kontrola správnosti kryptografie eliptických křivek. %s se ukončuje.</translation>
     </message>
     <message>
-        <source>Error creating %s</source>
-        <translation type="unfinished">Chyba při vytváření %s .</translation>
+        <source>Embedded asmap data not available</source>
+        <translation type="unfinished">Vložená asmap data nejsou k dispozici</translation>
     </message>
     <message>
         <source>Error initializing block database</source>
@@ -4453,10 +3664,6 @@ Nelze obnovit zálohu peněženky.</translation>
         <source>Error loading %s</source>
         <translation type="unfinished">Chyba při načítání %s</translation>
     </message>
-    <message>
-        <source>Error loading %s: Private keys can only be disabled during creation</source>
-        <translation type="unfinished">Chyba při načítání %s: Soukromé klíče můžou být zakázané jen v průběhu vytváření.</translation>
-    </message>
     <message>
         <source>Error loading %s: Wallet corrupted</source>
         <translation type="unfinished">Chyba při načítání %s: peněženka je poškozená</translation>
@@ -4567,7 +3774,7 @@ Nelze obnovit zálohu peněženky.</translation>
     </message>
     <message>
         <source>Error: Unable to read wallet's best block locator record</source>
-        <translation type="unfinished">Chyba: Není možné číst záznam lokace nejlepšího bloku peněženky</translation>
+        <translation type="unfinished">Chyba: Nelze přečíst záznam lokátoru nejlepšího bloku peněženky</translation>
     </message>
     <message>
         <source>Error: Unable to remove watchonly address book data</source>
@@ -4575,7 +3782,7 @@ Nelze obnovit zálohu peněženky.</translation>
     </message>
     <message>
         <source>Error: Unable to write data to disk for wallet %s</source>
-        <translation type="unfinished">Chyba: Nepodařilo se zapsat data peněženky %sna disk</translation>
+        <translation type="unfinished">Chyba: Nepodařilo se zapsat data na disk pro peněženku %s</translation>
     </message>
     <message>
         <source>Error: Unable to write record to new wallet</source>
@@ -4583,11 +3790,11 @@ Nelze obnovit zálohu peněženky.</translation>
     </message>
     <message>
         <source>Error: Unable to write solvable wallet best block locator record</source>
-        <translation type="unfinished">Chyba: Nelze zapsat záznam lokace nejlepšího bloku řešitelné peněženky</translation>
+        <translation type="unfinished">Chyba: Nelze zapsat záznam lokátoru nejlepšího bloku řešitelné peněženky</translation>
     </message>
     <message>
         <source>Error: Unable to write watchonly wallet best block locator record</source>
-        <translation type="unfinished">Chyba: Nelze zapsat záznam lokace nejlepšího bloku peněženky pro sledování</translation>
+        <translation type="unfinished">Chyba: Nelze zapsat záznam lokátoru nejlepšího bloku peněženky pouze pro sledování</translation>
     </message>
     <message>
         <source>Error: database transaction cannot be executed for wallet %s</source>
@@ -4595,7 +3802,7 @@ Nelze obnovit zálohu peněženky.</translation>
     </message>
     <message>
         <source>Failed to acquire rescan reserver during wallet initialization</source>
-        <translation type="unfinished">Během inicializace peněženky se nepodařilo zajistit práva pro její opětovné proskenování</translation>
+        <translation type="unfinished">Během inicializace peněženky se nepodařilo získat rezervaci pro opětovné prohledání</translation>
     </message>
     <message>
         <source>Failed to close block undo file.</source>
@@ -4605,10 +3812,6 @@ Nelze obnovit zálohu peněženky.</translation>
         <source>Failed to close file when writing block.</source>
         <translation type="unfinished">Nepodařilo se zavřít soubor při zapisování bloku.</translation>
     </message>
-    <message>
-        <source>Failed to connect best block (%s).</source>
-        <translation type="unfinished">Nepodařilo se připojit nejlepší blok (%s).</translation>
-    </message>
     <message>
         <source>Failed to disconnect block.</source>
         <translation type="unfinished">Nepodařilo se odpojit blok.</translation>
@@ -4633,17 +3836,9 @@ Nelze obnovit zálohu peněženky.</translation>
         <source>Failed to write block.</source>
         <translation type="unfinished">Nepodařilo se zapsat blok.</translation>
     </message>
-    <message>
-        <source>Failed to write to block index database.</source>
-        <translation type="unfinished">Nepodařilo se zapsat do databáze indexu bloků.</translation>
-    </message>
-    <message>
-        <source>Failed to write to coin database.</source>
-        <translation type="unfinished">Selhal zápis do databáze mincí</translation>
-    </message>
     <message>
         <source>Failed to write undo data.</source>
-        <translation type="unfinished">Nepodařilo se zapsat data pro vracení změn</translation>
+        <translation type="unfinished">Nepodařilo se zapsat data pro vracení změn.</translation>
     </message>
     <message>
         <source>Failure removing transaction: %s</source>
@@ -4694,16 +3889,28 @@ Nelze obnovit zálohu peněženky.</translation>
         <translation type="unfinished">Neplatné P2P oprávnění: '%s'</translation>
     </message>
     <message>
-        <source>Invalid amount for %s=&lt;amount&gt;: '%s' (must be at least %s)</source>
-        <translation type="unfinished">Neplatná částka %s=&lt;amount&gt;:'%s' (musí být alespoň%s)</translation>
+        <source>Invalid amount for %s=&lt;amount&gt;: '%s'</source>
+        <translation type="unfinished">Neplatná částka pro %s=&lt;amount&gt;: '%s'</translation>
+    </message>
+    <message>
+        <source>A %zu MiB dbcache may be too large for a system memory of only %zu MiB.</source>
+        <translation type="unfinished">%zu MiB dbcache může být příliš velké pro systémovou paměť o velikosti %zu MiB.</translation>
     </message>
     <message>
-        <source>Invalid amount for %s=&lt;amount&gt;: '%s'</source>
-        <translation type="unfinished">Neplatná částka %s=&lt;amount&gt;:'%s'</translation>
+        <source>Creating wallet…</source>
+        <translation type="unfinished">Vytvářím peněženku...</translation>
+    </message>
+    <message>
+        <source>Duplicate binding configuration for address %s. Please check your -bind, -bind=...=onion and -whitebind settings.</source>
+        <translation type="unfinished">Duplicitní nastavení vazby pro adresu %s. Zkontrolujte prosím nastavení -bind, -bind=...=onion a -whitebind.</translation>
+    </message>
+    <message>
+        <source>Error creating %s: Could not write version metadata.</source>
+        <translation type="unfinished">Chyba při vytváření %s: Nelze zapsat metadata verze.</translation>
     </message>
     <message>
         <source>Invalid amount for -%s=&lt;amount&gt;: '%s'</source>
-        <translation type="unfinished">Neplatná částka -%s=&lt;amount&gt;: '%s'</translation>
+        <translation type="unfinished">Neplatná částka pro -%s=&lt;amount&gt;: '%s'</translation>
     </message>
     <message>
         <source>Invalid netmask specified in -whitelist: '%s'</source>
@@ -4765,6 +3972,26 @@ Nelze obnovit zálohu peněženky.</translation>
         <source>Only direction was set, no permissions: '%s'</source>
         <translation type="unfinished">Byl určen pouze směr, žádná práva: '%s'</translation>
     </message>
+    <message>
+        <source>Option '-limitancestorsize' is given but ancestor size limits have been replaced with cluster size limits (see -limitclustersize). This option has no effect.</source>
+        <translation type="unfinished">Parametr '-limitancestorsize' je sice zadán, avšak omezení velikosti předka byla nahrazena omezením velikosti klastru (ověřit -limitclustersize). Tento parametr tak nemá žádný efekt.</translation>
+    </message>
+    <message>
+        <source>Option '-limitdescendantsize' is given but descendant size limits have been replaced with cluster size limits (see -limitclustersize). This option has no effect.</source>
+        <translation type="unfinished">Parametr '-limitdescendantsize' je sice zadán, ale omezení velikosti potomka bylo nahrazeno omezením velikosti klastru (ověřit -limitclustersize). Tento parametr tak nemá žádný efekt.</translation>
+    </message>
+    <message>
+        <source>Private broadcast of own transactions requested (-privatebroadcast) and -proxyrandomize is disabled. Tor circuits for private broadcast connections may be correlated to other connections over Tor. For maximum privacy set -proxyrandomize=1.</source>
+        <translation type="unfinished">Je požadován soukromý broadcast vlastních transakcí (-privatebroadcast) a parametr -proxyrandomize je vypnutý. Okruhy Tor pro spojení soukromých broadcastů mohou souviset s dalšími spojeními přes Tor. Pro dosažení maximální úrovně soukromí nastav -proxyrandomize=1.</translation>
+    </message>
+    <message>
+        <source>Private broadcast of own transactions requested (-privatebroadcast), but -connect is also configured. They are incompatible because the private broadcast needs to open new connections to randomly chosen Tor or I2P peers. Consider using -maxconnections=0 -addnode=... instead</source>
+        <translation type="unfinished">Je požadován soukromý broadcast vlastních transakcí (-privatebroadcast), ale parametr -connect je rovněž nastaven. Tato kombinace parametrů není možná, protože soukromý broadcast potřebuje otevřít nová spojení k náhodně vybraným protějškům přes Tor nebo I2P sítě. Zvaž místo toho použití parametrů -maxconnections=0 -addnode=...</translation>
+    </message>
+    <message>
+        <source>Private broadcast of own transactions requested (-privatebroadcast), but none of Tor or I2P networks is reachable</source>
+        <translation type="unfinished">Je požadován soukromý broadcast vlastních transakcí (-privatebroadcast), ale žádná síť typu Tor nebo I2P není dostupná</translation>
+    </message>
     <message>
         <source>Prune cannot be configured with a negative value.</source>
         <translation type="unfinished">Prořezávání nemůže být zkonfigurováno s negativní hodnotou.</translation>
@@ -4773,6 +4000,10 @@ Nelze obnovit zálohu peněženky.</translation>
         <source>Prune mode is incompatible with -txindex.</source>
         <translation type="unfinished">Prořezávací režim není kompatibilní s -txindex.</translation>
     </message>
+    <message>
+        <source>Prune mode is incompatible with -txospenderindex.</source>
+        <translation type="unfinished">Režim prořezávání není kompatibilní s -txospenderindex.</translation>
+    </message>
     <message>
         <source>Pruning blockstore…</source>
         <translation type="unfinished">Prořezávám úložiště bloků...</translation>
@@ -4811,7 +4042,7 @@ Nelze obnovit zálohu peněženky.</translation>
     </message>
     <message>
         <source>Signer did not echo address</source>
-        <translation type="unfinished">Podepisovatel nevrátil adresu</translation>
+        <translation type="unfinished">Podepisovatel nezopakoval adresu</translation>
     </message>
     <message>
         <source>Signer echoed unexpected address %s</source>
@@ -4874,77 +4105,13 @@ Nelze obnovit zálohu peněženky.</translation>
         <translation type="unfinished">Uvedený konfigurační soubor %s neexistuje</translation>
     </message>
     <message>
-        <source>The transaction amount is too small to pay the fee</source>
-        <translation type="unfinished">Částka v transakci je příliš malá na pokrytí poplatku</translation>
+        <source>The total exceeds your balance when the %s transaction fee is included.</source>
+        <translation type="unfinished">Celková částka při připočítání poplatku %s překročí stav účtu.</translation>
     </message>
     <message>
         <source>The transactions removal process can only be executed within a db txn</source>
         <translation type="unfinished">Proces odstranění transakcí lze provést pouze v rámci db txn</translation>
     </message>
-    <message>
-        <source>The wallet will avoid paying less than the minimum relay fee.</source>
-        <translation type="unfinished">Peněženka zaručí přiložení poplatku alespoň ve výši minima pro přenos transakce.</translation>
-    </message>
-    <message>
-        <source>There is no ScriptPubKeyManager for this address</source>
-        <translation type="unfinished">Neexistuje ScriptPubKeyManager pro tuto adresu</translation>
-    </message>
-    <message>
-        <source>This is experimental software.</source>
-        <translation type="unfinished">Tohle je experimentální program.</translation>
-    </message>
-    <message>
-        <source>This is the minimum transaction fee you pay on every transaction.</source>
-        <translation type="unfinished">Toto je minimální poplatek, který zaplatíš za každou transakci.</translation>
-    </message>
-    <message>
-        <source>This is the transaction fee you will pay if you send a transaction.</source>
-        <translation type="unfinished">Toto je poplatek, který zaplatíš za každou poslanou transakci.</translation>
-    </message>
-    <message>
-        <source>Transaction %s does not belong to this wallet</source>
-        <translation type="unfinished">Transakce %s nepatří do této peněženky</translation>
-    </message>
-    <message>
-        <source>Transaction amount too small</source>
-        <translation type="unfinished">Částka v transakci je příliš malá</translation>
-    </message>
-    <message>
-        <source>Transaction amounts must not be negative</source>
-        <translation type="unfinished">Částky v transakci nemohou být záporné</translation>
-    </message>
-    <message>
-        <source>Transaction change output index out of range</source>
-        <translation type="unfinished">Výstupní index změny transakce mimo rozsah</translation>
-    </message>
-    <message>
-        <source>Transaction must have at least one recipient</source>
-        <translation type="unfinished">Transakce musí mít alespoň jednoho příjemce</translation>
-    </message>
-    <message>
-        <source>Transaction needs a change address, but we can't generate it.</source>
-        <translation type="unfinished">Transakce potřebuje změnu adresy, ale ta se nepodařila vygenerovat.</translation>
-    </message>
-    <message>
-        <source>Transaction too large</source>
-        <translation type="unfinished">Transakce je příliš velká</translation>
-    </message>
-    <message>
-        <source>Unable to bind to %s on this computer (bind returned error %s)</source>
-        <translation type="unfinished">Nedaří se mi připojit na %s na tomhle počítači (operace bind vrátila chybu %s)</translation>
-    </message>
-    <message>
-        <source>Unable to bind to %s on this computer. %s is probably already running.</source>
-        <translation type="unfinished">Nedaří se mi připojit na %s na tomhle počítači. %s už pravděpodobně jednou běží.</translation>
-    </message>
-    <message>
-        <source>Unable to create the PID file '%s': %s</source>
-        <translation type="unfinished">Nebylo možné vytvořit soubor PID '%s': %s</translation>
-    </message>
-    <message>
-        <source>Unable to find UTXO for external input</source>
-        <translation type="unfinished">Nelze najít UTXO pro externí vstup</translation>
-    </message>
     <message>
         <source>Unable to open %s for writing</source>
         <translation type="unfinished">Nelze otevřít %s pro zápis</translation>
@@ -4989,9 +4156,13 @@ Nelze obnovit zálohu peněženky.</translation>
         <source>Wallet file creation failed: %s</source>
         <translation type="unfinished">Nepodařilo se vytvořit soubor peněženky: %s</translation>
     </message>
+    <message>
+        <source>Warning: Found invalid chain more than 6 blocks longer than our best chain. This could be due to database corruption or consensus incompatibility with peers.</source>
+        <translation type="unfinished">Varování: Nalezen neplatný řetěz, který je o více než 6 bloků delší než nejlepší řetěz. Toto mohlo nastat kvůli chybě databáze nebo neshodě koncenzu s protějšky.</translation>
+    </message>
     <message>
         <source>acceptstalefeeestimates is not supported on %s chain.</source>
-        <translation type="unfinished">acceptstalefeeestimates není podporována na %s řetězu.</translation>
+        <translation type="unfinished">acceptstalefeeestimates není podporováno na %s řetězci.</translation>
     </message>
     <message>
         <source>Unsupported logging category %s=%s.</source>
@@ -4999,19 +4170,19 @@ Nelze obnovit zálohu peněženky.</translation>
     </message>
     <message>
         <source>Error loading %s: Wallet is a legacy wallet. Please migrate to a descriptor wallet using the migration tool (migratewallet RPC).</source>
-        <translation type="unfinished">Chyba při načítání %s: Zastaralý typ peněženky. Převeďte ji prosím na deskriptorovou pomocí převodného nástroje (migratewallet RPC)</translation>
+        <translation type="unfinished">Chyba při načítání %s: Zastaralý typ peněženky. Převeďte ji prosím na deskriptorovou peněženku pomocí migračního nástroje (migratewallet RPC).</translation>
     </message>
     <message>
         <source>Error: Dumpfile specifies an unsupported database format (%s). Only sqlite database dumps are supported</source>
-        <translation type="unfinished">Chyba: Zvolený formát databáze (%s) není možné uložit do souboru. Pro tento účel lze použít pouze sqlite databázi.</translation>
+        <translation type="unfinished">Chyba: Soubor s dumpem uvádí nepodporovaný formát databáze (%s). Podporovány jsou pouze dumpy databáze SQLite.</translation>
     </message>
     <message>
         <source>Failed to calculate bump fees, because unconfirmed UTXOs depend on an enormous cluster of unconfirmed transactions.</source>
-        <translation type="unfinished">Nepodařilo se vypočítat poplatky za přidání, protože nepotvrzená UTXO závisejí na příliš velkém klastru nepotvrzených transakcí.</translation>
+        <translation type="unfinished">Nepodařilo se vypočítat poplatky pro navýšení, protože nepotvrzené UTXO závisí na obrovském klastru nepotvrzených transakcí.</translation>
     </message>
     <message>
         <source>Transaction requires one destination of non-zero value, a non-zero feerate, or a pre-selected input</source>
-        <translation type="unfinished">Transakce vyžaduje jeden cíl nenulové hodnoty, nenulový poplatek nebo předvybraný vstup</translation>
+        <translation type="unfinished">Transakce vyžaduje jeden cíl s nenulovou hodnotou, nenulovou sazbu poplatku nebo předem vybraný vstup</translation>
     </message>
     <message>
         <source>Unrecognized descriptor found. Loading wallet %s
@@ -5031,11 +4202,7 @@ Zkuste prosím spustit nejnovější verzi softwaru.
     </message>
     <message>
         <source>Error: Could not add watchonly tx %s to watchonly wallet</source>
-        <translation type="unfinished">Chyba: Nelze přidat pouze-sledovací tx %s do peněženky pro čtení</translation>
-    </message>
-    <message>
-        <source>Error: Could not delete watchonly transactions. </source>
-        <translation type="unfinished">Chyba: Nelze odstranit transakce, které jsou pouze pro čtení.</translation>
+        <translation type="unfinished">Chyba: Nelze přidat transakci %s jen ke sledování do peněženky jen ke sledování</translation>
     </message>
     <message>
         <source>Error: Wallet does not exist</source>
@@ -5047,7 +4214,7 @@ Zkuste prosím spustit nejnovější verzi softwaru.
     </message>
     <message>
         <source>Failed to start indexes, shutting down…</source>
-        <translation type="unfinished">Start indexace se nezdařil, ukončuji se...</translation>
+        <translation type="unfinished">Nepodařilo se spustit indexy, ukončuji se...</translation>
     </message>
     <message>
         <source>Invalid -proxy address or hostname, ends with '=': '%s'</source>
@@ -5055,11 +4222,11 @@ Zkuste prosím spustit nejnovější verzi softwaru.
     </message>
     <message>
         <source>Not enough file descriptors available. %d available, %d required.</source>
-        <translation type="unfinished">Nedostatek volných file deskriptorů. %dvolných, %dvyžadovaných</translation>
+        <translation type="unfinished">Nedostatek volných souborových deskriptorů. %d k dispozici, %d vyžadováno.</translation>
     </message>
     <message>
         <source>Unrecognized network in -proxy='%s': '%s'</source>
-        <translation type="unfinished">Nerozeznaná síť v -proxy='%s': '%s'</translation>
+        <translation type="unfinished">Nerozpoznaná síť v -proxy='%s': '%s'</translation>
     </message>
     <message>
         <source>User Agent comment (%s) contains unsafe characters.</source>
diff --git a/src/qt/locale/bitcoin_cy.ts b/src/qt/locale/bitcoin_cy.ts
index f3967654cd52..69376040ec71 100644
--- a/src/qt/locale/bitcoin_cy.ts
+++ b/src/qt/locale/bitcoin_cy.ts
@@ -1023,6 +1023,11 @@ Bydd y broses fudo yn creu copi wrth gefn o'r waled cyn mudo. Bydd y ffeil wrth
         <source>Solvable but not watched scripts have been migrated to a new wallet named '%1'.</source>
         <translation type="unfinished">Mae sgriptiau hydoddadwy ond heb eu gwylio wedi'u symud i waled newydd o'r enw '%1'.</translation>
     </message>
+    <message>
+        <source>Restore Wallet</source>
+        <extracomment>Title of progress window which is displayed when wallets are being restored.</extracomment>
+        <translation type="unfinished">Ail-adfer Waled</translation>
+    </message>
     <message>
         <source>Migration Successful</source>
         <translation type="unfinished">Mudo yn Llwyddiannus</translation>
@@ -1105,10 +1110,6 @@ Bydd y broses fudo yn creu copi wrth gefn o'r waled cyn mudo. Bydd y ffeil wrth
         <source>Disable private keys for this wallet. Wallets with private keys disabled will have no private keys and cannot have an HD seed or imported private keys. This is ideal for watch-only wallets.</source>
         <translation type="unfinished">Analluogi allweddi preifat ar gyfer y waled hon. Ni fydd gan waledi ag allweddi preifat anabl unrhyw allweddi preifat ac ni allant gael hedyn HD nac allweddi preifat wedi'u mewnforio. Mae hyn yn ddelfrydol ar gyfer waledi gwylio yn unig.</translation>
     </message>
-    <message>
-        <source>Make a blank wallet. Blank wallets do not initially have private keys or scripts. Private keys and addresses can be imported, or an HD seed can be set, at a later time.</source>
-        <translation type="unfinished">Gwnewch waled wag. Nid oes gan waledi gwag allweddi preifat na sgriptiau i ddechrau. Gellir mewnforio allweddi preifat a chyfeiriadau, neu gellir gosod hedyn HD, yn ddiweddarach.</translation>
-    </message>
     <message>
         <source>Use an external signing device such as a hardware wallet. Configure the external signer script in wallet preferences first.</source>
         <translation type="unfinished">Defnyddiwch ddyfais arwyddo allanol fel waled caledwedd. Ffurfweddwch y sgript llofnodwr allanol yn y dewisiadau waled yn gyntaf.</translation>
@@ -1505,6 +1506,29 @@ Bydd y broses fudo yn creu copi wrth gefn o'r waled cyn mudo. Bydd y ffeil wrth
         <translation type="unfinished">Ffurflen</translation>
     </message>
     </context>
+<context>
+    <name>PSBTOperationsDialog</name>
+    <message numerus="yes">
+        <source>Signed %n input(s), but more signatures are still required.</source>
+        <translation type="unfinished">
+            <numerusform />
+            <numerusform />
+            <numerusform />
+            <numerusform />
+            <numerusform />
+        </translation>
+    </message>
+    <message numerus="yes">
+        <source>Transaction has %n unsigned input(s).</source>
+        <translation type="unfinished">
+            <numerusform />
+            <numerusform />
+            <numerusform />
+            <numerusform />
+            <numerusform />
+        </translation>
+    </message>
+    </context>
 <context>
     <name>PeerTableModel</name>
     <message>
diff --git a/src/qt/locale/bitcoin_da.ts b/src/qt/locale/bitcoin_da.ts
index f3532de61a7e..ea91360b323e 100644
--- a/src/qt/locale/bitcoin_da.ts
+++ b/src/qt/locale/bitcoin_da.ts
@@ -1,6 +1,10 @@
 <TS version="2.1" language="da">
 <context>
     <name>AddressBookPage</name>
+    <message>
+        <source>Right-click to edit address or label</source>
+        <translation type="unfinished">Højreklik for at redigere adresse eller etiket</translation>
+    </message>
     <message>
         <source>Create a new address</source>
         <translation type="unfinished">Opret en ny adresse</translation>
@@ -49,6 +53,23 @@
         <source>C&amp;hoose</source>
         <translation type="unfinished">&amp;Vælg</translation>
     </message>
+    <message>
+        <source>These are your Bitcoin addresses for sending payments. Always check the amount and the receiving address before sending coins.</source>
+        <translation type="unfinished">Disse er dine Bitcoin-adresser til afsendelse af betalinger. Tjek altid beløb og modtagelsesadresse, inden du sender bitcoins.</translation>
+    </message>
+    <message>
+        <source>These are your Bitcoin addresses for receiving payments. Use the 'Create new receiving address' button in the receive tab to create new addresses.
+Signing is only possible with addresses of the type 'legacy'.</source>
+        <translation type="unfinished">Disse er dine Bitcoin adresser til at modtage betalinger. Benyt 'Opret ny modtager adresse' knappen i modtag fanen for at oprette nye adresser.</translation>
+    </message>
+    <message>
+        <source>&amp;Copy Address</source>
+        <translation type="unfinished">&amp;Kopiér adresse</translation>
+    </message>
+    <message>
+        <source>Copy &amp;Label</source>
+        <translation type="unfinished">Kopiér &amp;mærkat</translation>
+    </message>
     <message>
         <source>&amp;Edit</source>
         <translation type="unfinished">&amp;Redigér</translation>
@@ -62,6 +83,11 @@
         <extracomment>Expanded name of the CSV file format. See: https://en.wikipedia.org/wiki/Comma-separated_values.</extracomment>
         <translation type="unfinished">Kommasepareret fil</translation>
     </message>
+    <message>
+        <source>There was an error trying to save the address list to %1. Please try again.</source>
+        <extracomment>An error message. %1 is a stand-in argument for the name of the file we attempted to save to.</extracomment>
+        <translation type="unfinished">Der opstod en fejl under gemning af adresselisten til %1. Prøv venligst igen.</translation>
+    </message>
     <message>
         <source>Exporting Failed</source>
         <translation type="unfinished">Eksport mislykkedes</translation>
@@ -255,53 +281,6 @@
         <source>unknown</source>
         <translation type="unfinished">ukendt</translation>
     </message>
-    <message>
-        <source>Amount</source>
-        <translation type="unfinished">Beløb</translation>
-    </message>
-    <message>
-        <source>Enter a Bitcoin address (e.g. %1)</source>
-        <translation type="unfinished">Indtast en Bitcoin-adresse (fx %1)</translation>
-    </message>
-    <message>
-        <source>Unroutable</source>
-        <translation type="unfinished">Urutebar</translation>
-    </message>
-    <message>
-        <source>Inbound</source>
-        <extracomment>An inbound connection from a peer. An inbound connection is a connection initiated by a peer.</extracomment>
-        <translation type="unfinished">Indkommende</translation>
-    </message>
-    <message>
-        <source>Outbound</source>
-        <extracomment>An outbound connection to a peer. An outbound connection is a connection initiated by us.</extracomment>
-        <translation type="unfinished">Udgående</translation>
-    </message>
-    <message>
-        <source>Full Relay</source>
-        <extracomment>Peer connection type that relays all network information.</extracomment>
-        <translation type="unfinished">Fuld Videresend</translation>
-    </message>
-    <message>
-        <source>Block Relay</source>
-        <extracomment>Peer connection type that relays network information about blocks and not transactions or addresses.</extracomment>
-        <translation type="unfinished">Blok Vidersend</translation>
-    </message>
-    <message>
-        <source>Manual</source>
-        <extracomment>Peer connection type established manually through one of several methods.</extracomment>
-        <translation type="unfinished">Brugervejledning</translation>
-    </message>
-    <message>
-        <source>Feeler</source>
-        <extracomment>Short-lived peer connection type that tests the aliveness of known addresses.</extracomment>
-        <translation type="unfinished">Føler</translation>
-    </message>
-    <message>
-        <source>Address Fetch</source>
-        <extracomment>Short-lived peer connection type that solicits known addresses from a peer.</extracomment>
-        <translation type="unfinished">Adresse Indhentning</translation>
-    </message>
     <message>
         <source>%1 h</source>
         <translation type="unfinished">%1 t</translation>
@@ -599,10 +578,6 @@
         <source>Load Partially Signed Bitcoin Transaction from clipboard</source>
         <translation type="unfinished">Indlæs Partvist Signeret Bitcoin-Transaktion fra udklipsholder</translation>
     </message>
-    <message>
-        <source>Node window</source>
-        <translation type="unfinished">Knudevindue</translation>
-    </message>
     <message>
         <source>Open node debugging and diagnostic console</source>
         <translation type="unfinished">Åbn knudens fejlsøgningskonsol</translation>
@@ -851,10 +826,6 @@
         <source>Received with address</source>
         <translation type="unfinished">Modtaget med adresse</translation>
     </message>
-    <message>
-        <source>Date</source>
-        <translation type="unfinished">Dato</translation>
-    </message>
     <message>
         <source>Confirmations</source>
         <translation type="unfinished">Bekræftelser</translation>
@@ -1048,10 +1019,6 @@
         <source>Disable Private Keys</source>
         <translation type="unfinished">Slå private nøgler fra</translation>
     </message>
-    <message>
-        <source>Make a blank wallet. Blank wallets do not initially have private keys or scripts. Private keys and addresses can be imported, or an HD seed can be set, at a later time.</source>
-        <translation type="unfinished">Lav en flad tegnebog. Flade tegnebøger har indledningsvist ikke private nøgler eller skripter. Private nøgler og adresser kan importeres, eller et HD-seed kan indstilles senere.</translation>
-    </message>
     <message>
         <source>Make Blank Wallet</source>
         <translation type="unfinished">Lav flad tegnebog</translation>
@@ -1624,222 +1591,24 @@
         <source>Recent transactions</source>
         <translation type="unfinished">Nylige transaktioner</translation>
     </message>
-    <message>
-        <source>Privacy mode activated for the Overview tab. To unmask the values, uncheck Settings-&gt;Mask values.</source>
-        <translation type="unfinished">Privatlivstilstand aktiveret for Oversigt-fanebladet. Fjern flueben fra Instillinger-&gt;Maskér værdier, for at afmaskere værdierne.</translation>
-    </message>
-</context>
+    </context>
 <context>
     <name>PSBTOperationsDialog</name>
-    <message>
-        <source>Sign Tx</source>
-        <translation type="unfinished">Signér Tx</translation>
-    </message>
-    <message>
-        <source>Broadcast Tx</source>
-        <translation type="unfinished">Udsend Tx</translation>
-    </message>
-    <message>
-        <source>Copy to Clipboard</source>
-        <translation type="unfinished">Kopier til udklipsholder</translation>
-    </message>
-    <message>
-        <source>Save…</source>
-        <translation type="unfinished">Gem...</translation>
-    </message>
-    <message>
-        <source>Close</source>
-        <translation type="unfinished">Luk</translation>
-    </message>
-    <message>
-        <source>Failed to load transaction: %1</source>
-        <translation type="unfinished">Kunne ikke indlæse transaktion: %1</translation>
-    </message>
-    <message>
-        <source>Failed to sign transaction: %1</source>
-        <translation type="unfinished">Kunne ikke signere transaktion: %1</translation>
-    </message>
-    <message>
-        <source>Cannot sign inputs while wallet is locked.</source>
-        <translation type="unfinished">Kan ikke signere inputs, mens tegnebogen er låst.</translation>
-    </message>
-    <message>
-        <source>Could not sign any more inputs.</source>
-        <translation type="unfinished">Kunne ikke signere flere input.</translation>
-    </message>
-    <message>
-        <source>Signed %1 inputs, but more signatures are still required.</source>
-        <translation type="unfinished">Signerede %1 input, men flere signaturer kræves endnu.</translation>
-    </message>
-    <message>
-        <source>Signed transaction successfully. Transaction is ready to broadcast.</source>
-        <translation type="unfinished">Signering af transaktion lykkedes. Transaktion er klar til udsendelse.</translation>
-    </message>
-    <message>
-        <source>Unknown error processing transaction.</source>
-        <translation type="unfinished">Ukendt fejl i behandling af transaktion.</translation>
-    </message>
-    <message>
-        <source>Transaction broadcast successfully! Transaction ID: %1</source>
-        <translation type="unfinished">Udsendelse af transaktion lykkedes! Transaktions-ID: %1</translation>
-    </message>
-    <message>
-        <source>Transaction broadcast failed: %1</source>
-        <translation type="unfinished">Udsendelse af transaktion mislykkedes: %1</translation>
-    </message>
-    <message>
-        <source>PSBT copied to clipboard.</source>
-        <translation type="unfinished">PSBT kopieret til udklipsholder.</translation>
-    </message>
-    <message>
-        <source>Save Transaction Data</source>
-        <translation type="unfinished">Gem Transaktionsdata</translation>
-    </message>
-    <message>
-        <source>Partially Signed Transaction (Binary)</source>
-        <extracomment>Expanded name of the binary PSBT file format. See: BIP 174.</extracomment>
-        <translation type="unfinished">Delvist underskrevet transaktion (Binær)</translation>
-    </message>
-    <message>
-        <source>PSBT saved to disk.</source>
-        <translation type="unfinished">PSBT gemt på disk.</translation>
-    </message>
-    <message>
-        <source>own address</source>
-        <translation type="unfinished">egen adresse</translation>
-    </message>
-    <message>
-        <source>Unable to calculate transaction fee or total transaction amount.</source>
-        <translation type="unfinished">Kunne ikke beregne transaktionsgebyr eller totalt transaktionsbeløb.</translation>
-    </message>
-    <message>
-        <source>Pays transaction fee: </source>
-        <translation type="unfinished">Betaler transaktionsgebyr</translation>
-    </message>
-    <message>
-        <source>Total Amount</source>
-        <translation type="unfinished">Total Mængde</translation>
-    </message>
-    <message>
-        <source>or</source>
-        <translation type="unfinished">eller</translation>
-    </message>
-    <message>
-        <source>Transaction has %1 unsigned inputs.</source>
-        <translation type="unfinished">Transaktion har %1 usignerede input.</translation>
-    </message>
-    <message>
-        <source>Transaction is missing some information about inputs.</source>
-        <translation type="unfinished">Transaktion mangler noget information om input.</translation>
-    </message>
-    <message>
-        <source>Transaction still needs signature(s).</source>
-        <translation type="unfinished">Transaktion mangler stadig signatur(er).</translation>
-    </message>
-    <message>
-        <source>(But no wallet is loaded.)</source>
-        <translation type="unfinished">(Men ingen tegnebog er indlæst.)</translation>
-    </message>
-    <message>
-        <source>(But this wallet cannot sign transactions.)</source>
-        <translation type="unfinished">(Men denne tegnebog kan ikke signere transaktioner.)</translation>
-    </message>
-    <message>
-        <source>(But this wallet does not have the right keys.)</source>
-        <translation type="unfinished">(Men denne pung har ikke de rette nøgler.)</translation>
-    </message>
-    <message>
-        <source>Transaction is fully signed and ready for broadcast.</source>
-        <translation type="unfinished">Transaktion er fuldt signeret og klar til udsendelse.</translation>
-    </message>
-    <message>
-        <source>Transaction status is unknown.</source>
-        <translation type="unfinished">Transaktionsstatus er ukendt.</translation>
-    </message>
-</context>
-<context>
-    <name>PaymentServer</name>
-    <message>
-        <source>Payment request error</source>
-        <translation type="unfinished">Fejl i betalingsanmodning</translation>
-    </message>
-    <message>
-        <source>Cannot start bitcoin: click-to-pay handler</source>
-        <translation type="unfinished">Kan ikke starte bitcoin: click-to-pay-håndtering</translation>
-    </message>
-    <message>
-        <source>URI handling</source>
-        <translation type="unfinished">URI-håndtering</translation>
-    </message>
-    <message>
-        <source>'bitcoin://' is not a valid URI. Use 'bitcoin:' instead.</source>
-        <translation type="unfinished">'bitcoin://' er ikke et gyldigt URI. Brug 'bitcoin:' istedet.</translation>
-    </message>
-    <message>
-        <source>Cannot process payment request because BIP70 is not supported.
-Due to widespread security flaws in BIP70 it's strongly recommended that any merchant instructions to switch wallets be ignored.
-If you are receiving this error you should request the merchant provide a BIP21 compatible URI.</source>
-        <translation type="unfinished">Kan ikke behandle betalingsanmodning, fordi BIP70 ikke understøttes.
-På grund af udbredte sikkerhedsfejl i BIP70 anbefales det på det kraftigste, at enhver købmands instruktioner om at skifte tegnebog ignoreres.
-Hvis du modtager denne fejl, skal du anmode forhandleren om en BIP21-kompatibel URI.</translation>
-    </message>
-    <message>
-        <source>URI cannot be parsed! This can be caused by an invalid Bitcoin address or malformed URI parameters.</source>
-        <translation type="unfinished">URI kan ikke tolkes! Dette kan skyldes en ugyldig Bitcoin-adresse eller forkert udformede URL-parametre.</translation>
-    </message>
-    <message>
-        <source>Payment request file handling</source>
-        <translation type="unfinished">Filhåndtering for betalingsanmodninger</translation>
-    </message>
-</context>
-<context>
-    <name>PeerTableModel</name>
-    <message>
-        <source>User Agent</source>
-        <extracomment>Title of Peers Table column which contains the peer's User Agent string.</extracomment>
-        <translation type="unfinished">Brugeragent</translation>
-    </message>
-    <message>
-        <source>Peer</source>
-        <extracomment>Title of Peers Table column which contains a unique number used to identify a connection.</extracomment>
-        <translation type="unfinished">Knude</translation>
-    </message>
-    <message>
-        <source>Direction</source>
-        <extracomment>Title of Peers Table column which indicates the direction the peer connection was initiated from.</extracomment>
-        <translation type="unfinished">Retning</translation>
-    </message>
-    <message>
-        <source>Sent</source>
-        <extracomment>Title of Peers Table column which indicates the total amount of network information we have sent to the peer.</extracomment>
-        <translation type="unfinished">Sendt</translation>
-    </message>
-    <message>
-        <source>Received</source>
-        <extracomment>Title of Peers Table column which indicates the total amount of network information we have received from the peer.</extracomment>
-        <translation type="unfinished">Modtaget</translation>
-    </message>
-    <message>
-        <source>Address</source>
-        <extracomment>Title of Peers Table column which contains the IP/Onion/I2P address of the connected peer.</extracomment>
-        <translation type="unfinished">Adresse</translation>
-    </message>
-    <message>
-        <source>Network</source>
-        <extracomment>Title of Peers Table column which states the network the peer connected through.</extracomment>
-        <translation type="unfinished">Netværk</translation>
-    </message>
-    <message>
-        <source>Inbound</source>
-        <extracomment>An Inbound Connection from a Peer.</extracomment>
-        <translation type="unfinished">Indkommende</translation>
+    <message numerus="yes">
+        <source>Signed %n input(s), but more signatures are still required.</source>
+        <translation type="unfinished">
+            <numerusform />
+            <numerusform />
+        </translation>
     </message>
-    <message>
-        <source>Outbound</source>
-        <extracomment>An Outbound Connection to a Peer.</extracomment>
-        <translation type="unfinished">Udgående</translation>
+    <message numerus="yes">
+        <source>Transaction has %n unsigned input(s).</source>
+        <translation type="unfinished">
+            <numerusform />
+            <numerusform />
+        </translation>
     </message>
-</context>
+    </context>
 <context>
     <name>QRImageWidget</name>
     <message>
@@ -1962,213 +1731,6 @@ Hvis du modtager denne fejl, skal du anmode forhandleren om en BIP21-kompatibel
         <source>Select a peer to view detailed information.</source>
         <translation type="unfinished">Vælg en anden knude for at se detaljeret information.</translation>
     </message>
-    <message>
-        <source>Starting Block</source>
-        <translation type="unfinished">Startblok</translation>
-    </message>
-    <message>
-        <source>Synced Headers</source>
-        <translation type="unfinished">Synkroniserede hoveder</translation>
-    </message>
-    <message>
-        <source>Synced Blocks</source>
-        <translation type="unfinished">Synkroniserede blokke</translation>
-    </message>
-    <message>
-        <source>Last Transaction</source>
-        <translation type="unfinished">Sidste transaktion</translation>
-    </message>
-    <message>
-        <source>The mapped Autonomous System used for diversifying peer selection.</source>
-        <translation type="unfinished">Afbildning fra Autonome Systemer (et Internet-Protocol-rutefindingsprefiks) til IP-adresser som bruges til at diversificere knudeforbindelser. Den engelske betegnelse er "asmap".</translation>
-    </message>
-    <message>
-        <source>Mapped AS</source>
-        <translation type="unfinished">Autonomt-System-afbildning</translation>
-    </message>
-    <message>
-        <source>Whether we relay addresses to this peer.</source>
-        <extracomment>Tooltip text for the Address Relay field in the peer details area, which displays whether we relay addresses to this peer (Yes/No).</extracomment>
-        <translation type="unfinished">Om vi videresender adresser til denne peer.</translation>
-    </message>
-    <message>
-        <source>Address Relay</source>
-        <extracomment>Text title for the Address Relay field in the peer details area, which displays whether we relay addresses to this peer (Yes/No).</extracomment>
-        <translation type="unfinished">Adresserelæ</translation>
-    </message>
-    <message>
-        <source>Addresses Processed</source>
-        <extracomment>Text title for the Addresses Processed field in the peer details area, which displays the total number of addresses received from this peer that were processed (excludes addresses that were dropped due to rate-limiting).</extracomment>
-        <translation type="unfinished">Adresser Behandlet</translation>
-    </message>
-    <message>
-        <source>Addresses Rate-Limited</source>
-        <extracomment>Text title for the Addresses Rate-Limited field in the peer details area, which displays the total number of addresses received from this peer that were dropped (not processed) due to rate-limiting.</extracomment>
-        <translation type="unfinished">Adresser Hastighedsbegrænset</translation>
-    </message>
-    <message>
-        <source>User Agent</source>
-        <translation type="unfinished">Brugeragent</translation>
-    </message>
-    <message>
-        <source>Node window</source>
-        <translation type="unfinished">Knudevindue</translation>
-    </message>
-    <message>
-        <source>Current block height</source>
-        <translation type="unfinished">Nuværende blokhøjde</translation>
-    </message>
-    <message>
-        <source>Open the %1 debug log file from the current data directory. This can take a few seconds for large log files.</source>
-        <translation type="unfinished">Åbn %1s fejlsøgningslogfil fra den aktuelle datamappe. Dette kan tage nogle få sekunder for store logfiler.</translation>
-    </message>
-    <message>
-        <source>Decrease font size</source>
-        <translation type="unfinished">Formindsk skrifttypestørrelse</translation>
-    </message>
-    <message>
-        <source>Increase font size</source>
-        <translation type="unfinished">Forstør skrifttypestørrelse</translation>
-    </message>
-    <message>
-        <source>Permissions</source>
-        <translation type="unfinished">Tilladelser</translation>
-    </message>
-    <message>
-        <source>The direction and type of peer connection: %1</source>
-        <translation type="unfinished">Retningen og typen af peer-forbindelse: %1</translation>
-    </message>
-    <message>
-        <source>Direction/Type</source>
-        <translation type="unfinished">Retning/Type</translation>
-    </message>
-    <message>
-        <source>The network protocol this peer is connected through: IPv4, IPv6, Onion, I2P, or CJDNS.</source>
-        <translation type="unfinished">Netværksprotokollen, som denne peer er forbundet via: IPv4, IPv6, Onion, I2P eller CJDNS.</translation>
-    </message>
-    <message>
-        <source>Services</source>
-        <translation type="unfinished">Tjenester</translation>
-    </message>
-    <message>
-        <source>High bandwidth BIP152 compact block relay: %1</source>
-        <translation type="unfinished">BIP152 kompakt blokrelæ med høj bredbånd: %1</translation>
-    </message>
-    <message>
-        <source>High Bandwidth</source>
-        <translation type="unfinished">Højt Bredbånd</translation>
-    </message>
-    <message>
-        <source>Connection Time</source>
-        <translation type="unfinished">Forbindelsestid</translation>
-    </message>
-    <message>
-        <source>Elapsed time since a novel block passing initial validity checks was received from this peer.</source>
-        <translation type="unfinished">Forløbet tid siden en ny blok, der bestod indledende gyldighedstjek, blev modtaget fra denne peer.</translation>
-    </message>
-    <message>
-        <source>Last Block</source>
-        <translation type="unfinished">Sidste Blok</translation>
-    </message>
-    <message>
-        <source>Elapsed time since a novel transaction accepted into our mempool was received from this peer.</source>
-        <extracomment>Tooltip text for the Last Transaction field in the peer details area.</extracomment>
-        <translation type="unfinished">Forløbet tid siden en ny transaktion, der blev accepteret i vores mempool, blev modtaget fra denne peer.</translation>
-    </message>
-    <message>
-        <source>Last Send</source>
-        <translation type="unfinished">Seneste afsendelse</translation>
-    </message>
-    <message>
-        <source>Last Receive</source>
-        <translation type="unfinished">Seneste modtagelse</translation>
-    </message>
-    <message>
-        <source>Ping Time</source>
-        <translation type="unfinished">Ping-tid</translation>
-    </message>
-    <message>
-        <source>The duration of a currently outstanding ping.</source>
-        <translation type="unfinished">Varigheden af den aktuelt igangværende ping.</translation>
-    </message>
-    <message>
-        <source>Ping Wait</source>
-        <translation type="unfinished">Ping-ventetid</translation>
-    </message>
-    <message>
-        <source>Min Ping</source>
-        <translation type="unfinished">Minimum ping</translation>
-    </message>
-    <message>
-        <source>Time Offset</source>
-        <translation type="unfinished">Tidsforskydning</translation>
-    </message>
-    <message>
-        <source>Last block time</source>
-        <translation type="unfinished">Tidsstempel for seneste blok</translation>
-    </message>
-    <message>
-        <source>&amp;Open</source>
-        <translation type="unfinished">&amp;Åbn</translation>
-    </message>
-    <message>
-        <source>&amp;Console</source>
-        <translation type="unfinished">&amp;Konsol</translation>
-    </message>
-    <message>
-        <source>&amp;Network Traffic</source>
-        <translation type="unfinished">&amp;Netværkstrafik</translation>
-    </message>
-    <message>
-        <source>Totals</source>
-        <translation type="unfinished">Totaler</translation>
-    </message>
-    <message>
-        <source>Debug log file</source>
-        <translation type="unfinished">Fejlsøgningslogfil</translation>
-    </message>
-    <message>
-        <source>Clear console</source>
-        <translation type="unfinished">Ryd konsol</translation>
-    </message>
-    <message>
-        <source>In:</source>
-        <translation type="unfinished">Indkommende:</translation>
-    </message>
-    <message>
-        <source>Out:</source>
-        <translation type="unfinished">Udgående:</translation>
-    </message>
-    <message>
-        <source>Inbound: initiated by peer</source>
-        <extracomment>Explanatory text for an inbound peer connection.</extracomment>
-        <translation type="unfinished">Indgående: initieret af peer</translation>
-    </message>
-    <message>
-        <source>Outbound Full Relay: default</source>
-        <extracomment>Explanatory text for an outbound peer connection that relays all network information. This is the default behavior for outbound connections.</extracomment>
-        <translation type="unfinished">Udgående fuld relæ: standard</translation>
-    </message>
-    <message>
-        <source>Outbound Block Relay: does not relay transactions or addresses</source>
-        <extracomment>Explanatory text for an outbound peer connection that relays network information about blocks and not transactions or addresses.</extracomment>
-        <translation type="unfinished">Udgående blokrelæ: videresender ikke transaktioner eller adresser</translation>
-    </message>
-    <message>
-        <source>Outbound Manual: added using RPC %1 or %2/%3 configuration options</source>
-        <extracomment>Explanatory text for an outbound peer connection that was established manually through one of several methods. The numbered arguments are stand-ins for the methods available to establish manual connections.</extracomment>
-        <translation type="unfinished">Udgående manual: tilføjet ved hjælp af RPC %1 eller %2/%3 konfigurationsmuligheder</translation>
-    </message>
-    <message>
-        <source>Outbound Feeler: short-lived, for testing addresses</source>
-        <extracomment>Explanatory text for a short-lived outbound peer connection that is used to test the aliveness of known addresses.</extracomment>
-        <translation type="unfinished">Udgående fejl: kortvarig, til test af adresser</translation>
-    </message>
-    <message>
-        <source>Outbound Address Fetch: short-lived, for soliciting addresses</source>
-        <extracomment>Explanatory text for a short-lived outbound peer connection that is used to request addresses from a peer.</extracomment>
-        <translation type="unfinished">Udgående adressehentning: kortvarig, til at anmode om adresser</translation>
-    </message>
     <message>
         <source>we selected the peer for high bandwidth relay</source>
         <translation type="unfinished">vi valgte denne peer for høj bredbånd relæ</translation>
@@ -2288,10 +1850,6 @@ For mere information om brug af denne konsol, skriv %6.
         <source>&amp;Amount:</source>
         <translation type="unfinished">&amp;Beløb:</translation>
     </message>
-    <message>
-        <source>&amp;Label:</source>
-        <translation type="unfinished">&amp;Mærkat:</translation>
-    </message>
     <message>
         <source>&amp;Message:</source>
         <translation type="unfinished">&amp;Besked:</translation>
@@ -2755,34 +2313,6 @@ Bemærk: Da gebyret beregnes på per-byte-basis, ville en gebyrsats på "100 sat
         <source>Confirm send coins</source>
         <translation type="unfinished">Bekræft afsendelse af bitcoins</translation>
     </message>
-    <message>
-        <source>The recipient address is not valid. Please recheck.</source>
-        <translation type="unfinished">Modtageradressen er ikke gyldig. Tjek venligst igen.</translation>
-    </message>
-    <message>
-        <source>The amount to pay must be larger than 0.</source>
-        <translation type="unfinished">Beløbet til betaling skal være større end 0.</translation>
-    </message>
-    <message>
-        <source>The amount exceeds your balance.</source>
-        <translation type="unfinished">Beløbet overstiger din saldo.</translation>
-    </message>
-    <message>
-        <source>The total exceeds your balance when the %1 transaction fee is included.</source>
-        <translation type="unfinished">Totalen overstiger din saldo, når transaktionsgebyret på %1 er inkluderet.</translation>
-    </message>
-    <message>
-        <source>Duplicate address found: addresses should only be used once each.</source>
-        <translation type="unfinished">Adressegenganger fundet. Adresser bør kun bruges én gang hver.</translation>
-    </message>
-    <message>
-        <source>Transaction creation failed!</source>
-        <translation type="unfinished">Oprettelse af transaktion mislykkedes!</translation>
-    </message>
-    <message>
-        <source>A fee higher than %1 is considered an absurdly high fee.</source>
-        <translation type="unfinished">Et gebyr højere end %1 opfattes som et absurd højt gebyr.</translation>
-    </message>
     <message numerus="yes">
         <source>Estimated to begin confirmation within %n block(s).</source>
         <translation type="unfinished">
@@ -2790,289 +2320,17 @@ Bemærk: Da gebyret beregnes på per-byte-basis, ville en gebyrsats på "100 sat
             <numerusform>Estimated to begin confirmation within %n block(s).</numerusform>
         </translation>
     </message>
-    <message>
-        <source>Warning: Invalid Bitcoin address</source>
-        <translation type="unfinished">Advarsel: Ugyldig Bitcoin-adresse</translation>
-    </message>
-    <message>
-        <source>Warning: Unknown change address</source>
-        <translation type="unfinished">Advarsel: Ukendt byttepengeadresse</translation>
-    </message>
-    <message>
-        <source>Confirm custom change address</source>
-        <translation type="unfinished">Bekræft tilpasset byttepengeadresse</translation>
-    </message>
-    <message>
-        <source>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?</source>
-        <translation type="unfinished">Den adresse, du har valgt til byttepenge, er ikke en del af denne tegnebog. Nogle af eller alle penge i din tegnebog kan blive sendt til denne adresse. Er du sikker?</translation>
-    </message>
     <message>
         <source>(no label)</source>
         <translation type="unfinished">(ingen mærkat)</translation>
     </message>
 </context>
-<context>
-    <name>SendCoinsEntry</name>
-    <message>
-        <source>A&amp;mount:</source>
-        <translation type="unfinished">&amp;Beløb:</translation>
-    </message>
-    <message>
-        <source>Pay &amp;To:</source>
-        <translation type="unfinished">Betal &amp;til:</translation>
-    </message>
-    <message>
-        <source>&amp;Label:</source>
-        <translation type="unfinished">&amp;Mærkat:</translation>
-    </message>
-    <message>
-        <source>Choose previously used address</source>
-        <translation type="unfinished">Vælg tidligere brugt adresse</translation>
-    </message>
-    <message>
-        <source>The Bitcoin address to send the payment to</source>
-        <translation type="unfinished">Bitcoin-adresse, som betalingen skal sendes til</translation>
-    </message>
-    <message>
-        <source>Paste address from clipboard</source>
-        <translation type="unfinished">Indsæt adresse fra udklipsholderen</translation>
-    </message>
-    <message>
-        <source>Remove this entry</source>
-        <translation type="unfinished">Fjern denne indgang</translation>
-    </message>
-    <message>
-        <source>The amount to send in the selected unit</source>
-        <translation type="unfinished">Beløbet der skal afsendes i den valgte enhed</translation>
-    </message>
-    <message>
-        <source>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.</source>
-        <translation type="unfinished">Gebyret vil blive trukket fra det sendte beløb. Modtageren vil modtage færre bitcoin, end du indtaster i beløbfeltet. Hvis flere modtagere vælges, vil gebyret deles ligeligt.</translation>
-    </message>
-    <message>
-        <source>S&amp;ubtract fee from amount</source>
-        <translation type="unfinished">&amp;Træk gebyr fra beløb</translation>
-    </message>
-    <message>
-        <source>Use available balance</source>
-        <translation type="unfinished">Brug tilgængelig saldo</translation>
-    </message>
-    <message>
-        <source>Message:</source>
-        <translation type="unfinished">Besked:</translation>
-    </message>
-    <message>
-        <source>Enter a label for this address to add it to the list of used addresses</source>
-        <translation type="unfinished">Indtast et mærkat for denne adresse for at føje den til listen over brugte adresser</translation>
-    </message>
-    <message>
-        <source>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.</source>
-        <translation type="unfinished">En besked, som blev føjet til “bitcoin:”-URI'en, som vil gemmes med transaktionen til din reference. Bemærk: Denne besked vil ikke blive sendt over Bitcoin-netværket.</translation>
-    </message>
-</context>
-<context>
-    <name>SendConfirmationDialog</name>
-    <message>
-        <source>Send</source>
-        <translation type="unfinished">Afsend</translation>
-    </message>
-    <message>
-        <source>Create Unsigned</source>
-        <translation type="unfinished">Opret Usigneret</translation>
-    </message>
-</context>
-<context>
-    <name>SignVerifyMessageDialog</name>
-    <message>
-        <source>Signatures - Sign / Verify a Message</source>
-        <translation type="unfinished">Signaturer – Underskriv/verificér en besked</translation>
-    </message>
-    <message>
-        <source>&amp;Sign Message</source>
-        <translation type="unfinished">&amp;Singér besked</translation>
-    </message>
-    <message>
-        <source>The Bitcoin address to sign the message with</source>
-        <translation type="unfinished">Bitcoin-adresse, som beskeden skal signeres med</translation>
-    </message>
-    <message>
-        <source>Choose previously used address</source>
-        <translation type="unfinished">Vælg tidligere brugt adresse</translation>
-    </message>
-    <message>
-        <source>Paste address from clipboard</source>
-        <translation type="unfinished">Indsæt adresse fra udklipsholderen</translation>
-    </message>
-    <message>
-        <source>Enter the message you want to sign here</source>
-        <translation type="unfinished">Indtast her beskeden, du ønsker at signere</translation>
-    </message>
-    <message>
-        <source>Signature</source>
-        <translation type="unfinished">Signatur</translation>
-    </message>
-    <message>
-        <source>Sign the message to prove you own this Bitcoin address</source>
-        <translation type="unfinished">Signér denne besked for at bevise, at Bitcoin-adressen tilhører dig</translation>
-    </message>
-    <message>
-        <source>Sign &amp;Message</source>
-        <translation type="unfinished">Signér &amp;besked</translation>
-    </message>
-    <message>
-        <source>Reset all sign message fields</source>
-        <translation type="unfinished">Nulstil alle “signér besked”-felter</translation>
-    </message>
-    <message>
-        <source>Clear &amp;All</source>
-        <translation type="unfinished">Ryd &amp;alle</translation>
-    </message>
-    <message>
-        <source>&amp;Verify Message</source>
-        <translation type="unfinished">&amp;Verificér besked</translation>
-    </message>
-    <message>
-        <source>Enter the receiver's address, message (ensure you copy line breaks, spaces, tabs, etc. exactly) and signature below to verify the message. Be careful not to read more into the signature than what is in the signed message itself, to avoid being tricked by a man-in-the-middle attack. Note that this only proves the signing party receives with the address, it cannot prove sendership of any transaction!</source>
-        <translation type="unfinished">Indtast modtagerens adresse, besked (vær sikker på at kopiere linjeskift, mellemrum, tabuleringer, etc. præcist) og signatur herunder for at verificere beskeden. Vær forsigtig med ikke at læse noget ud fra signaturen, som ikke står i selve beskeden, for at undgå at blive snydt af et eventuelt man-in-the-middle-angreb. Bemærk, at dette kun beviser, at den signerende person kan modtage med adressen; det kan ikke bevise hvem der har sendt en given transaktion!</translation>
-    </message>
-    <message>
-        <source>The Bitcoin address the message was signed with</source>
-        <translation type="unfinished">Bitcoin-adressen, som beskeden blev signeret med</translation>
-    </message>
-    <message>
-        <source>The signed message to verify</source>
-        <translation type="unfinished">Den signerede meddelelse som skal verificeres</translation>
-    </message>
-    <message>
-        <source>The signature given when the message was signed</source>
-        <translation type="unfinished">Signaturen som blev givet da meddelelsen blev signeret</translation>
-    </message>
-    <message>
-        <source>Verify the message to ensure it was signed with the specified Bitcoin address</source>
-        <translation type="unfinished">Verificér beskeden for at sikre, at den er signeret med den angivne Bitcoin-adresse</translation>
-    </message>
-    <message>
-        <source>Verify &amp;Message</source>
-        <translation type="unfinished">Verificér &amp;besked</translation>
-    </message>
-    <message>
-        <source>Reset all verify message fields</source>
-        <translation type="unfinished">Nulstil alle “verificér besked”-felter</translation>
-    </message>
-    <message>
-        <source>Click "Sign Message" to generate signature</source>
-        <translation type="unfinished">Klik “Signér besked” for at generere underskriften</translation>
-    </message>
-    <message>
-        <source>The entered address is invalid.</source>
-        <translation type="unfinished">Den indtastede adresse er ugyldig.</translation>
-    </message>
-    <message>
-        <source>Please check the address and try again.</source>
-        <translation type="unfinished">Tjek venligst adressen og forsøg igen.</translation>
-    </message>
-    <message>
-        <source>Wallet unlock was cancelled.</source>
-        <translation type="unfinished">Tegnebogsoplåsning annulleret.</translation>
-    </message>
-    <message>
-        <source>No error</source>
-        <translation type="unfinished">Ingen fejl</translation>
-    </message>
-    <message>
-        <source>Private key for the entered address is not available.</source>
-        <translation type="unfinished">Den private nøgle for den indtastede adresse er ikke tilgængelig.</translation>
-    </message>
-    <message>
-        <source>Message signing failed.</source>
-        <translation type="unfinished">Signering af besked mislykkedes.</translation>
-    </message>
-    <message>
-        <source>Message signed.</source>
-        <translation type="unfinished">Besked signeret.</translation>
-    </message>
-    <message>
-        <source>The signature could not be decoded.</source>
-        <translation type="unfinished">Signaturen kunne ikke afkodes.</translation>
-    </message>
-    <message>
-        <source>Please check the signature and try again.</source>
-        <translation type="unfinished">Tjek venligst signaturen og forsøg igen.</translation>
-    </message>
-    <message>
-        <source>The signature did not match the message digest.</source>
-        <translation type="unfinished">Signaturen passer ikke overens med beskedens indhold.</translation>
-    </message>
-    <message>
-        <source>Message verification failed.</source>
-        <translation type="unfinished">Verificering af besked mislykkedes.</translation>
-    </message>
-    <message>
-        <source>Message verified.</source>
-        <translation type="unfinished">Besked verificeret.</translation>
-    </message>
-</context>
-<context>
-    <name>SplashScreen</name>
-    <message>
-        <source>(press q to shutdown and continue later)</source>
-        <translation type="unfinished">(tast q for at lukke ned og fortsætte senere)</translation>
-    </message>
-    <message>
-        <source>press q to shutdown</source>
-        <translation type="unfinished">tryk på q for at lukke</translation>
-    </message>
-</context>
 <context>
     <name>TransactionDesc</name>
-    <message>
-        <source>conflicted with a transaction with %1 confirmations</source>
-        <extracomment>Text explaining the current status of a transaction, shown in the status field of the details window for this transaction. This status represents an unconfirmed transaction that conflicts with a confirmed transaction.</extracomment>
-        <translation type="unfinished">i konflikt med en transaktion, der har %1 bekræftelser</translation>
-    </message>
-    <message>
-        <source>abandoned</source>
-        <extracomment>Text explaining the current status of a transaction, shown in the status field of the details window for this transaction. This status represents an abandoned transaction.</extracomment>
-        <translation type="unfinished">opgivet</translation>
-    </message>
-    <message>
-        <source>%1/unconfirmed</source>
-        <extracomment>Text explaining the current status of a transaction, shown in the status field of the details window for this transaction. This status represents a transaction confirmed in at least one block, but less than 6 blocks.</extracomment>
-        <translation type="unfinished">%1/ubekræftet</translation>
-    </message>
-    <message>
-        <source>%1 confirmations</source>
-        <extracomment>Text explaining the current status of a transaction, shown in the status field of the details window for this transaction. This status represents a transaction confirmed in 6 or more blocks.</extracomment>
-        <translation type="unfinished">%1 bekræftelser</translation>
-    </message>
     <message>
         <source>Date</source>
         <translation type="unfinished">Dato</translation>
     </message>
-    <message>
-        <source>Source</source>
-        <translation type="unfinished">Kilde</translation>
-    </message>
-    <message>
-        <source>Generated</source>
-        <translation type="unfinished">Genereret</translation>
-    </message>
-    <message>
-        <source>From</source>
-        <translation type="unfinished">Fra</translation>
-    </message>
-    <message>
-        <source>unknown</source>
-        <translation type="unfinished">ukendt</translation>
-    </message>
-    <message>
-        <source>To</source>
-        <translation type="unfinished">Til</translation>
-    </message>
-    <message>
-        <source>own address</source>
-        <translation type="unfinished">egen adresse</translation>
-    </message>
     <message>
         <source>label</source>
         <translation type="unfinished">mærkat</translation>
@@ -3379,10 +2637,6 @@ Bemærk: Da gebyret beregnes på per-byte-basis, ville en gebyrsats på "100 sat
         <source>Label</source>
         <translation type="unfinished">Mærkat</translation>
     </message>
-    <message>
-        <source>Address</source>
-        <translation type="unfinished">Adresse</translation>
-    </message>
     <message>
         <source>Exporting Failed</source>
         <translation type="unfinished">Eksport mislykkedes</translation>
@@ -3641,10 +2895,6 @@ Gå til Fil &gt; Åbn Pung for, at indlæse en pung.
         <source>Warning: Private keys detected in wallet {%s} with disabled private keys</source>
         <translation type="unfinished">Advarsel: Private nøgler opdaget i tegnebog {%s} med deaktiverede private nøgler</translation>
     </message>
-    <message>
-        <source>Warning: We do not appear to fully agree with our peers! You may need to upgrade, or other nodes may need to upgrade.</source>
-        <translation type="unfinished">Advarsel: Vi ser ikke ud til at være fuldt ud enige med andre knuder! Du kan være nødt til at opgradere, eller andre knuder kan være nødt til at opgradere.</translation>
-    </message>
     <message>
         <source>Witness data for blocks after height %d requires validation. Please restart with -reindex.</source>
         <translation type="unfinished">Vidnedata for blokke efter højde %d kræver validering. Genstart venligst med -reindex.</translation>
@@ -3725,10 +2975,6 @@ Gå til Fil &gt; Åbn Pung for, at indlæse en pung.
         <source>Dump file %s does not exist.</source>
         <translation type="unfinished">Dumpfil %s findes ikke.</translation>
     </message>
-    <message>
-        <source>Error creating %s</source>
-        <translation type="unfinished">Fejl skaber %s</translation>
-    </message>
     <message>
         <source>Error initializing block database</source>
         <translation type="unfinished">Klargøring af blokdatabase mislykkedes</translation>
@@ -3737,10 +2983,6 @@ Gå til Fil &gt; Åbn Pung for, at indlæse en pung.
         <source>Error loading %s</source>
         <translation type="unfinished">Fejl under indlæsning af %s</translation>
     </message>
-    <message>
-        <source>Error loading %s: Private keys can only be disabled during creation</source>
-        <translation type="unfinished">Fejl ved indlæsning af %s: Private nøgler kan kun deaktiveres under oprettelse</translation>
-    </message>
     <message>
         <source>Error loading %s: Wallet corrupted</source>
         <translation type="unfinished">Fejl under indlæsning af %s: Tegnebog ødelagt</translation>
@@ -3849,10 +3091,6 @@ Gå til Fil &gt; Åbn Pung for, at indlæse en pung.
         <source>Invalid P2P permission: '%s'</source>
         <translation type="unfinished">Invalid P2P tilladelse: '%s'</translation>
     </message>
-    <message>
-        <source>Invalid amount for %s=&lt;amount&gt;: '%s' (must be at least %s)</source>
-        <translation type="unfinished">Ugyldigt beløb for %s=&lt;beløb&gt;: “%s” (skal være mindst %s)</translation>
-    </message>
     <message>
         <source>Invalid amount for %s=&lt;amount&gt;: '%s'</source>
         <translation type="unfinished">Ugyldigt beløb for %s=&lt;beløb&gt;: “%s”</translation>
@@ -3981,62 +3219,6 @@ Gå til Fil &gt; Åbn Pung for, at indlæse en pung.
         <source>The specified config file %s does not exist</source>
         <translation type="unfinished">Den angivne konfigurationsfil %s findes ikke</translation>
     </message>
-    <message>
-        <source>The transaction amount is too small to pay the fee</source>
-        <translation type="unfinished">Transaktionsbeløbet er for lille til at betale gebyret</translation>
-    </message>
-    <message>
-        <source>The wallet will avoid paying less than the minimum relay fee.</source>
-        <translation type="unfinished">Tegnebogen vil undgå at betale mindre end minimum-videresendelsesgebyret.</translation>
-    </message>
-    <message>
-        <source>This is experimental software.</source>
-        <translation type="unfinished">Dette er eksperimentelt software.</translation>
-    </message>
-    <message>
-        <source>This is the minimum transaction fee you pay on every transaction.</source>
-        <translation type="unfinished">Dette er det transaktionsgebyr, du minimum betaler for hver transaktion.</translation>
-    </message>
-    <message>
-        <source>This is the transaction fee you will pay if you send a transaction.</source>
-        <translation type="unfinished">Dette er transaktionsgebyret, som betaler, når du sender en transaktion.</translation>
-    </message>
-    <message>
-        <source>Transaction amount too small</source>
-        <translation type="unfinished">Transaktionsbeløb er for lavt</translation>
-    </message>
-    <message>
-        <source>Transaction amounts must not be negative</source>
-        <translation type="unfinished">Transaktionsbeløb må ikke være negative</translation>
-    </message>
-    <message>
-        <source>Transaction change output index out of range</source>
-        <translation type="unfinished">Transaktions byttepenge outputindeks uden for intervallet</translation>
-    </message>
-    <message>
-        <source>Transaction must have at least one recipient</source>
-        <translation type="unfinished">Transaktionen skal have mindst én modtager</translation>
-    </message>
-    <message>
-        <source>Transaction needs a change address, but we can't generate it.</source>
-        <translation type="unfinished">Transaktionen behøver en byttepenge adresse, men vi kan ikke generere den.</translation>
-    </message>
-    <message>
-        <source>Transaction too large</source>
-        <translation type="unfinished">Transaktionen er for stor</translation>
-    </message>
-    <message>
-        <source>Unable to bind to %s on this computer (bind returned error %s)</source>
-        <translation type="unfinished">Ikke i stand til at tildele til %s på denne computer (bind returnerede fejl %s)</translation>
-    </message>
-    <message>
-        <source>Unable to bind to %s on this computer. %s is probably already running.</source>
-        <translation type="unfinished">Ikke i stand til at tildele til %s på denne computer. %s kører formodentlig allerede.</translation>
-    </message>
-    <message>
-        <source>Unable to create the PID file '%s': %s</source>
-        <translation type="unfinished">Ikke i stand til at oprette PID fil '%s': %s</translation>
-    </message>
     <message>
         <source>Unable to open %s for writing</source>
         <translation type="unfinished">Kan ikke åbne %s til skrivning</translation>
diff --git a/src/qt/locale/bitcoin_de.ts b/src/qt/locale/bitcoin_de.ts
index 0ea25f6f4243..94bf8a6de774 100644
--- a/src/qt/locale/bitcoin_de.ts
+++ b/src/qt/locale/bitcoin_de.ts
@@ -3,7 +3,7 @@
     <name>AddressBookPage</name>
     <message>
         <source>Right-click to edit address or label</source>
-        <translation type="unfinished">Rechtsklick zum Bearbeiten der Adresse oder der Beschreibung</translation>
+        <translation type="unfinished">Rechtsklick zum Bearbeiten der Adresse oder der Bezeichnung</translation>
     </message>
     <message>
         <source>Create a new address</source>
@@ -373,13 +373,18 @@ Das Signieren ist nur mit Adressen vom Typ 'Legacy' möglich.</translation>
         <extracomment>Short-lived peer connection type that solicits known addresses from a peer.</extracomment>
         <translation type="unfinished">Adress Abholung</translation>
     </message>
+    <message>
+        <source>Private Broadcast</source>
+        <extracomment>Short-lived peer connection type that is used for broadcasting privacy-sensitive data.</extracomment>
+        <translation type="unfinished">Private Rundsendung</translation>
+    </message>
     <message>
         <source>%1 d</source>
         <translation type="unfinished">%1 T</translation>
     </message>
     <message>
         <source>%1 h</source>
-        <translation type="unfinished">%1 S</translation>
+        <translation type="unfinished">%1 Std.</translation>
     </message>
     <message>
         <source>%1 m</source>
@@ -587,6 +592,10 @@ Das Signieren ist nur mit Adressen vom Typ 'Legacy' möglich.</translation>
         <source>Close All Wallets…</source>
         <translation type="unfinished">Schließe alle Wallets…</translation>
     </message>
+    <message>
+        <source>Restore and Migrate Wallet File…</source>
+        <translation type="unfinished">Wallet-Datei wiederherstellen und migrieren...</translation>
+    </message>
     <message>
         <source>&amp;File</source>
         <translation type="unfinished">&amp;Datei</translation>
@@ -621,7 +630,23 @@ Das Signieren ist nur mit Adressen vom Typ 'Legacy' möglich.</translation>
     </message>
     <message>
         <source>Connecting to peers…</source>
-        <translation type="unfinished">Verbindung zu Peers wird hergestellt…</translation>
+        <translation type="unfinished">Verbinde mit Peers...</translation>
+    </message>
+    <message>
+        <source>Request payments (generates QR codes and bitcoin: URIs)</source>
+        <translation type="unfinished">Zahlungen anfordern (erzeugt QR-Codes und "bitcoin:"-URIs)</translation>
+    </message>
+    <message>
+        <source>Show the list of used sending addresses and labels</source>
+        <translation type="unfinished">Liste verwendeter Zahlungsadressen und Bezeichnungen anzeigen</translation>
+    </message>
+    <message>
+        <source>Show the list of used receiving addresses and labels</source>
+        <translation type="unfinished">Liste verwendeter Empfangsadressen und Bezeichnungen anzeigen</translation>
+    </message>
+    <message>
+        <source>&amp;Command-line options</source>
+        <translation type="unfinished">&amp;Kommandozeilenoptionen</translation>
     </message>
     <message numerus="yes">
         <source>Processed %n block(s) of transaction history.</source>
@@ -630,6 +655,50 @@ Das Signieren ist nur mit Adressen vom Typ 'Legacy' möglich.</translation>
             <numerusform>%n Block/Blöcke der Transaktionshistorie verarbeitet.</numerusform>
         </translation>
     </message>
+    <message>
+        <source>%1 behind</source>
+        <translation type="unfinished">%1 im Rückstand</translation>
+    </message>
+    <message>
+        <source>Catching up…</source>
+        <translation type="unfinished">Hole auf…</translation>
+    </message>
+    <message>
+        <source>Last received block was generated %1 ago.</source>
+        <translation type="unfinished">Der letzte empfangene Block ist %1 alt.</translation>
+    </message>
+    <message>
+        <source>Transactions after this will not yet be visible.</source>
+        <translation type="unfinished">Transaktionen hiernach werden noch nicht angezeigt.</translation>
+    </message>
+    <message>
+        <source>Error</source>
+        <translation type="unfinished">Fehler</translation>
+    </message>
+    <message>
+        <source>Warning</source>
+        <translation type="unfinished">Warnung</translation>
+    </message>
+    <message>
+        <source>Information</source>
+        <translation type="unfinished">Hinweis</translation>
+    </message>
+    <message>
+        <source>Up to date</source>
+        <translation type="unfinished">Auf aktuellem Stand</translation>
+    </message>
+    <message>
+        <source>Load Partially Signed Bitcoin Transaction</source>
+        <translation type="unfinished">Lade teilsignierte Bitcoin-Transaktion</translation>
+    </message>
+    <message>
+        <source>Node window</source>
+        <translation type="unfinished">Node-Fenster</translation>
+    </message>
+    <message>
+        <source>Close all wallets</source>
+        <translation type="unfinished">Schließe alle Wallets</translation>
+    </message>
     <message>
         <source>Migrate Wallet</source>
         <translation type="unfinished">Wallet migrieren</translation>
@@ -674,9 +743,26 @@ Das Signieren ist nur mit Adressen vom Typ 'Legacy' möglich.</translation>
         <extracomment>Label of the input field where the name of the wallet is entered.</extracomment>
         <translation type="unfinished">Wallet-Name</translation>
     </message>
+    <message>
+        <source>Invalid Wallet Name</source>
+        <translation type="unfinished">Ungültiger Wallet-Name</translation>
+    </message>
+    <message>
+        <source>Wallet name cannot be empty</source>
+        <translation type="unfinished">Der Wallet-Name darf nicht leer sein</translation>
+    </message>
+    <message>
+        <source>Restore and Migrate Wallet Backup</source>
+        <translation type="unfinished">Wallet-Backup wiederherstellen und migrieren</translation>
+    </message>
+    <message>
+        <source>Restore and Migrate Wallet</source>
+        <extracomment>Title of pop-up window shown when the user is attempting to restore a wallet.</extracomment>
+        <translation type="unfinished">Wallet wiederherstellen und migrieren</translation>
+    </message>
     <message>
         <source>&amp;Window</source>
-        <translation type="unfinished">&amp;Programmfenster</translation>
+        <translation type="unfinished">&amp;Fenster</translation>
     </message>
     <message>
         <source>Ctrl+M</source>
@@ -830,6 +916,46 @@ Das Signieren ist nur mit Adressen vom Typ 'Legacy' möglich.</translation>
         <source>Fee:</source>
         <translation type="unfinished">Gebühr:</translation>
     </message>
+    <message>
+        <source>After Fee:</source>
+        <translation type="unfinished">Abzüglich Gebühr:</translation>
+    </message>
+    <message>
+        <source>Date</source>
+        <translation type="unfinished">Datum</translation>
+    </message>
+    <message>
+        <source>&amp;Copy address</source>
+        <translation type="unfinished">&amp;Adresse kopieren</translation>
+    </message>
+    <message>
+        <source>Copy &amp;label</source>
+        <translation type="unfinished">&amp;Bezeichnung kopieren</translation>
+    </message>
+    <message>
+        <source>Copy &amp;amount</source>
+        <translation type="unfinished">&amp;Betrag kopieren</translation>
+    </message>
+    <message>
+        <source>Copy transaction &amp;ID and output index</source>
+        <translation type="unfinished">Transaktion &amp;ID und Ausgabeindex kopieren</translation>
+    </message>
+    <message>
+        <source>L&amp;ock unspent</source>
+        <translation type="unfinished">Nicht ausgegebenen Betrag &amp;sperren</translation>
+    </message>
+    <message>
+        <source>&amp;Unlock unspent</source>
+        <translation type="unfinished">Nicht ausgegebenen Betrag &amp;entsperren</translation>
+    </message>
+    <message>
+        <source>Copy quantity</source>
+        <translation type="unfinished">Anzahl kopieren</translation>
+    </message>
+    <message>
+        <source>Copy after fee</source>
+        <translation type="unfinished">Abzüglich Gebühr kopieren</translation>
+    </message>
     <message>
         <source>Copy change</source>
         <translation type="unfinished">Wechselgeld kopieren</translation>
@@ -939,6 +1065,40 @@ Während des Migrationsprozesses wird vor der Migration ein Backup der Wallet er
         <source>Solvable but not watched scripts have been migrated to a new wallet named '%1'.</source>
         <translation type="unfinished">Lösbare aber nicht beobachtete Scripts wurden in eine neue Wallet namens '%1' überführt.</translation>
     </message>
+    <message>
+        <source>Restore and Migrate wallet</source>
+        <translation type="unfinished">Wallet wiederherstellen und migrieren</translation>
+    </message>
+    <message>
+        <source>Are you sure you wish to restore the wallet file &lt;i&gt;%1&lt;/i&gt; to &lt;i&gt;%2&lt;/i&gt; and migrate it?</source>
+        <translation type="unfinished">Bist du sicher, dass du die Wallet-Datei &lt;i&gt;%1&lt;/i&gt; nach &lt;i&gt;%2&lt;/i&gt; wiederherstellen und migrieren möchtest?</translation>
+    </message>
+    <message>
+        <source>Restoring the wallet will copy the backup file to the wallets directory and place it in the standard wallet directory layout. The original file will not be modified.
+
+Migrating the wallet will convert the restored wallet to one or more descriptor wallets. A new wallet backup will need to be made.
+If this wallet contains any watchonly scripts, a new wallet will be created which contains those watchonly scripts.
+If this wallet contains any solvable but not watched scripts, a different and new wallet will be created which contains those scripts.
+
+The migration process will create a backup of the wallet before migrating. This backup file will be named &lt;wallet name&gt;-&lt;timestamp&gt;.legacy.bak and can be found in the directory for this wallet. In the event of an incorrect migration, the backup can be restored with the "Restore Wallet" functionality.</source>
+        <translation type="unfinished">Die Wiederherstellung der Wallet kopiert die Backup-Datei in das Wallet-Verzeichnis und ordnet sie in das Standard-Wallet-Verzeichnis-Layout ein. Die Originaldatei wird nicht verändert.
+
+Die Migration der Wallet wandelt die wiederhergestellte Wallet in eine oder mehrere Descriptor-Wallets um. Ein neues Wallet-Backup muss erstellt werden.
+Wenn diese Wallet Watchonly-Skripte enthält, wird eine neue Wallet erstellt, die diese Watchonly-Skripte enthält.
+Wenn diese Wallet lösbare, aber nicht überwachte Skripte enthält, wird eine andere und neue Wallet erstellt, die diese Skripte enthält.
+
+Der Migrationsprozess erstellt vor der Migration ein Backup der Wallet. Diese Sicherungsdatei wird &lt;wallet name&gt;-&lt;timestamp&gt;.legacy.bak genannt und ist im Verzeichnis dieser Wallet zu finden. Im Falle einer falschen Migration kann das Backup mit der Funktion "Wallet wiederherstellen" wiederhergestellt werden.</translation>
+    </message>
+    <message>
+        <source>Restore Wallet</source>
+        <extracomment>Title of progress window which is displayed when wallets are being restored.</extracomment>
+        <translation type="unfinished">Wallet wiederherstellen...</translation>
+    </message>
+    <message>
+        <source>Restoring Wallet &lt;b&gt;%1&lt;/b&gt;…</source>
+        <extracomment>Descriptive text of the restore wallets progress window which indicates to the user that wallets are currently being restored.</extracomment>
+        <translation type="unfinished">Wiederherstellen der Wallet &lt;b&gt;%1&lt;/b&gt;…</translation>
+    </message>
     <message>
         <source>Migration failed</source>
         <translation type="unfinished">Migration fehlgeschlagen</translation>
@@ -1050,8 +1210,8 @@ Während des Migrationsprozesses wird vor der Migration ein Backup der Wallet er
         <translation type="unfinished">Private Keys deaktivieren</translation>
     </message>
     <message>
-        <source>Make a blank wallet. Blank wallets do not initially have private keys or scripts. Private keys and addresses can be imported, or an HD seed can be set, at a later time.</source>
-        <translation type="unfinished">Erzeugt ein leeres Wallet. Leere Wallets haben zu Anfang keine privaten Schlüssel oder Scripte. Private Schlüssel oder Adressen können importiert werden, ebenso können jetzt oder später HD-Seeds gesetzt werden.</translation>
+        <source>Make a blank wallet. Blank wallets do not initially have private keys or scripts. Private keys and addresses can be imported using descriptors at a later time.</source>
+        <translation type="unfinished">Erstelle eine leere Wallet. Leere Wallets haben anfangs keine privaten Schlüssel oder Skripte. Private Schlüssel und Adressen können später mit Deskriptoren importiert werden.</translation>
     </message>
     <message>
         <source>Make Blank Wallet</source>
@@ -1072,7 +1232,7 @@ Während des Migrationsprozesses wird vor der Migration ein Backup der Wallet er
     <message>
         <source>Compiled without external signing support (required for external signing)</source>
         <extracomment>"External signing" means using devices such as hardware wallets.</extracomment>
-        <translation type="unfinished">Ohne Unterstützung für externe Signierung kompiliert (notwendig für externe Signierung)</translation>
+        <translation type="unfinished">Ohne Unterstützung für die Signierung durch externe Geräte Dritter kompiliert (notwendig für Signierung durch externe Geräte Dritter)</translation>
     </message>
 </context>
 <context>
@@ -1476,7 +1636,7 @@ Während des Migrationsprozesses wird vor der Migration ein Backup der Wallet er
     <message>
         <source>Subtract &amp;fee from amount by default</source>
         <extracomment>An Options window setting to set subtracting the fee from a sending amount as default.</extracomment>
-        <translation type="unfinished">Standardmäßig die Gebühr vom Betrag abziehen</translation>
+        <translation type="unfinished">Standardmäßig die &amp;Gebühr vom Betrag abziehen</translation>
     </message>
     <message>
         <source>Expert</source>
@@ -1492,7 +1652,7 @@ Während des Migrationsprozesses wird vor der Migration ein Backup der Wallet er
     </message>
     <message>
         <source>&amp;Spend unconfirmed change</source>
-        <translation type="unfinished">&amp;Unbestätigtes Wechselgeld darf ausgegeben werden</translation>
+        <translation type="unfinished">&amp;Unbestätigtes Wechselgeld ausgeben</translation>
     </message>
     <message>
         <source>Enable &amp;PSBT controls</source>
@@ -1542,7 +1702,7 @@ Während des Migrationsprozesses wird vor der Migration ein Backup der Wallet er
     </message>
     <message>
         <source>&amp;Window</source>
-        <translation type="unfinished">&amp;Programmfenster</translation>
+        <translation type="unfinished">&amp;Fenster</translation>
     </message>
     <message>
         <source>Show the icon in the system tray.</source>
@@ -1611,7 +1771,7 @@ Während des Migrationsprozesses wird vor der Migration ein Backup der Wallet er
     <message>
         <source>Compiled without external signing support (required for external signing)</source>
         <extracomment>"External signing" means using devices such as hardware wallets.</extracomment>
-        <translation type="unfinished">Ohne Unterstützung für externe Signierung kompiliert (notwendig für externe Signierung)</translation>
+        <translation type="unfinished">Ohne Unterstützung für die Signierung durch externe Geräte Dritter kompiliert (notwendig für Signierung durch externe Geräte Dritter)</translation>
     </message>
     <message>
         <source>default</source>
@@ -1774,15 +1934,18 @@ Während des Migrationsprozesses wird vor der Migration ein Backup der Wallet er
     </message>
     <message>
         <source>Cannot sign inputs while wallet is locked.</source>
-        <translation type="unfinished">Eingänge können nicht unterzeichnet werden, wenn die Brieftasche gesperrt ist.</translation>
+        <translation type="unfinished">Eingaben können nicht unterzeichnet werden, wenn die Wallet gesperrt ist.</translation>
     </message>
     <message>
         <source>Could not sign any more inputs.</source>
         <translation type="unfinished">Konnte keinerlei weitere Eingaben signieren.</translation>
     </message>
-    <message>
-        <source>Signed %1 inputs, but more signatures are still required.</source>
-        <translation type="unfinished">%1 Eingaben signiert, doch noch sind weitere Signaturen erforderlich.</translation>
+    <message numerus="yes">
+        <source>Signed %n input(s), but more signatures are still required.</source>
+        <translation type="unfinished">
+            <numerusform>%n Input signiert, aber weitere Signaturen sind weiterhin erforderlich.</numerusform>
+            <numerusform>%n Inputs signiert, aber weitere Signaturen sind weiterhin erforderlich.</numerusform>
+        </translation>
     </message>
     <message>
         <source>Signed transaction successfully. Transaction is ready to broadcast.</source>
@@ -1841,9 +2004,12 @@ Während des Migrationsprozesses wird vor der Migration ein Backup der Wallet er
         <source>or</source>
         <translation type="unfinished">oder</translation>
     </message>
-    <message>
-        <source>Transaction has %1 unsigned inputs.</source>
-        <translation type="unfinished">Transaktion hat %1 unsignierte Eingaben.</translation>
+    <message numerus="yes">
+        <source>Transaction has %n unsigned input(s).</source>
+        <translation type="unfinished">
+            <numerusform>Die Transaktion hat %n unsigniertes Input.</numerusform>
+            <numerusform>Die Transaktionen haben %n unsignierte Inputs.</numerusform>
+        </translation>
     </message>
     <message>
         <source>Transaction is missing some information about inputs.</source>
@@ -1916,11 +2082,6 @@ Wenn Sie diese Fehlermeldung erhalten, sollten Sie den Händler bitten, einen BI
         <extracomment>Title of Peers Table column which contains the peer's User Agent string.</extracomment>
         <translation type="unfinished">User-Agent</translation>
     </message>
-    <message>
-        <source>Peer</source>
-        <extracomment>Title of Peers Table column which contains a unique number used to identify a connection.</extracomment>
-        <translation type="unfinished">Gegenstelle</translation>
-    </message>
     <message>
         <source>Age</source>
         <extracomment>Title of Peers Table column which indicates the duration (length of time) since the peer connection started.</extracomment>
@@ -1934,7 +2095,7 @@ Wenn Sie diese Fehlermeldung erhalten, sollten Sie den Händler bitten, einen BI
     <message>
         <source>Sent</source>
         <extracomment>Title of Peers Table column which indicates the total amount of network information we have sent to the peer.</extracomment>
-        <translation type="unfinished">Übertragen</translation>
+        <translation type="unfinished">Gesendet</translation>
     </message>
     <message>
         <source>Received</source>
@@ -2083,7 +2244,7 @@ Wenn Sie diese Fehlermeldung erhalten, sollten Sie den Händler bitten, einen BI
     </message>
     <message>
         <source>Sent</source>
-        <translation type="unfinished">Übertragen</translation>
+        <translation type="unfinished">Gesendet</translation>
     </message>
     <message>
         <source>Banned peers</source>
@@ -2113,10 +2274,6 @@ Wenn Sie diese Fehlermeldung erhalten, sollten Sie den Händler bitten, einen BI
         <source>Transaction Relay</source>
         <translation type="unfinished">Transaktions-Relay</translation>
     </message>
-    <message>
-        <source>Starting Block</source>
-        <translation type="unfinished">Start Block</translation>
-    </message>
     <message>
         <source>Synced Headers</source>
         <translation type="unfinished">Synchronisierte Header</translation>
@@ -2150,7 +2307,7 @@ Wenn Sie diese Fehlermeldung erhalten, sollten Sie den Händler bitten, einen BI
     <message>
         <source>The total number of addresses received from this peer that were processed (excludes addresses that were dropped due to rate-limiting).</source>
         <extracomment>Tooltip text for the Addresses Processed field in the peer details area, which displays the total number of addresses received from this peer that were processed (excludes addresses that were dropped due to rate-limiting).</extracomment>
-        <translation type="unfinished">Die Gesamtzahl der von diesem Peer empfangenen Adressen, die verarbeitet wurden (ausgenommen Adressen, die aufgrund von Ratenbegrenzung verworfen wurden).</translation>
+        <translation type="unfinished">Die Gesamtzahl der von diesem Peer empfangenen Adressen, die verarbeitet wurden (Adressen, die aufgrund von Ratenbegrenzung verworfen wurden, sind ausgeschlossen).</translation>
     </message>
     <message>
         <source>The total number of addresses received from this peer that were dropped (not processed) due to rate-limiting.</source>
@@ -2171,6 +2328,10 @@ Wenn Sie diese Fehlermeldung erhalten, sollten Sie den Händler bitten, einen BI
         <source>User Agent</source>
         <translation type="unfinished">User-Agent</translation>
     </message>
+    <message>
+        <source>Node window</source>
+        <translation type="unfinished">Node-Fenster</translation>
+    </message>
     <message>
         <source>Current block height</source>
         <translation type="unfinished">Aktuelle Blockhöhe</translation>
@@ -2330,6 +2491,11 @@ Wenn Sie diese Fehlermeldung erhalten, sollten Sie den Händler bitten, einen BI
         <extracomment>Explanatory text for a short-lived outbound peer connection that is used to request addresses from a peer.</extracomment>
         <translation type="unfinished">Ausgehende Adressensammlung: kurzlebig, zum Anfragen von Adressen</translation>
     </message>
+    <message>
+        <source>Private broadcast: short-lived, for broadcasting privacy-sensitive transactions</source>
+        <extracomment>Explanatory text for a short-lived outbound peer connection that is used to broadcast privacy-sensitive data (like our transactions).</extracomment>
+        <translation type="unfinished">Private Rundsendung: kurzlebig, zur Rundsendung von datenschutzsensiblen Transaktionen</translation>
+    </message>
     <message>
         <source>detecting: peer could be v1 or v2</source>
         <extracomment>Explanatory text for "detecting" transport type.</extracomment>
@@ -2584,18 +2750,10 @@ Für weitere Informationen über diese Konsole, tippe %6.
         <source>&amp;Copy address</source>
         <translation type="unfinished">&amp;Adresse kopieren</translation>
     </message>
-    <message>
-        <source>Copy &amp;label</source>
-        <translation type="unfinished">&amp;Bezeichnung kopieren</translation>
-    </message>
     <message>
         <source>Copy &amp;message</source>
         <translation type="unfinished">&amp;Nachricht kopieren</translation>
     </message>
-    <message>
-        <source>Copy &amp;amount</source>
-        <translation type="unfinished">&amp;Betrag kopieren</translation>
-    </message>
     <message>
         <source>Not recommended due to higher fees and less protection against typos.</source>
         <translation type="unfinished">Nicht zu empfehlen aufgrund höherer Gebühren und geringerem Schutz vor Tippfehlern.</translation>
@@ -2678,10 +2836,6 @@ Für weitere Informationen über diese Konsole, tippe %6.
 </context>
 <context>
     <name>RecentRequestsTableModel</name>
-    <message>
-        <source>Date</source>
-        <translation type="unfinished">Datum</translation>
-    </message>
     <message>
         <source>Label</source>
         <translation type="unfinished">Bezeichnung</translation>
@@ -2835,7 +2989,7 @@ Hinweis: Da die Gebühr auf Basis der Bytes berechnet wird, führt eine Gebühre
     </message>
     <message>
         <source>Clear &amp;All</source>
-        <translation type="unfinished">&amp;Zurücksetzen</translation>
+        <translation type="unfinished">Alles &amp;zurücksetzen</translation>
     </message>
     <message>
         <source>Balance:</source>
@@ -2853,22 +3007,10 @@ Hinweis: Da die Gebühr auf Basis der Bytes berechnet wird, führt eine Gebühre
         <source>Copy quantity</source>
         <translation type="unfinished">Anzahl kopieren</translation>
     </message>
-    <message>
-        <source>Copy amount</source>
-        <translation type="unfinished">Betrag kopieren</translation>
-    </message>
-    <message>
-        <source>Copy fee</source>
-        <translation type="unfinished">Gebühr kopieren</translation>
-    </message>
     <message>
         <source>Copy after fee</source>
         <translation type="unfinished">Abzüglich Gebühr kopieren</translation>
     </message>
-    <message>
-        <source>Copy bytes</source>
-        <translation type="unfinished">Bytes kopieren</translation>
-    </message>
     <message>
         <source>Copy change</source>
         <translation type="unfinished">Wechselgeld kopieren</translation>
@@ -3017,10 +3159,6 @@ Hinweis: Da die Gebühr auf Basis der Bytes berechnet wird, führt eine Gebühre
         <source>The amount exceeds your balance.</source>
         <translation type="unfinished">Der angegebene Betrag übersteigt Ihren Kontostand.</translation>
     </message>
-    <message>
-        <source>The total exceeds your balance when the %1 transaction fee is included.</source>
-        <translation type="unfinished">Der angegebene Betrag übersteigt aufgrund der Transaktionsgebühr in Höhe von %1 Ihren Kontostand.</translation>
-    </message>
     <message>
         <source>Duplicate address found: addresses should only be used once each.</source>
         <translation type="unfinished">Doppelte Adresse entdeckt: Adressen sollten jeweils nur einmal benutzt werden.</translation>
@@ -3081,7 +3219,7 @@ Hinweis: Da die Gebühr auf Basis der Bytes berechnet wird, führt eine Gebühre
     </message>
     <message>
         <source>The Bitcoin address to send the payment to</source>
-        <translation type="unfinished">Die Zahlungsadresse der Überweisung</translation>
+        <translation type="unfinished">Die Bitcoin-Adresse, an die die Zahlung gesendet werden soll</translation>
     </message>
     <message>
         <source>Paste address from clipboard</source>
@@ -3167,7 +3305,7 @@ Hinweis: Da die Gebühr auf Basis der Bytes berechnet wird, führt eine Gebühre
     </message>
     <message>
         <source>Copy the current signature to the clipboard</source>
-        <translation type="unfinished">Kopieren der aktuelle Signatur in die Zwischenablage</translation>
+        <translation type="unfinished">Die aktuelle Signatur in die Zwischenablage kopieren</translation>
     </message>
     <message>
         <source>Sign the message to prove you own this Bitcoin address</source>
@@ -3183,7 +3321,7 @@ Hinweis: Da die Gebühr auf Basis der Bytes berechnet wird, führt eine Gebühre
     </message>
     <message>
         <source>Clear &amp;All</source>
-        <translation type="unfinished">&amp;Zurücksetzen</translation>
+        <translation type="unfinished">Alles &amp;Zurücksetzen</translation>
     </message>
     <message>
         <source>&amp;Verify Message</source>
@@ -3191,7 +3329,7 @@ Hinweis: Da die Gebühr auf Basis der Bytes berechnet wird, führt eine Gebühre
     </message>
     <message>
         <source>Enter the receiver's address, message (ensure you copy line breaks, spaces, tabs, etc. exactly) and signature below to verify the message. Be careful not to read more into the signature than what is in the signed message itself, to avoid being tricked by a man-in-the-middle attack. Note that this only proves the signing party receives with the address, it cannot prove sendership of any transaction!</source>
-        <translation type="unfinished">Geben Sie die Zahlungsadresse des Empfängers, Nachricht (achten Sie darauf Zeilenumbrüche, Leerzeichen, Tabulatoren usw. exakt zu kopieren) und Signatur unten ein, um die Nachricht zu verifizieren. Vorsicht, interpretieren Sie nicht mehr in die Signatur hinein, als in der signierten Nachricht selber enthalten ist, um nicht von einem Man-in-the-middle-Angriff hinters Licht geführt zu werden. Beachten Sie, dass dies nur beweist, dass die signierende Partei über diese Adresse Überweisungen empfangen kann, es aber nicht die Absenderschaft irgendeiner Transaktion beweisen kann.</translation>
+        <translation type="unfinished">Geben Sie die Zahlungsadresse des Empfängers, Nachricht (achten Sie darauf Zeilenumbrüche, Leerzeichen, Tabulatoren usw. exakt zu kopieren) und Signatur unten ein, um die Nachricht zu verifizieren. Vorsicht, interpretieren Sie nicht mehr in die Signatur hinein, als in der signierten Nachricht selber enthalten ist, um nicht von einem Man-in-the-middle-Angriff hinters Licht geführt zu werden. Beachten Sie, dass dies nur beweist, dass die signierende Partei über diese Adresse Überweisungen empfangen kann.</translation>
     </message>
     <message>
         <source>The Bitcoin address the message was signed with</source>
@@ -3418,7 +3556,7 @@ Hinweis: Da die Gebühr auf Basis der Bytes berechnet wird, führt eine Gebühre
     </message>
     <message>
         <source>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.</source>
-        <translation type="unfinished">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 Blockchain 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.</translation>
+        <translation type="unfinished">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 zur Blockchain hinzugefügt zu werden. Falls er es nicht in die Kette schafft, ändert sich sein Status in "nicht akzeptiert" und er kann nicht ausgegeben werden. Dies kann gelegentlich passieren, wenn ein anderer Knoten innerhalb weniger Sekunden nach Ihrem einen Block erzeugt.</translation>
     </message>
     <message>
         <source>Debug information</source>
@@ -3432,6 +3570,10 @@ Hinweis: Da die Gebühr auf Basis der Bytes berechnet wird, führt eine Gebühre
         <source>Inputs</source>
         <translation type="unfinished">Eingaben</translation>
     </message>
+    <message>
+        <source>Amount</source>
+        <translation type="unfinished">Betrag</translation>
+    </message>
     <message>
         <source>true</source>
         <translation type="unfinished">wahr</translation>
@@ -3607,7 +3749,7 @@ Hinweis: Da die Gebühr auf Basis der Bytes berechnet wird, führt eine Gebühre
     </message>
     <message>
         <source>Copy transaction &amp;ID</source>
-        <translation type="unfinished">Transaktionskennung kopieren</translation>
+        <translation type="unfinished">Transaktions-&amp;ID kopieren</translation>
     </message>
     <message>
         <source>Copy &amp;raw transaction</source>
@@ -3647,6 +3789,10 @@ Hinweis: Da die Gebühr auf Basis der Bytes berechnet wird, führt eine Gebühre
         <extracomment>Expanded name of the CSV file format. See: https://en.wikipedia.org/wiki/Comma-separated_values.</extracomment>
         <translation type="unfinished">Durch Komma getrennte Datei</translation>
     </message>
+    <message>
+        <source>Confirmed</source>
+        <translation type="unfinished">Bestätigt</translation>
+    </message>
     <message>
         <source>Date</source>
         <translation type="unfinished">Datum</translation>
@@ -3677,7 +3823,7 @@ Hinweis: Da die Gebühr auf Basis der Bytes berechnet wird, führt eine Gebühre
     </message>
     <message>
         <source>The transaction history was successfully saved to %1.</source>
-        <translation type="unfinished">Der Transaktionsverlauf wurde erfolgreich in %1 gespeichert.</translation>
+        <translation type="unfinished">Speichern des Transaktionsverlaufs nach %1 war erfolgreich.</translation>
     </message>
     <message>
         <source>Range:</source>
@@ -3847,7 +3993,7 @@ Gehen Sie zu Datei &gt; Wallet Öffnen, um eine Wallet zu laden.
     </message>
     <message>
         <source>%s request to listen on port %u. This port is considered "bad" and thus it is unlikely that any peer will connect to it. See doc/p2p-bad-ports.md for details and a full list.</source>
-        <translation type="unfinished">%s Aufforderung, auf Port %u zu lauschen. Dieser Port wird als "schlecht" eingeschätzt und es ist daher unwahrscheinlich, dass sich Peers mit ihm verbinden. Siehe doc/p2p-bad-ports.md für Details und eine vollständige Liste.</translation>
+        <translation type="unfinished">%s versucht, auf Port %u zu lauschen. Dieser Port wird als "schlecht" eingestuft und es ist daher unwahrscheinlich, dass sich Gegenstellen mit ihm verbinden. Siehe doc/p2p-bad-ports.md für Details und eine vollständige Liste.</translation>
     </message>
     <message>
         <source>Disk space for %s may not accommodate the block files. Approximately %u GB of data will be stored in this directory.</source>
@@ -3871,7 +4017,7 @@ Gehen Sie zu Datei &gt; Wallet Öffnen, um eine Wallet zu laden.
     </message>
     <message>
         <source>Error: Dumpfile format record is incorrect. Got "%s", expected "format".</source>
-        <translation type="unfinished">Fehler: Dumpdatei Format Eintrag ist ungültig. "%s" erhalten, "format" erwartet.</translation>
+        <translation type="unfinished">Fehler: Format-Eintrag der Dumpdatei ist ungültig. "%s" erhalten, "format" erwartet.</translation>
     </message>
     <message>
         <source>Error: Dumpfile identifier record is incorrect. Got "%s", expected "%s".</source>
@@ -3879,7 +4025,7 @@ Gehen Sie zu Datei &gt; Wallet Öffnen, um eine Wallet zu laden.
     </message>
     <message>
         <source>Error: Dumpfile version is not supported. This version of bitcoin-wallet only supports version 1 dumpfiles. Got dumpfile with version %s</source>
-        <translation type="unfinished">Fehler: Die Version %s der Dumpdatei wird nicht unterstützt. Diese Version von bitcoin-wallet unterstützt nur Dumpdateien der Version 1.</translation>
+        <translation type="unfinished">Fehler: Die Version der Speicherauszugsdatei ist %s und wird nicht unterstützt. Diese Version von bitcoin-wallet unterstützt nur Speicherauszugsdateien der Version 1.</translation>
     </message>
     <message>
         <source>Error: Unable to produce descriptors for this legacy wallet. Make sure to provide the wallet's passphrase if it is encrypted.</source>
@@ -3973,10 +4119,6 @@ Gehen Sie zu Datei &gt; Wallet Öffnen, um eine Wallet zu laden.
         <source>Warning: Private keys detected in wallet {%s} with disabled private keys</source>
         <translation type="unfinished">Warnung: Es wurden private Schlüssel in der Wallet {%s} entdeckt, welche private Schlüssel jedoch deaktiviert hat.</translation>
     </message>
-    <message>
-        <source>Warning: We do not appear to fully agree with our peers! You may need to upgrade, or other nodes may need to upgrade.</source>
-        <translation type="unfinished">Warnung: Wir scheinen nicht vollständig mit unseren Peers übereinzustimmen! Sie oder die anderen Knoten müssen unter Umständen Ihre Client-Software aktualisieren.</translation>
-    </message>
     <message>
         <source>Witness data for blocks after height %d requires validation. Please restart with -reindex.</source>
         <translation type="unfinished">Zeugnisdaten für Blöcke nach Höhe %d müssen validiert werden. Bitte mit -reindex neu starten.</translation>
@@ -4015,7 +4157,7 @@ Gehen Sie zu Datei &gt; Wallet Öffnen, um eine Wallet zu laden.
     </message>
     <message>
         <source>Error loading %s: External signer wallet being loaded without external signer support compiled</source>
-        <translation type="unfinished">Fehler beim Laden von %s: Externe Unterzeichner-Brieftasche wird geladen, ohne dass die Unterstützung für externe Unterzeichner kompiliert wurde</translation>
+        <translation type="unfinished">Fehler beim Laden von %s: Externe Unterzeichner-Wallet wird geladen, ohne dass die Unterstützung für externe Unterzeichner kompiliert wurde</translation>
     </message>
     <message>
         <source>Error reading %s! All keys read correctly, but transaction data or address metadata may be missing or incorrect.</source>
@@ -4031,7 +4173,7 @@ Gehen Sie zu Datei &gt; Wallet Öffnen, um eine Wallet zu laden.
     </message>
     <message>
         <source>Error: Transaction %s in wallet cannot be identified to belong to migrated wallets</source>
-        <translation type="unfinished">Fehler: Transaktion %s in der Wallet kann nicht den migrierten Wallets zugeordnet werden.</translation>
+        <translation type="unfinished">Fehler: Transaktion %s im Wallet kann nicht als zu migrierten Wallets gehörend identifiziert werden</translation>
     </message>
     <message>
         <source>Failed to remove snapshot chainstate dir (%s). Manually remove it before restarting.
@@ -4075,14 +4217,6 @@ Gehen Sie zu Datei &gt; Wallet Öffnen, um eine Wallet zu laden.
         <source>Option '-checkpoints' is set but checkpoints were removed. This option has no effect.</source>
         <translation type="unfinished">Die Option '-checkpoints' ist gesetzt, aber die Checkpoints wurden entfernt. Diese Option hat keine Auswirkungen.</translation>
     </message>
-    <message>
-        <source>Option '-maxorphantx' is set but no longer has any effect (see release notes). Please remove it from your configuration.</source>
-        <translation type="unfinished">Die Option '-maxorphantx' ist gesetzt, hat aber keine Wirkung mehr (siehe Release Notes). Bitte von der Konfiguration entfernen.</translation>
-    </message>
-    <message>
-        <source>Options '-datacarrier' or '-datacarriersize' are set but are marked as deprecated. They will be removed in a future version.</source>
-        <translation type="unfinished">Die Optionen '-datacarrier' oder '-datacarriersize' sind gesetzt, aber als veraltet markiert. Sie werden in einer zukünftigen Version entfernt.</translation>
-    </message>
     <message>
         <source>Outbound connections restricted to CJDNS (-onlynet=cjdns) but -cjdnsreachable is not provided</source>
         <translation type="unfinished">Ausgehende Verbindungen sind auf CJDNS beschränkt (-onlynet=cjdns), aber -cjdnsreachable ist nicht angegeben</translation>
@@ -4101,7 +4235,7 @@ Gehen Sie zu Datei &gt; Wallet Öffnen, um eine Wallet zu laden.
     </message>
     <message>
         <source>Prune: last wallet synchronisation goes beyond pruned data. You need to -reindex (download the whole blockchain again in case of a pruned node)</source>
-        <translation type="unfinished">Prune: Die Synchronisierung der letzten Wallet geht über beschnittene Daten (pruned) hinaus. Sie müssen -reindex laufen lassen (Es wird die gesamte Blockchain erneut heruntergeladen, falls es ein beschnittener Node (pruned) ist)</translation>
+        <translation type="unfinished">Prune: Die letzte Wallet-Synchronisierung geht über die beschnittenen Daten (pruned) hinaus. Sie müssen -reindex laufen lassen (Es wird die gesamte Blockchain erneut heruntergeladen, falls es ein beschnittener Node (pruned) ist)</translation>
     </message>
     <message>
         <source>Rename of '%s' -&gt; '%s' failed. Cannot clean up the background chainstate leveldb directory.</source>
@@ -4173,10 +4307,6 @@ Die Sicherung der Wallet kann nicht wiederhergestellt werden.</translation>
         <source>whitebind may only be used for incoming connections ("out" was passed)</source>
         <translation type="unfinished">whitebind darf nur für eingehende Verbindungen verwendet werden ("out" wurde übergeben)</translation>
     </message>
-    <message>
-        <source>-paytxfee is deprecated and will be fully removed in v31.0.</source>
-        <translation type="unfinished">-paytxfee ist veraltet und wird in v31.0 vollständig entfernt.</translation>
-    </message>
     <message>
         <source>A fatal internal error occurred, see debug.log for details: </source>
         <translation type="unfinished">Es ist ein schwerwiegender interner Fehler aufgetreten, siehe debug.log für Details:</translation>
@@ -4191,15 +4321,11 @@ Die Sicherung der Wallet kann nicht wiederhergestellt werden.</translation>
     </message>
     <message>
         <source>Can't spend unconfirmed version %d pre-selected input with a version 3 tx</source>
-        <translation type="unfinished">Unbestätigte, vorab ausgewählte Inputs der Version %d können nicht mit einer Version 3-Tx ausgegeben werden</translation>
+        <translation type="unfinished">Unbestätigter, vorab ausgewählter Input der Version %d kann nicht mit einer Version-3-Transaktion ausgegeben werden</translation>
     </message>
     <message>
         <source>Can't spend unconfirmed version 3 pre-selected input with a version %d tx</source>
-        <translation type="unfinished">Unbestätigte, vorab ausgewählte Inputs der Version 3 können nicht mit einer Version %d Tx ausgegeben werden</translation>
-    </message>
-    <message>
-        <source>Cannot add WalletDescriptor to a non-descriptor wallet</source>
-        <translation type="unfinished">WalletDescriptor kann nicht zu einer Wallet ohne Deskriptor hinzugefügt werden</translation>
+        <translation type="unfinished">Unbestätigter, vorab ausgewählter Input der Version 3 kann nicht mit einer Version %d Transaktion ausgegeben werden</translation>
     </message>
     <message>
         <source>Cannot write to directory '%s'; check permissions.</source>
@@ -4207,7 +4333,7 @@ Die Sicherung der Wallet kann nicht wiederhergestellt werden.</translation>
     </message>
     <message>
         <source>Config setting for %s only applied on %s network when in [%s] section.</source>
-        <translation type="unfinished">Konfigurationseinstellungen für %s sind nur im %s-Netzwerk gültig, wenn in Sektion [%s].</translation>
+        <translation type="unfinished">Konfigurationseinstellung für %s gilt nur im %s-Netzwerk, wenn sie im Abschnitt [%s] steht.</translation>
     </message>
     <message>
         <source>Corrupt block found indicating potential hardware failure.</source>
@@ -4229,6 +4355,10 @@ Die Sicherung der Wallet kann nicht wiederhergestellt werden.</translation>
         <source>Could not parse asmap file %s</source>
         <translation type="unfinished">Konnte die asmap Datei %s nicht analysieren</translation>
     </message>
+    <message>
+        <source>Could not read embedded asmap data</source>
+        <translation type="unfinished">Mitgelieferte ASMAP-Daten konnten nicht gelesen werden.</translation>
+    </message>
     <message>
         <source>Could not top up scriptPubKeys</source>
         <translation type="unfinished">scriptPubKeys konnten nicht aufgefüllt werden</translation>
@@ -4250,8 +4380,8 @@ Die Sicherung der Wallet kann nicht wiederhergestellt werden.</translation>
         <translation type="unfinished">Fehler bei der Plausibilitätsprüfung der Elliptischen Kurvenkryptografie. %s wird heruntergefahren.</translation>
     </message>
     <message>
-        <source>Error creating %s</source>
-        <translation type="unfinished">Error beim Erstellen von %s</translation>
+        <source>Embedded asmap data not available</source>
+        <translation type="unfinished">Mitgelieferte ASMAP-Daten nicht verfügbar</translation>
     </message>
     <message>
         <source>Error initializing block database</source>
@@ -4261,10 +4391,6 @@ Die Sicherung der Wallet kann nicht wiederhergestellt werden.</translation>
         <source>Error loading %s</source>
         <translation type="unfinished">Fehler beim Laden von %s</translation>
     </message>
-    <message>
-        <source>Error loading %s: Private keys can only be disabled during creation</source>
-        <translation type="unfinished">Fehler beim Laden von %s: Private Schlüssel können nur bei der Erstellung deaktiviert werden</translation>
-    </message>
     <message>
         <source>Error loading %s: Wallet corrupted</source>
         <translation type="unfinished">Fehler beim Laden von %s: Das Wallet ist beschädigt</translation>
@@ -4414,10 +4540,6 @@ Berechnet: %s, erwartet: %s</translation>
         <source>Failed to close file when writing block.</source>
         <translation type="unfinished">Fehler beim Schließen der Datei beim Schreiben des Blocks.</translation>
     </message>
-    <message>
-        <source>Failed to connect best block (%s).</source>
-        <translation type="unfinished">Verbindung zum besten Block (%s) konnte nicht hergestellt werden.</translation>
-    </message>
     <message>
         <source>Failed to disconnect block.</source>
         <translation type="unfinished">Block konnte nicht getrennt werden.</translation>
@@ -4442,14 +4564,6 @@ Berechnet: %s, erwartet: %s</translation>
         <source>Failed to write block.</source>
         <translation type="unfinished">Block konnte nicht geschrieben werden.</translation>
     </message>
-    <message>
-        <source>Failed to write to block index database.</source>
-        <translation type="unfinished">Schreiben in die Blockindex-Datenbank fehlgeschlagen.</translation>
-    </message>
-    <message>
-        <source>Failed to write to coin database.</source>
-        <translation type="unfinished">Schreiben in die Coin-Datenbank fehlgeschlagen.</translation>
-    </message>
     <message>
         <source>Failed to write undo data.</source>
         <translation type="unfinished">Das Schreiben der Undo-Daten ist fehlgeschlagen.</translation>
@@ -4502,14 +4616,26 @@ Berechnet: %s, erwartet: %s</translation>
         <source>Invalid P2P permission: '%s'</source>
         <translation type="unfinished">Ungültige P2P Genehmigung: '%s'</translation>
     </message>
-    <message>
-        <source>Invalid amount for %s=&lt;amount&gt;: '%s' (must be at least %s)</source>
-        <translation type="unfinished">Ungültiger Betrag für %s=&lt;amount&gt;: '%s' (muss mindestens %s sein)</translation>
-    </message>
     <message>
         <source>Invalid amount for %s=&lt;amount&gt;: '%s'</source>
         <translation type="unfinished">Ungültiger Betrag für %s=&lt;amount&gt;: '%s'</translation>
     </message>
+    <message>
+        <source>A %zu MiB dbcache may be too large for a system memory of only %zu MiB.</source>
+        <translation type="unfinished">Ein %zu MiB-Datenbankcache kann für einen Systemspeicher mit nur %zu MiB zu groß sein.</translation>
+    </message>
+    <message>
+        <source>Creating wallet…</source>
+        <translation type="unfinished">Wallet erstellen...</translation>
+    </message>
+    <message>
+        <source>Duplicate binding configuration for address %s. Please check your -bind, -bind=...=onion and -whitebind settings.</source>
+        <translation type="unfinished">Doppelte Bindungskonfiguration für Adresse %s. Bitte überprüfe deine -bind-, -bind=...=onion- und -whitebind Einstellungen.</translation>
+    </message>
+    <message>
+        <source>Error creating %s: Could not write version metadata.</source>
+        <translation type="unfinished">Fehler beim Erstellen von %s: Versionsmetadaten konnten nicht geschrieben werden.</translation>
+    </message>
     <message>
         <source>Invalid amount for -%s=&lt;amount&gt;: '%s'</source>
         <translation type="unfinished">Ungültiger Betrag für -%s=&lt;amount&gt;: '%s'</translation>
@@ -4574,6 +4700,26 @@ Berechnet: %s, erwartet: %s</translation>
         <source>Only direction was set, no permissions: '%s'</source>
         <translation type="unfinished">Nur Richtung wurde festgelegt, keine Genehmigungen: '%s'</translation>
     </message>
+    <message>
+        <source>Option '-limitancestorsize' is given but ancestor size limits have been replaced with cluster size limits (see -limitclustersize). This option has no effect.</source>
+        <translation type="unfinished">Die Option '-limitancestorsize' wird angegeben, aber Ancestor-Grössenlimits wurden durch Cluster-Größenbeschränkungen ersetzt (siehe -limitclustersize). Diese Option hat keine Wirkung.</translation>
+    </message>
+    <message>
+        <source>Option '-limitdescendantsize' is given but descendant size limits have been replaced with cluster size limits (see -limitclustersize). This option has no effect.</source>
+        <translation type="unfinished">Die Option '-limitdescendantsize' wird verwendet, aber die Größenbeschränkungen für Descendants wurden durch Clustergrößenbeschränkungen ersetzt (siehe -limitclustersize). Diese Option hat keine Wirkung.</translation>
+    </message>
+    <message>
+        <source>Private broadcast of own transactions requested (-privatebroadcast) and -proxyrandomize is disabled. Tor circuits for private broadcast connections may be correlated to other connections over Tor. For maximum privacy set -proxyrandomize=1.</source>
+        <translation type="unfinished">Private Rundsendung eigener Transaktionen angefordert (-privatebroadcast) und -proxyrandomize ist deaktiviert. Tor-Circuits für private Rundsendungsverbindungen können mit anderen Verbindungen über Tor korreliert werden. Für maximale Privatsphäre setzen Sie -proxyrandomize=1.</translation>
+    </message>
+    <message>
+        <source>Private broadcast of own transactions requested (-privatebroadcast), but -connect is also configured. They are incompatible because the private broadcast needs to open new connections to randomly chosen Tor or I2P peers. Consider using -maxconnections=0 -addnode=... instead</source>
+        <translation type="unfinished">Private Rundsendung eigener Transaktionen angefordert (-privatebroadcast), aber -connect ist ebenfalls konfiguriert. Diese sind inkompatibel, weil die private Rundsendung neue Verbindungen zu zufällig ausgewählten Tor- oder I2P-Peers öffnen muss. Erwäge die Verwendung von -maxconnections=0 -addnode=... stattdessen</translation>
+    </message>
+    <message>
+        <source>Private broadcast of own transactions requested (-privatebroadcast), but none of Tor or I2P networks is reachable</source>
+        <translation type="unfinished">Private Rundsendung eigener Transaktionen (-privatebroadcast), aber keines der Tor- oder I2P-Netzwerke ist erreichbar</translation>
+    </message>
     <message>
         <source>Prune cannot be configured with a negative value.</source>
         <translation type="unfinished">Kürzungsmodus kann nicht mit einem negativen Wert konfiguriert werden.</translation>
@@ -4582,13 +4728,17 @@ Berechnet: %s, erwartet: %s</translation>
         <source>Prune mode is incompatible with -txindex.</source>
         <translation type="unfinished">Kürzungsmodus ist nicht mit -txindex kompatibel.</translation>
     </message>
+    <message>
+        <source>Prune mode is incompatible with -txospenderindex.</source>
+        <translation type="unfinished">Der Prune-Modus ist mit -txospenderindex inkompatibel.</translation>
+    </message>
     <message>
         <source>Pruning blockstore…</source>
         <translation type="unfinished">Kürze den Blockspeicher…</translation>
     </message>
     <message>
         <source>Reducing -maxconnections from %d to %d, because of system limitations.</source>
-        <translation type="unfinished">Reduziere -maxconnections von %d auf %d, aufgrund von Systemlimitierungen.</translation>
+        <translation type="unfinished">Reduziere -maxconnections von %d zu %d, aufgrund von Systemlimitierungen.</translation>
     </message>
     <message>
         <source>Replaying blocks…</source>
@@ -4608,7 +4758,7 @@ Berechnet: %s, erwartet: %s</translation>
     </message>
     <message>
         <source>SQLiteDatabase: Failed to read database verification error: %s</source>
-        <translation type="unfinished">SQLiteDatabase: Fehler beim Lesen der Datenbank, Verifizierungsfehler: %s</translation>
+        <translation type="unfinished">SQLiteDatabase: Datenbank-Verifizierungsfehler konnte nicht gelesen werden: %s</translation>
     </message>
     <message>
         <source>SQLiteDatabase: Unexpected application id. Expected %u, got %u</source>
@@ -4672,7 +4822,7 @@ Berechnet: %s, erwartet: %s</translation>
     </message>
     <message>
         <source>The %s path uses exFAT, which is known to have intermittent corruption problems on macOS. Move this directory to a different filesystem to avoid data loss.</source>
-        <translation type="unfinished">Der %s Pfad verwendet exFAT, das unter macOS bekanntermaßen zeitweise beschädigt wird. Verschiebe dieses Verzeichnis in ein anderes Dateisystem, um Datenverlust zu vermeiden.</translation>
+        <translation type="unfinished">Der %s-Pfad verwendet exFAT, das unter macOS bekanntermaßen zeitweise beschädigt wird. Verschiebe dieses Verzeichnis in ein anderes Dateisystem, um Datenverlust zu vermeiden.</translation>
     </message>
     <message>
         <source>The source code is available from %s.</source>
@@ -4682,6 +4832,10 @@ Berechnet: %s, erwartet: %s</translation>
         <source>The specified config file %s does not exist</source>
         <translation type="unfinished">Die angegebene Konfigurationsdatei %s existiert nicht</translation>
     </message>
+    <message>
+        <source>The total exceeds your balance when the %s transaction fee is included.</source>
+        <translation type="unfinished">Der Gesamtbetrag übersteigt Ihr Guthaben, wenn die Transaktionsgebühr von %s hinzugerechnet wird.</translation>
+    </message>
     <message>
         <source>The transaction amount is too small to pay the fee</source>
         <translation type="unfinished">Der Transaktionsbetrag ist zu niedrig, um die Gebühr zu bezahlen.</translation>
@@ -4692,7 +4846,7 @@ Berechnet: %s, erwartet: %s</translation>
     </message>
     <message>
         <source>The wallet will avoid paying less than the minimum relay fee.</source>
-        <translation type="unfinished">Das Wallet vermeidet es, weniger als die Mindesttransaktionsgebühr zu zahlen.</translation>
+        <translation type="unfinished">Das Wallet verhindert Zahlungen, die die Mindesttransaktionsgebühr nicht berücksichtigen.</translation>
     </message>
     <message>
         <source>There is no ScriptPubKeyManager for this address</source>
@@ -4706,10 +4860,6 @@ Berechnet: %s, erwartet: %s</translation>
         <source>This is the minimum transaction fee you pay on every transaction.</source>
         <translation type="unfinished">Dies ist die kleinstmögliche Gebühr, die beim Senden einer Transaktion fällig wird.</translation>
     </message>
-    <message>
-        <source>This is the transaction fee you will pay if you send a transaction.</source>
-        <translation type="unfinished">Dies ist die Gebühr, die beim Senden einer Transaktion fällig wird.</translation>
-    </message>
     <message>
         <source>Transaction %s does not belong to this wallet</source>
         <translation type="unfinished">Transaktion %s gehört nicht zu dieser Wallet</translation>
@@ -4798,6 +4948,10 @@ Berechnet: %s, erwartet: %s</translation>
         <source>Wallet file creation failed: %s</source>
         <translation type="unfinished">Wallet Datei konnte nicht angelegt werden: %s</translation>
     </message>
+    <message>
+        <source>Warning: Found invalid chain more than 6 blocks longer than our best chain. This could be due to database corruption or consensus incompatibility with peers.</source>
+        <translation type="unfinished">Warnung: Wir haben festgestellt, dass die ungültige Kette mehr als 6 Blöcke länger ist als unsere beste Kette. Dies könnte auf Datenbankkorruption oder Konsensinkompatibilität mit Peers zurückzuführen sein.</translation>
+    </message>
     <message>
         <source>acceptstalefeeestimates is not supported on %s chain.</source>
         <translation type="unfinished">acceptstalefeeestimates wird auf der %s Chain nicht unterstützt.</translation>
@@ -4808,7 +4962,7 @@ Berechnet: %s, erwartet: %s</translation>
     </message>
     <message>
         <source>Error loading %s: Wallet is a legacy wallet. Please migrate to a descriptor wallet using the migration tool (migratewallet RPC).</source>
-        <translation type="unfinished">Fehler beim Laden %s: Wallet ist eine Legacy-Wallet. Bitte mit dem Migrationstool (migratewallet RPC) migrieren zu einer Deskriptor-Wallet.</translation>
+        <translation type="unfinished">Fehler beim Laden von %s: Die Wallet ist eine Legacy-Wallet. Bitte mit dem Migrationstool (migratewallet RPC) zu einer Deskriptor-Wallet migrieren.</translation>
     </message>
     <message>
         <source>Error: Dumpfile specifies an unsupported database format (%s). Only sqlite database dumps are supported</source>
@@ -4820,7 +4974,7 @@ Berechnet: %s, erwartet: %s</translation>
     </message>
     <message>
         <source>Transaction requires one destination of non-zero value, a non-zero feerate, or a pre-selected input</source>
-        <translation type="unfinished">Die Transaktion erfordert ein Ziel mit einem Wert ungleich Null, einen Gebührensatz ungleich Null oder eine vorausgewähltes Input.</translation>
+        <translation type="unfinished">Die Transaktion erfordert ein Ziel mit einem Wert ungleich Null, einen Gebührensatz ungleich Null oder einen vorausgewählten Input.</translation>
     </message>
     <message>
         <source>Unrecognized descriptor found. Loading wallet %s
@@ -4830,8 +4984,8 @@ Please try running the latest software version.
 </source>
         <translation type="unfinished">Nicht erkannter Deskriptor gefunden. Wallet %s wird geladen.
 
-Die Wallet wurde möglicherweise in einer neueren Version erstellt.
-Bitte mit der neueste Softwareversion auszuführen.
+Die Wallet wurde möglicherweise mit einer neueren Version erstellt.
+Bitte mit der neuesten Softwareversion ausführen.
 </translation>
     </message>
     <message>
@@ -4860,7 +5014,7 @@ Bitte mit der neueste Softwareversion auszuführen.
     </message>
     <message>
         <source>Invalid -proxy address or hostname, ends with '=': '%s'</source>
-        <translation type="unfinished">Ungültige -proxy Adresse oder Hostname, endet mit '=': '%s'</translation>
+        <translation type="unfinished">Ungültige -proxy Adresse oder ungültiger Hostname, endet mit '=': '%s'</translation>
     </message>
     <message>
         <source>Not enough file descriptors available. %d available, %d required.</source>
diff --git a/src/qt/locale/bitcoin_el.ts b/src/qt/locale/bitcoin_el.ts
index 3bd861c50165..3a216b2ccd6d 100644
--- a/src/qt/locale/bitcoin_el.ts
+++ b/src/qt/locale/bitcoin_el.ts
@@ -318,53 +318,6 @@ Signing is only possible with addresses of the type 'legacy'.</source>
         <source>Custom…</source>
         <translation type="unfinished">Προσαρμογή…</translation>
     </message>
-    <message>
-        <source>Amount</source>
-        <translation type="unfinished">Ποσό</translation>
-    </message>
-    <message>
-        <source>Enter a Bitcoin address (e.g. %1)</source>
-        <translation type="unfinished">Εισάγετε μια διεύθυνση Bitcoin (π.χ. %1)</translation>
-    </message>
-    <message>
-        <source>Unroutable</source>
-        <translation type="unfinished">Αδρομολόγητο</translation>
-    </message>
-    <message>
-        <source>Inbound</source>
-        <extracomment>An inbound connection from a peer. An inbound connection is a connection initiated by a peer.</extracomment>
-        <translation type="unfinished">Εισερχόμενη</translation>
-    </message>
-    <message>
-        <source>Outbound</source>
-        <extracomment>An outbound connection to a peer. An outbound connection is a connection initiated by us.</extracomment>
-        <translation type="unfinished">Εξερχόμενη</translation>
-    </message>
-    <message>
-        <source>Full Relay</source>
-        <extracomment>Peer connection type that relays all network information.</extracomment>
-        <translation type="unfinished">Πλήρης αναμεταδότης</translation>
-    </message>
-    <message>
-        <source>Block Relay</source>
-        <extracomment>Peer connection type that relays network information about blocks and not transactions or addresses.</extracomment>
-        <translation type="unfinished">Αναμεταδότης Block</translation>
-    </message>
-    <message>
-        <source>Manual</source>
-        <extracomment>Peer connection type established manually through one of several methods.</extracomment>
-        <translation type="unfinished">Χειροκίνητη</translation>
-    </message>
-    <message>
-        <source>Feeler</source>
-        <extracomment>Short-lived peer connection type that tests the aliveness of known addresses.</extracomment>
-        <translation type="unfinished">Feeler (εξερχόμενη σύνδεση βραχείας διάρκειας)</translation>
-    </message>
-    <message>
-        <source>Address Fetch</source>
-        <extracomment>Short-lived peer connection type that solicits known addresses from a peer.</extracomment>
-        <translation type="unfinished">Λήψη Διεύθυνσης</translation>
-    </message>
     <message>
         <source>%1 d</source>
         <translation type="unfinished">%1 ημ.</translation>
@@ -617,11 +570,11 @@ Signing is only possible with addresses of the type 'legacy'.</source>
     </message>
     <message>
         <source>Connecting to peers…</source>
-        <translation type="unfinished">Σύνδεση σε κόμβους...</translation>
+        <translation type="unfinished">Σύνδεση στους χρήστες...</translation>
     </message>
     <message>
         <source>Request payments (generates QR codes and bitcoin: URIs)</source>
-        <translation type="unfinished">Αίτηση πληρωμών (δημιουργεί QR codes και bitcoin: URI)</translation>
+        <translation type="unfinished">Αίτηση πληρωμών (δημιουργεί QR codes και διευθύνσεις bitcoin: )</translation>
     </message>
     <message>
         <source>Show the list of used sending addresses and labels</source>
@@ -629,7 +582,7 @@ Signing is only possible with addresses of the type 'legacy'.</source>
     </message>
     <message>
         <source>Show the list of used receiving addresses and labels</source>
-        <translation type="unfinished">Προβολή της λίστας των χρησιμοποιημένων διευθύνσεων λήψης και ετικετών</translation>
+        <translation type="unfinished">Προβολή της λίστας των χρησιμοποιημένων διευθύνσεων και ετικετών λήψεως</translation>
     </message>
     <message>
         <source>&amp;Command-line options</source>
@@ -648,15 +601,15 @@ Signing is only possible with addresses of the type 'legacy'.</source>
     </message>
     <message>
         <source>Catching up…</source>
-        <translation type="unfinished">Συγχρονισμός…</translation>
+        <translation type="unfinished">Φτάνει...</translation>
     </message>
     <message>
         <source>Last received block was generated %1 ago.</source>
-        <translation type="unfinished">Το τελευταίο block που ελήφθη δημιουργήθηκε πριν από %1.</translation>
+        <translation type="unfinished">Το τελευταίο μπλοκ που ελήφθη δημιουργήθηκε %1 πριν.</translation>
     </message>
     <message>
         <source>Transactions after this will not yet be visible.</source>
-        <translation type="unfinished">Οι συναλλαγές μετά από αυτό δεν θα είναι ορατές ακόμα.</translation>
+        <translation type="unfinished">Οι συναλλαγές μετά από αυτό δεν θα είναι ακόμη ορατές.</translation>
     </message>
     <message>
         <source>Error</source>
@@ -676,7 +629,7 @@ Signing is only possible with addresses of the type 'legacy'.</source>
     </message>
     <message>
         <source>Load Partially Signed Bitcoin Transaction</source>
-        <translation type="unfinished">Φόρτωση μερικώς υπογεγραμμένης συναλλαγής Bitcoin</translation>
+        <translation type="unfinished">Φόρτωση συναλλαγής Partially Signed Bitcoin</translation>
     </message>
     <message>
         <source>Load PSBT from &amp;clipboard…</source>
@@ -686,10 +639,6 @@ Signing is only possible with addresses of the type 'legacy'.</source>
         <source>Load Partially Signed Bitcoin Transaction from clipboard</source>
         <translation type="unfinished">Φόρτωση μερικώς υπογεγραμμένης συναλλαγής Bitcoin από το πρόχειρο</translation>
     </message>
-    <message>
-        <source>Node window</source>
-        <translation type="unfinished">Παράθυρο κόμβου</translation>
-    </message>
     <message>
         <source>Open node debugging and diagnostic console</source>
         <translation type="unfinished">Ανοίξτε την κονσόλα αποσφαλμάτωσης και διαγνωστικών του κόμβου</translation>
@@ -754,7 +703,7 @@ Signing is only possible with addresses of the type 'legacy'.</source>
     </message>
     <message>
         <source>No wallets available</source>
-        <translation type="unfinished">Κανένα διαθέσιμο πορτοφόλι</translation>
+        <translation type="unfinished">Κανένα πορτοφόλι διαθέσιμο</translation>
     </message>
     <message>
         <source>Wallet Data</source>
@@ -928,7 +877,7 @@ Signing is only possible with addresses of the type 'legacy'.</source>
     </message>
     <message>
         <source>Fee:</source>
-        <translation type="unfinished">Τέλος συναλλαγής:</translation>
+        <translation type="unfinished">Τέλη συναλλαγής:</translation>
     </message>
     <message>
         <source>After Fee:</source>
@@ -962,10 +911,6 @@ Signing is only possible with addresses of the type 'legacy'.</source>
         <source>Received with address</source>
         <translation type="unfinished">Ελήφθη στη διεύθυνση</translation>
     </message>
-    <message>
-        <source>Date</source>
-        <translation type="unfinished">Ημερομηνία</translation>
-    </message>
     <message>
         <source>Confirmations</source>
         <translation type="unfinished">Επικυρώσεις</translation>
@@ -984,7 +929,7 @@ Signing is only possible with addresses of the type 'legacy'.</source>
     </message>
     <message>
         <source>Copy &amp;label</source>
-        <translation type="unfinished">Αντιγραφή &amp;ετικέτας</translation>
+        <translation type="unfinished">Αντιγραφή &amp;ετικέτα</translation>
     </message>
     <message>
         <source>Copy &amp;amount</source>
@@ -992,15 +937,15 @@ Signing is only possible with addresses of the type 'legacy'.</source>
     </message>
     <message>
         <source>Copy transaction &amp;ID and output index</source>
-        <translation type="unfinished">Αντιγραφή &amp;ID συναλλαγής και δείκτη output</translation>
+        <translation type="unfinished">Αντιγραφή συναλλαγής &amp;ID και αποτελέσματος δείκτη</translation>
     </message>
     <message>
         <source>L&amp;ock unspent</source>
-        <translation type="unfinished">&amp;Κλείδωσε μη ξοδευμένα outputs</translation>
+        <translation type="unfinished">L&amp;ock διαθέσιμο</translation>
     </message>
     <message>
         <source>&amp;Unlock unspent</source>
-        <translation type="unfinished">&amp;Ξεκλείδωσε μη ξοδευμένα</translation>
+        <translation type="unfinished">&amp;Ξεκλείδωμα διαθέσιμου υπολοίπου</translation>
     </message>
     <message>
         <source>Copy quantity</source>
@@ -1159,16 +1104,6 @@ The migration process will create a backup of the wallet before migrating. This
 </context>
 <context>
     <name>RestoreWalletActivity</name>
-    <message>
-        <source>Restore Wallet</source>
-        <extracomment>Title of progress window which is displayed when wallets are being restored.</extracomment>
-        <translation type="unfinished">Επαναφορά Πορτοφολιού</translation>
-    </message>
-    <message>
-        <source>Restoring Wallet &lt;b&gt;%1&lt;/b&gt;…</source>
-        <extracomment>Descriptive text of the restore wallets progress window which indicates to the user that wallets are currently being restored.</extracomment>
-        <translation type="unfinished">Επαναφορά Πορτοφολιού &lt;b&gt; %1 &lt;/b&gt;</translation>
-    </message>
     <message>
         <source>Restore wallet failed</source>
         <extracomment>Title of message box which is displayed when the wallet could not be restored.</extracomment>
@@ -1250,10 +1185,6 @@ The migration process will create a backup of the wallet before migrating. This
         <source>Disable Private Keys</source>
         <translation type="unfinished">Απενεργοποίηση ιδιωτικών κλειδιών</translation>
     </message>
-    <message>
-        <source>Make a blank wallet. Blank wallets do not initially have private keys or scripts. Private keys and addresses can be imported, or an HD seed can be set, at a later time.</source>
-        <translation type="unfinished">Κάντε ένα κενό πορτοφόλι. Τα κενά πορτοφόλια δεν έχουν αρχικά ιδιωτικά κλειδιά ή scripts. Τα ιδιωτικά κλειδιά και οι διευθύνσεις μπορούν να εισαχθούν ή μπορεί να οριστεί ένας σπόρος HD αργότερα.</translation>
-    </message>
     <message>
         <source>Make Blank Wallet</source>
         <translation type="unfinished">Δημιουργία Άδειου Πορτοφολιού</translation>
@@ -1273,7 +1204,7 @@ The migration process will create a backup of the wallet before migrating. This
     <message>
         <source>Compiled without external signing support (required for external signing)</source>
         <extracomment>"External signing" means using devices such as hardware wallets.</extracomment>
-        <translation type="unfinished">Συντάχθηκε χωρίς την υποστήριξη εξωτερικού υπογραφέα (απαιτείται για εξωτερική υπογραφή)</translation>
+        <translation type="unfinished">Συντάχθηκε χωρίς την υποστήριξη εξωτερικής υπογραφής (απαιτείται για εξωτερική υπογραφή)</translation>
     </message>
 </context>
 <context>
@@ -1284,7 +1215,7 @@ The migration process will create a backup of the wallet before migrating. This
     </message>
     <message>
         <source>&amp;Label</source>
-        <translation type="unfinished">&amp;Ετικέτα</translation>
+        <translation type="unfinished">&amp;Επιγραφή</translation>
     </message>
     <message>
         <source>The label associated with this address list entry</source>
@@ -1304,7 +1235,7 @@ The migration process will create a backup of the wallet before migrating. This
     </message>
     <message>
         <source>Edit receiving address</source>
-        <translation type="unfinished">Επεξεργασία διεύθυνσης λήψης</translation>
+        <translation type="unfinished">Διόρθωση Διεύθυνσης Λήψης</translation>
     </message>
     <message>
         <source>Edit sending address</source>
@@ -1316,7 +1247,7 @@ The migration process will create a backup of the wallet before migrating. This
     </message>
     <message>
         <source>Address "%1" already exists as a receiving address with label "%2" and so cannot be added as a sending address.</source>
-        <translation type="unfinished">Η διεύθυνση "%1" υπάρχει ήδη ως διεύθυνση λήψης με ετικέτα "%2" και επομένως δεν μπορεί να προστεθεί ως διεύθυνση αποστολής.</translation>
+        <translation type="unfinished">Η διεύθυνση "%1"  υπάρχει ήδη ως διεύθυνσης λήψης με ετικέτα "%2" και γιαυτό τον λόγο δεν μπορεί να προστεθεί ως διεύθυνση αποστολής.</translation>
     </message>
     <message>
         <source>The entered address "%1" is already in the address book with label "%2".</source>
@@ -1820,7 +1751,7 @@ The migration process will create a backup of the wallet before migrating. This
     <message>
         <source>Compiled without external signing support (required for external signing)</source>
         <extracomment>"External signing" means using devices such as hardware wallets.</extracomment>
-        <translation type="unfinished">Συντάχθηκε χωρίς την υποστήριξη εξωτερικού υπογραφέα (απαιτείται για εξωτερική υπογραφή)</translation>
+        <translation type="unfinished">Συντάχθηκε χωρίς την υποστήριξη εξωτερικής υπογραφής (απαιτείται για εξωτερική υπογραφή)</translation>
     </message>
     <message>
         <source>default</source>
@@ -1942,240 +1873,24 @@ The migration process will create a backup of the wallet before migrating. This
         <source>Recent transactions</source>
         <translation type="unfinished">Πρόσφατες συναλλαγές</translation>
     </message>
-    <message>
-        <source>Privacy mode activated for the Overview tab. To unmask the values, uncheck Settings-&gt;Mask values.</source>
-        <translation type="unfinished">Ενεργοποιήθηκε η κατάσταση ιδιωτικότητας στην καρτέλα Επισκόπησης. Για εμφάνιση των τιμών αποεπιλέξτε το Ρυθμίσεις-&gt;Απόκρυψη τιμών.</translation>
-    </message>
-</context>
+    </context>
 <context>
     <name>PSBTOperationsDialog</name>
-    <message>
-        <source>PSBT Operations</source>
-        <translation type="unfinished">Λειτουργίες PSBT</translation>
-    </message>
-    <message>
-        <source>Sign Tx</source>
-        <translation type="unfinished">Υπόγραψε Tx</translation>
-    </message>
-    <message>
-        <source>Broadcast Tx</source>
-        <translation type="unfinished">Μετάδοση Tx</translation>
-    </message>
-    <message>
-        <source>Copy to Clipboard</source>
-        <translation type="unfinished">Αντιγραφή στο Πρόχειρο</translation>
-    </message>
-    <message>
-        <source>Save…</source>
-        <translation type="unfinished">Αποθήκευση...</translation>
-    </message>
-    <message>
-        <source>Close</source>
-        <translation type="unfinished">Κλείσιμο</translation>
-    </message>
-    <message>
-        <source>Failed to load transaction: %1</source>
-        <translation type="unfinished">Αποτυχία φόρτωσης συναλλαγής: %1</translation>
-    </message>
-    <message>
-        <source>Failed to sign transaction: %1</source>
-        <translation type="unfinished">Αποτυχία υπογραφής συναλλαγής: %1</translation>
-    </message>
-    <message>
-        <source>Cannot sign inputs while wallet is locked.</source>
-        <translation type="unfinished">Αδύνατη η υπογραφή εισδοχών ενώ το πορτοφόλι είναι κλειδωμένο</translation>
-    </message>
-    <message>
-        <source>Could not sign any more inputs.</source>
-        <translation type="unfinished">Δεν είναι δυνατή η υπογραφή περισσότερων καταχωρήσεων.</translation>
-    </message>
-    <message>
-        <source>Signed %1 inputs, but more signatures are still required.</source>
-        <translation type="unfinished">Υπεγράφησαν %1 inputs, αλλά χρειάζονται ακόμα περισσότερες υπογραφές.</translation>
-    </message>
-    <message>
-        <source>Signed transaction successfully. Transaction is ready to broadcast.</source>
-        <translation type="unfinished">Η συναλλαγή υπογράφηκε με επιτυχία. Η συναλλαγή είναι έτοιμη για μετάδοση.</translation>
-    </message>
-    <message>
-        <source>Unknown error processing transaction.</source>
-        <translation type="unfinished">Άγνωστο λάθος στην επεξεργασία συναλλαγής.</translation>
-    </message>
-    <message>
-        <source>Transaction broadcast successfully! Transaction ID: %1</source>
-        <translation type="unfinished">Επιτυχής αναμετάδοση της συναλλαγής! ID Συναλλαγής: %1</translation>
-    </message>
-    <message>
-        <source>Transaction broadcast failed: %1</source>
-        <translation type="unfinished">Η αναμετάδοση της συναλλαγής απέτυχε: %1</translation>
-    </message>
-    <message>
-        <source>PSBT copied to clipboard.</source>
-        <translation type="unfinished">PSBT αντιγράφηκε στο πρόχειρο.</translation>
-    </message>
-    <message>
-        <source>Save Transaction Data</source>
-        <translation type="unfinished">Αποθήκευση Δεδομένων Συναλλαγής</translation>
-    </message>
-    <message>
-        <source>Partially Signed Transaction (Binary)</source>
-        <extracomment>Expanded name of the binary PSBT file format. See: BIP 174.</extracomment>
-        <translation type="unfinished">Μερικώς Υπογεγραμμένη Συναλλαγή (binary)</translation>
-    </message>
-    <message>
-        <source>PSBT saved to disk.</source>
-        <translation type="unfinished">PSBT αποθηκεύτηκε στο δίσκο.</translation>
-    </message>
-    <message>
-        <source>Sends %1 to %2</source>
-        <translation type="unfinished">Αποστέλλει %1 στο %2</translation>
-    </message>
-    <message>
-        <source>own address</source>
-        <translation type="unfinished">δική σας διεύθυνση</translation>
-    </message>
-    <message>
-        <source>Unable to calculate transaction fee or total transaction amount.</source>
-        <translation type="unfinished">Δεν είναι δυνατός ο υπολογισμός των τελών ή του συνολικού ποσού συναλλαγής.</translation>
-    </message>
-    <message>
-        <source>Pays transaction fee: </source>
-        <translation type="unfinished">Πληρωμή τέλους συναλλαγής:</translation>
-    </message>
-    <message>
-        <source>Total Amount</source>
-        <translation type="unfinished">Συνολικό ποσό</translation>
-    </message>
-    <message>
-        <source>or</source>
-        <translation type="unfinished">ή</translation>
-    </message>
-    <message>
-        <source>Transaction has %1 unsigned inputs.</source>
-        <translation type="unfinished">Η συναλλαγή έχει %1 μη υπογεγραμμένα inputs.</translation>
-    </message>
-    <message>
-        <source>Transaction is missing some information about inputs.</source>
-        <translation type="unfinished">Λείπουν μερικές πληροφορίες από την συναλλαγή για τα inputs.</translation>
-    </message>
-    <message>
-        <source>Transaction still needs signature(s).</source>
-        <translation type="unfinished">Η συναλλαγή απαιτεί ακόμα υπογραφή(ες).</translation>
-    </message>
-    <message>
-        <source>(But no wallet is loaded.)</source>
-        <translation type="unfinished">(Δεν υπάρχει φορτωμένο πορτοφόλι)</translation>
-    </message>
-    <message>
-        <source>(But this wallet cannot sign transactions.)</source>
-        <translation type="unfinished">(Αλλά αυτό το πορτοφόλι δεν μπορεί να υπογράψει συναλλαγές.)</translation>
-    </message>
-    <message>
-        <source>(But this wallet does not have the right keys.)</source>
-        <translation type="unfinished">(Αλλά αυτό το πορτοφόλι δεν έχει τα σωστά κλειδιά.)</translation>
-    </message>
-    <message>
-        <source>Transaction is fully signed and ready for broadcast.</source>
-        <translation type="unfinished">Η συναλλαγή είναι πλήρως υπογεγραμμένη και έτοιμη για μετάδοση.</translation>
-    </message>
-    <message>
-        <source>Transaction status is unknown.</source>
-        <translation type="unfinished">Η κατάσταση της συναλλαγής είναι άγνωστη.</translation>
-    </message>
-</context>
-<context>
-    <name>PaymentServer</name>
-    <message>
-        <source>Payment request error</source>
-        <translation type="unfinished">Σφάλμα αίτησης πληρωμής</translation>
-    </message>
-    <message>
-        <source>Cannot start bitcoin: click-to-pay handler</source>
-        <translation type="unfinished">Δεν είναι δυνατή η εκκίνηση του bitcoin: χειριστής click-to-pay</translation>
-    </message>
-    <message>
-        <source>URI handling</source>
-        <translation type="unfinished">χειρισμός URI</translation>
-    </message>
-    <message>
-        <source>'bitcoin://' is not a valid URI. Use 'bitcoin:' instead.</source>
-        <translation type="unfinished">Το 'bitcoin://' δεν είναι έγκυρο URI. Αντ' αυτού χρησιμοποιήστε το 'bitcoin:'.</translation>
-    </message>
-    <message>
-        <source>Cannot process payment request because BIP70 is not supported.
-Due to widespread security flaws in BIP70 it's strongly recommended that any merchant instructions to switch wallets be ignored.
-If you are receiving this error you should request the merchant provide a BIP21 compatible URI.</source>
-        <translation type="unfinished">Αδυναμία επεξεργασίας αιτήματος πληρωμής επειδή το BIP70 δεν υποστηρίζεται.
-Λόγω των εκτεταμένων ελαττωμάτων ασφαλείας στο BIP70, συνιστάται να αγνοούνται τυχόν οδηγίες του εμπόρου για αλλαγή πορτοφολιού.
-Εάν λαμβάνετε αυτό το σφάλμα, θα πρέπει να ζητήσετε από τον έμπορο να παρέχει ένα URI συμβατό με το BIP21.</translation>
-    </message>
-    <message>
-        <source>URI cannot be parsed! This can be caused by an invalid Bitcoin address or malformed URI parameters.</source>
-        <translation type="unfinished">Δεν είναι δυνατή η ανάλυση του URI! Αυτό μπορεί να προκληθεί από μη έγκυρη διεύθυνση Bitcoin ή παραμορφωμένες παραμέτρους URI.</translation>
-    </message>
-    <message>
-        <source>Payment request file handling</source>
-        <translation type="unfinished">Διαχείριση αρχείου αιτήματος πληρωμής</translation>
-    </message>
-</context>
-<context>
-    <name>PeerTableModel</name>
-    <message>
-        <source>Ping</source>
-        <extracomment>Title of Peers Table column which indicates the current latency of the connection with the peer.</extracomment>
-        <translation type="unfinished">Χρόνος απόκρισης</translation>
-    </message>
-    <message>
-        <source>Peer</source>
-        <extracomment>Title of Peers Table column which contains a unique number used to identify a connection.</extracomment>
-        <translation type="unfinished">Κόμβος</translation>
-    </message>
-    <message>
-        <source>Age</source>
-        <extracomment>Title of Peers Table column which indicates the duration (length of time) since the peer connection started.</extracomment>
-        <translation type="unfinished">Ηλικία</translation>
-    </message>
-    <message>
-        <source>Direction</source>
-        <extracomment>Title of Peers Table column which indicates the direction the peer connection was initiated from.</extracomment>
-        <translation type="unfinished">Κατεύθυνση</translation>
-    </message>
-    <message>
-        <source>Sent</source>
-        <extracomment>Title of Peers Table column which indicates the total amount of network information we have sent to the peer.</extracomment>
-        <translation type="unfinished">Απεστάλησαν</translation>
-    </message>
-    <message>
-        <source>Received</source>
-        <extracomment>Title of Peers Table column which indicates the total amount of network information we have received from the peer.</extracomment>
-        <translation type="unfinished">Παρελήφθησαν</translation>
-    </message>
-    <message>
-        <source>Address</source>
-        <extracomment>Title of Peers Table column which contains the IP/Onion/I2P address of the connected peer.</extracomment>
-        <translation type="unfinished">Διεύθυνση</translation>
-    </message>
-    <message>
-        <source>Type</source>
-        <extracomment>Title of Peers Table column which describes the type of peer connection. The "type" describes why the connection exists.</extracomment>
-        <translation type="unfinished">Τύπος</translation>
-    </message>
-    <message>
-        <source>Network</source>
-        <extracomment>Title of Peers Table column which states the network the peer connected through.</extracomment>
-        <translation type="unfinished">Δίκτυο</translation>
-    </message>
-    <message>
-        <source>Inbound</source>
-        <extracomment>An Inbound Connection from a Peer.</extracomment>
-        <translation type="unfinished">Εισερχόμενη</translation>
+    <message numerus="yes">
+        <source>Signed %n input(s), but more signatures are still required.</source>
+        <translation type="unfinished">
+            <numerusform />
+            <numerusform />
+        </translation>
     </message>
-    <message>
-        <source>Outbound</source>
-        <extracomment>An Outbound Connection to a Peer.</extracomment>
-        <translation type="unfinished">Εξερχόμενη</translation>
+    <message numerus="yes">
+        <source>Transaction has %n unsigned input(s).</source>
+        <translation type="unfinished">
+            <numerusform />
+            <numerusform />
+        </translation>
     </message>
-</context>
+    </context>
 <context>
     <name>QRImageWidget</name>
     <message>
@@ -2184,7 +1899,7 @@ If you are receiving this error you should request the merchant provide a BIP21
     </message>
     <message>
         <source>&amp;Copy Image</source>
-        <translation type="unfinished">Αντι&amp;γραφή εικόνας</translation>
+        <translation type="unfinished">&amp;Αντιγραφή εικόνας</translation>
     </message>
     <message>
         <source>Resulting URI too long, try to reduce the text for label / message.</source>
@@ -2216,11 +1931,11 @@ If you are receiving this error you should request the merchant provide a BIP21
     </message>
     <message>
         <source>Client version</source>
-        <translation type="unfinished">Έκδοση προγράμματος</translation>
+        <translation type="unfinished">Έκδοση Πελάτη</translation>
     </message>
     <message>
         <source>&amp;Information</source>
-        <translation type="unfinished">&amp;Πληροφορίες</translation>
+        <translation type="unfinished">&amp;Πληροφορία</translation>
     </message>
     <message>
         <source>General</source>
@@ -2228,19 +1943,19 @@ If you are receiving this error you should request the merchant provide a BIP21
     </message>
     <message>
         <source>Datadir</source>
-        <translation type="unfinished">Φάκελος δεδομένων</translation>
+        <translation type="unfinished">Κατάλογος Δεδομένων</translation>
     </message>
     <message>
         <source>To specify a non-default location of the data directory use the '%1' option.</source>
-        <translation type="unfinished">Για να καθορίσετε μια ξεχωριστή θέση του φακέλου δεδομένων χρησιμοποιήστε την επιλογή '%1'.</translation>
+        <translation type="unfinished">Για να καθορίσετε μια μη προεπιλεγμένη θέση του καταλόγου δεδομένων, χρησιμοποιήστε την επιλογή '%1'.</translation>
     </message>
     <message>
         <source>Blocksdir</source>
-        <translation type="unfinished">Φάκελος των blocks</translation>
+        <translation type="unfinished">Κατάλογος των Μπλοκς</translation>
     </message>
     <message>
         <source>To specify a non-default location of the blocks directory use the '%1' option.</source>
-        <translation type="unfinished">Για να καθορίσετε μια ξεχωριστή θέση του φακέλου των blocks, χρησιμοποιήστε την επιλογή '%1'.</translation>
+        <translation type="unfinished">Για να καθορίσετε μια μη προεπιλεγμένη θέση του καταλόγου μπλοκ, χρησιμοποιήστε την επιλογή '%1'.</translation>
     </message>
     <message>
         <source>Startup time</source>
@@ -2300,7 +2015,7 @@ If you are receiving this error you should request the merchant provide a BIP21
     </message>
     <message>
         <source>Sent</source>
-        <translation type="unfinished">Απεστάλη</translation>
+        <translation type="unfinished">Απεστάλησαν</translation>
     </message>
     <message>
         <source>&amp;Peers</source>
@@ -2343,360 +2058,147 @@ If you are receiving this error you should request the merchant provide a BIP21
         <translation type="unfinished">Αναμετάδοση Συναλλαγής</translation>
     </message>
     <message>
-        <source>Starting Block</source>
-        <translation type="unfinished">Αρχικό Block</translation>
+        <source>The BIP324 session ID string in hex.</source>
+        <translation type="unfinished">Η συμβολοσειρά αναγνωριστικού περιόδου σύνδεσης BIP324 σε δεκαεξαδική μορφή.</translation>
     </message>
     <message>
-        <source>Synced Headers</source>
-        <translation type="unfinished">Συγχρονισμένες Κεφαλίδες</translation>
+        <source>detecting: peer could be v1 or v2</source>
+        <extracomment>Explanatory text for "detecting" transport type.</extracomment>
+        <translation type="unfinished">ανίχνευση: ο κόμβος μπορεί να είναι v1 ή v2</translation>
     </message>
     <message>
-        <source>Synced Blocks</source>
-        <translation type="unfinished">Συγχρονισμένα Blocks</translation>
+        <source>v1: unencrypted, plaintext transport protocol</source>
+        <extracomment>Explanatory text for v1 transport type.</extracomment>
+        <translation type="unfinished">v1: μη κρυπτογραφημένο, πρωτόκολλο μεταφοράς απλού κειμένου</translation>
     </message>
     <message>
-        <source>Last Transaction</source>
-        <translation type="unfinished">Τελευταία Συναλλαγή</translation>
+        <source>v2: BIP324 encrypted transport protocol</source>
+        <extracomment>Explanatory text for v2 transport type.</extracomment>
+        <translation type="unfinished">v2: BIP324 κρυπτογραφημένο πρωτόκολλο μεταφοράς</translation>
     </message>
     <message>
-        <source>The mapped Autonomous System used for diversifying peer selection.</source>
-        <translation type="unfinished">Το αντιστοιχισμένο Αυτόνομο Σύστημα (AS) που χρησιμοποιείται για τη διαφοροποίηση της επιλογής peer.</translation>
+        <source>we selected the peer for high bandwidth relay</source>
+        <translation type="unfinished">επιλέξαμε τον κόμβο για υψηλή ταχύτητα αναμετάδοσης</translation>
     </message>
     <message>
-        <source>Mapped AS</source>
-        <translation type="unfinished">Αντιστοιχισμένο AS</translation>
+        <source>the peer selected us for high bandwidth relay</source>
+        <translation type="unfinished">ο κόμβος μας επέλεξε για υψηλής ταχύτητας αναμετάδοση </translation>
     </message>
     <message>
-        <source>Whether we relay addresses to this peer.</source>
-        <extracomment>Tooltip text for the Address Relay field in the peer details area, which displays whether we relay addresses to this peer (Yes/No).</extracomment>
-        <translation type="unfinished">Αν αναμεταδίδουμε διευθύνσεις σε αυτόν τον κόμβο.</translation>
+        <source>no high bandwidth relay selected</source>
+        <translation type="unfinished">δεν επιλέχθηκε υψηλού εύρους ζώνη αναμετάδοσης</translation>
     </message>
     <message>
-        <source>Address Relay</source>
-        <extracomment>Text title for the Address Relay field in the peer details area, which displays whether we relay addresses to this peer (Yes/No).</extracomment>
-        <translation type="unfinished">Αναμετάδοση Διεύθυνσης</translation>
+        <source>&amp;Copy address</source>
+        <extracomment>Context menu action to copy the address of a peer.</extracomment>
+        <translation type="unfinished">&amp;Αντιγραφή διεύθυνσης</translation>
     </message>
     <message>
-        <source>The total number of addresses received from this peer that were processed (excludes addresses that were dropped due to rate-limiting).</source>
-        <extracomment>Tooltip text for the Addresses Processed field in the peer details area, which displays the total number of addresses received from this peer that were processed (excludes addresses that were dropped due to rate-limiting).</extracomment>
-        <translation type="unfinished">Ο συνολικός αριθμός των διευθύνσεων που ελήφθησαν από αυτόν τον κόμβο και υποβλήθηκαν σε επεξεργασία (εξαιρούνται οι διευθύνσεις που απορρίφθηκαν λόγω περιορισμού ποσοστού).</translation>
+        <source>&amp;Disconnect</source>
+        <translation type="unfinished">&amp;Αποσύνδεση</translation>
     </message>
     <message>
-        <source>The total number of addresses received from this peer that were dropped (not processed) due to rate-limiting.</source>
-        <extracomment>Tooltip text for the Addresses Rate-Limited field in the peer details area, which displays the total number of addresses received from this peer that were dropped (not processed) due to rate-limiting.</extracomment>
-        <translation type="unfinished">Ο συνολικός αριθμός των διευθύνσεων που ελήφθησαν από αυτόν τον κόμβο και απορρίφθηκαν (δεν υποβλήθηκαν σε επεξεργασία) λόγω περιορισμού ρυθμού.</translation>
+        <source>1 &amp;hour</source>
+        <translation type="unfinished">1 &amp;ώρα</translation>
     </message>
     <message>
-        <source>Addresses Processed</source>
-        <extracomment>Text title for the Addresses Processed field in the peer details area, which displays the total number of addresses received from this peer that were processed (excludes addresses that were dropped due to rate-limiting).</extracomment>
-        <translation type="unfinished">Επεξεργασμένες Διευθύνσεις</translation>
+        <source>1 d&amp;ay</source>
+        <translation type="unfinished">1 η&amp;μέρα</translation>
     </message>
     <message>
-        <source>Addresses Rate-Limited</source>
-        <extracomment>Text title for the Addresses Rate-Limited field in the peer details area, which displays the total number of addresses received from this peer that were dropped (not processed) due to rate-limiting.</extracomment>
-        <translation type="unfinished">Διευθύνσεις με Περιορισμό-Ρυθμού</translation>
+        <source>1 &amp;week</source>
+        <translation type="unfinished">1 &amp;εβδομάδα</translation>
     </message>
     <message>
-        <source>Node window</source>
-        <translation type="unfinished">Παράθυρο κόμβου</translation>
+        <source>1 &amp;year</source>
+        <translation type="unfinished">1 &amp;χρόνος</translation>
     </message>
     <message>
-        <source>Current block height</source>
-        <translation type="unfinished">Τρέχων ύψος block</translation>
+        <source>&amp;Copy IP/Netmask</source>
+        <extracomment>Context menu action to copy the IP/Netmask of a banned peer. IP/Netmask is the combination of a peer's IP address and its Netmask. For IP address, see: https://en.wikipedia.org/wiki/IP_address.</extracomment>
+        <translation type="unfinished">&amp;Αντιγραφή IP/Netmask</translation>
     </message>
     <message>
-        <source>Open the %1 debug log file from the current data directory. This can take a few seconds for large log files.</source>
-        <translation type="unfinished">Ανοίξτε το αρχείο καταγραφής εντοπισμού σφαλμάτων %1 από τον τρέχοντα φάκελο δεδομένων. Αυτό μπορεί να διαρκέσει μερικά δευτερόλεπτα για τα μεγάλα αρχεία καταγραφής.</translation>
+        <source>&amp;Unban</source>
+        <translation type="unfinished">&amp;Ακύρωση Απαγόρευσης</translation>
     </message>
     <message>
-        <source>Decrease font size</source>
-        <translation type="unfinished">Μείωση μεγέθους γραμματοσειράς</translation>
+        <source>Network activity disabled</source>
+        <translation type="unfinished">Η δραστηριότητα δικτύου είναι απενεργοποιημένη</translation>
     </message>
     <message>
-        <source>Increase font size</source>
-        <translation type="unfinished">Αύξηση μεγέθους γραμματοσειράς</translation>
+        <source>None</source>
+        <translation type="unfinished">Κανένα</translation>
     </message>
     <message>
-        <source>Permissions</source>
-        <translation type="unfinished">Δικαιώματα</translation>
+        <source>Executing command without any wallet</source>
+        <translation type="unfinished">Εκτέλεση εντολής χωρίς πορτοφόλι</translation>
     </message>
     <message>
-        <source>The direction and type of peer connection: %1</source>
-        <translation type="unfinished">Η κατεύθυνση και ο τύπος της σύνδεσης κόμβου: %1</translation>
+        <source>Node window - [%1]</source>
+        <translation type="unfinished">Παράθυρο κόμβου - [%1]</translation>
     </message>
     <message>
-        <source>Direction/Type</source>
-        <translation type="unfinished">Κατεύθυνση/Τύπος</translation>
+        <source>Executing command using "%1" wallet</source>
+        <translation type="unfinished">Εκτελώντας εντολή με το πορτοφόλι "%1"</translation>
     </message>
     <message>
-        <source>The BIP324 session ID string in hex.</source>
-        <translation type="unfinished">Η συμβολοσειρά αναγνωριστικού περιόδου σύνδεσης BIP324 σε δεκαεξαδική μορφή.</translation>
+        <source>Welcome to the %1 RPC console.
+Use up and down arrows to navigate history, and %2 to clear screen.
+Use %3 and %4 to increase or decrease the font size.
+Type %5 for an overview of available commands.
+For more information on using this console, type %6.
+
+%7WARNING: 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.%8</source>
+        <extracomment>RPC console welcome message. Placeholders %7 and %8 are style tags for the warning content, and they are not space separated from the rest of the text intentionally.</extracomment>
+        <translation type="unfinished">Καλώς ήρθατε στην %1 κονσόλα RPC.
+Χρησιμοποιήστε τα πάνω και τα κάτω βέλη για πλοήγηση στο ιστορικό και %2 εκκαθάριση της οθόνης.
+Χρησιμοποιήστε %3 και %4 για να αυξήσετε ή να μειώσετε το μέγεθος της γραμματοσειράς.
+Πληκτρολογήστε %5 για επισκόπηση των διαθέσιμων εντολών.
+Για περισσότερες πληροφορίες σχετικά με τη χρήση αυτής της κονσόλας, πληκτρολογήστε %6.
+
+%7ΠΡΟΕΙΔΟΠΟΙΗΣΗ: Οι απατεώνες/scammers είναι ενεργοί, λέγοντας στους χρήστες να πληκτρολογούν εντολές εδώ, κλέβοντας το περιεχόμενο του πορτοφολιού τους. Μην χρησιμοποιείτε αυτήν την κονσόλα χωρίς να κατανοήσετε πλήρως τις συνέπειες μιας εντολής.%8</translation>
     </message>
     <message>
-        <source>The network protocol this peer is connected through: IPv4, IPv6, Onion, I2P, or CJDNS.</source>
-        <translation type="unfinished">Το πρωτόκολλο δικτύου αυτού του κόμβου συνδέεται μέσω: IPv4, IPv6, Onion, I2P ή CJDNS.</translation>
+        <source>Executing…</source>
+        <extracomment>A console message indicating an entered command is currently being executed.</extracomment>
+        <translation type="unfinished">Εκτέλεση...</translation>
     </message>
     <message>
-        <source>Services</source>
-        <translation type="unfinished">Υπηρεσίες</translation>
+        <source>(peer: %1)</source>
+        <translation type="unfinished">(κόμβος: %1)</translation>
     </message>
     <message>
-        <source>High bandwidth BIP152 compact block relay: %1</source>
-        <translation type="unfinished">Υψηλής ταχύτητας μετάδοση BIP152 συμπαγών block: %1</translation>
+        <source>via %1</source>
+        <translation type="unfinished">μέσω %1</translation>
     </message>
     <message>
-        <source>High Bandwidth</source>
-        <translation type="unfinished">Υψηλής ταχύτητας μετάδοση</translation>
+        <source>Yes</source>
+        <translation type="unfinished">Ναι</translation>
     </message>
     <message>
-        <source>Connection Time</source>
-        <translation type="unfinished">Χρόνος σύνδεσης</translation>
+        <source>No</source>
+        <translation type="unfinished">Όχι</translation>
     </message>
     <message>
-        <source>Elapsed time since a novel block passing initial validity checks was received from this peer.</source>
-        <translation type="unfinished">Ο χρόνος που έχει παρέλθει από τη λήψη ενός νέου block - που πέρασε τους αρχικούς ελέγχους εγκυρότητας - ελήφθη από αυτόν τον κόμβο.</translation>
+        <source>To</source>
+        <translation type="unfinished">Προς</translation>
     </message>
     <message>
-        <source>Last Block</source>
-        <translation type="unfinished">Τελευταίο Block</translation>
+        <source>From</source>
+        <translation type="unfinished">Από</translation>
     </message>
     <message>
-        <source>Elapsed time since a novel transaction accepted into our mempool was received from this peer.</source>
-        <extracomment>Tooltip text for the Last Transaction field in the peer details area.</extracomment>
-        <translation type="unfinished">Ο χρόνος που έχει παρέλθει από τη λήψη νέας συναλλαγής που έγινε δεκτή στο mempool από αυτόν τον κόμβο.</translation>
+        <source>Ban for</source>
+        <translation type="unfinished">Αποκλεισμός για</translation>
     </message>
     <message>
-        <source>Last Send</source>
-        <translation type="unfinished">Τελευταία αποστολή</translation>
+        <source>Never</source>
+        <translation type="unfinished">Ποτέ</translation>
     </message>
     <message>
-        <source>Last Receive</source>
-        <translation type="unfinished">Τελευταία λήψη</translation>
-    </message>
-    <message>
-        <source>Ping Time</source>
-        <translation type="unfinished">Χρόνος απόκρισης</translation>
-    </message>
-    <message>
-        <source>The duration of a currently outstanding ping.</source>
-        <translation type="unfinished">Η διάρκεια ενός τρέχοντος ping.</translation>
-    </message>
-    <message>
-        <source>Ping Wait</source>
-        <translation type="unfinished">Αναμονή απόκρισης</translation>
-    </message>
-    <message>
-        <source>Min Ping</source>
-        <translation type="unfinished">Ελάχιστο Ping</translation>
-    </message>
-    <message>
-        <source>Time Offset</source>
-        <translation type="unfinished">Απόκλιση χρόνου</translation>
-    </message>
-    <message>
-        <source>Last block time</source>
-        <translation type="unfinished">Χρόνος τελευταίου block</translation>
-    </message>
-    <message>
-        <source>&amp;Open</source>
-        <translation type="unfinished">&amp;Άνοιγμα</translation>
-    </message>
-    <message>
-        <source>&amp;Console</source>
-        <translation type="unfinished">&amp;Κονσόλα</translation>
-    </message>
-    <message>
-        <source>&amp;Network Traffic</source>
-        <translation type="unfinished">&amp;Κίνηση δικτύου</translation>
-    </message>
-    <message>
-        <source>Totals</source>
-        <translation type="unfinished">Σύνολα</translation>
-    </message>
-    <message>
-        <source>Debug log file</source>
-        <translation type="unfinished">Αρχείο καταγραφής εντοπισμού σφαλμάτων</translation>
-    </message>
-    <message>
-        <source>Clear console</source>
-        <translation type="unfinished">Καθαρισμός κονσόλας</translation>
-    </message>
-    <message>
-        <source>In:</source>
-        <translation type="unfinished">Εισερχόμενα:</translation>
-    </message>
-    <message>
-        <source>Out:</source>
-        <translation type="unfinished">Εξερχόμενα:</translation>
-    </message>
-    <message>
-        <source>Inbound: initiated by peer</source>
-        <extracomment>Explanatory text for an inbound peer connection.</extracomment>
-        <translation type="unfinished">Εισερχόμενο: ξεκίνησε από κόμβο</translation>
-    </message>
-    <message>
-        <source>Outbound Full Relay: default</source>
-        <extracomment>Explanatory text for an outbound peer connection that relays all network information. This is the default behavior for outbound connections.</extracomment>
-        <translation type="unfinished">Πλήρες Εξερχόμενη Αναμετάδοση: προεπιλογή</translation>
-    </message>
-    <message>
-        <source>Outbound Block Relay: does not relay transactions or addresses</source>
-        <extracomment>Explanatory text for an outbound peer connection that relays network information about blocks and not transactions or addresses.</extracomment>
-        <translation type="unfinished">Μπλοκ Εξερχόμενης Αναμετάδοσης: δεν αναμεταδίδει συναλλαγές ή διευθύνσεις</translation>
-    </message>
-    <message>
-        <source>Outbound Manual: added using RPC %1 or %2/%3 configuration options</source>
-        <extracomment>Explanatory text for an outbound peer connection that was established manually through one of several methods. The numbered arguments are stand-ins for the methods available to establish manual connections.</extracomment>
-        <translation type="unfinished">Χειροκίνητη Εξερχόμενη: προστέθηκε χρησιμοποιώντας RPC %1 ή %2/%3 επιλογών διαμόρφωσης</translation>
-    </message>
-    <message>
-        <source>Outbound Feeler: short-lived, for testing addresses</source>
-        <extracomment>Explanatory text for a short-lived outbound peer connection that is used to test the aliveness of known addresses.</extracomment>
-        <translation type="unfinished">Δοκιμαστική Εξερχόμενη: βραχύβια, για τον έλεγχο διευθύνσεων</translation>
-    </message>
-    <message>
-        <source>Outbound Address Fetch: short-lived, for soliciting addresses</source>
-        <extracomment>Explanatory text for a short-lived outbound peer connection that is used to request addresses from a peer.</extracomment>
-        <translation type="unfinished">Ανάκτηση Εξερχόμενης Διεύθυνσης: βραχύβια, για την αναζήτηση διευθύνσεων</translation>
-    </message>
-    <message>
-        <source>detecting: peer could be v1 or v2</source>
-        <extracomment>Explanatory text for "detecting" transport type.</extracomment>
-        <translation type="unfinished">ανίχνευση: ο κόμβος μπορεί να είναι v1 ή v2</translation>
-    </message>
-    <message>
-        <source>v1: unencrypted, plaintext transport protocol</source>
-        <extracomment>Explanatory text for v1 transport type.</extracomment>
-        <translation type="unfinished">v1: μη κρυπτογραφημένο, πρωτόκολλο μεταφοράς απλού κειμένου</translation>
-    </message>
-    <message>
-        <source>v2: BIP324 encrypted transport protocol</source>
-        <extracomment>Explanatory text for v2 transport type.</extracomment>
-        <translation type="unfinished">v2: BIP324 κρυπτογραφημένο πρωτόκολλο μεταφοράς</translation>
-    </message>
-    <message>
-        <source>we selected the peer for high bandwidth relay</source>
-        <translation type="unfinished">επιλέξαμε τον κόμβο για υψηλή ταχύτητα αναμετάδοσης</translation>
-    </message>
-    <message>
-        <source>the peer selected us for high bandwidth relay</source>
-        <translation type="unfinished">ο κόμβος μας επέλεξε για υψηλής ταχύτητας αναμετάδοση </translation>
-    </message>
-    <message>
-        <source>no high bandwidth relay selected</source>
-        <translation type="unfinished">δεν επιλέχθηκε υψηλού εύρους ζώνη αναμετάδοσης</translation>
-    </message>
-    <message>
-        <source>&amp;Copy address</source>
-        <extracomment>Context menu action to copy the address of a peer.</extracomment>
-        <translation type="unfinished">&amp;Αντιγραφή διεύθυνσης</translation>
-    </message>
-    <message>
-        <source>&amp;Disconnect</source>
-        <translation type="unfinished">&amp;Αποσύνδεση</translation>
-    </message>
-    <message>
-        <source>1 &amp;hour</source>
-        <translation type="unfinished">1 &amp;ώρα</translation>
-    </message>
-    <message>
-        <source>1 d&amp;ay</source>
-        <translation type="unfinished">1 η&amp;μέρα</translation>
-    </message>
-    <message>
-        <source>1 &amp;week</source>
-        <translation type="unfinished">1 &amp;εβδομάδα</translation>
-    </message>
-    <message>
-        <source>1 &amp;year</source>
-        <translation type="unfinished">1 &amp;χρόνος</translation>
-    </message>
-    <message>
-        <source>&amp;Copy IP/Netmask</source>
-        <extracomment>Context menu action to copy the IP/Netmask of a banned peer. IP/Netmask is the combination of a peer's IP address and its Netmask. For IP address, see: https://en.wikipedia.org/wiki/IP_address.</extracomment>
-        <translation type="unfinished">&amp;Αντιγραφή IP/Netmask</translation>
-    </message>
-    <message>
-        <source>&amp;Unban</source>
-        <translation type="unfinished">&amp;Ακύρωση Απαγόρευσης</translation>
-    </message>
-    <message>
-        <source>Network activity disabled</source>
-        <translation type="unfinished">Η δραστηριότητα δικτύου είναι απενεργοποιημένη</translation>
-    </message>
-    <message>
-        <source>None</source>
-        <translation type="unfinished">Κανένα</translation>
-    </message>
-    <message>
-        <source>Executing command without any wallet</source>
-        <translation type="unfinished">Εκτέλεση εντολής χωρίς πορτοφόλι</translation>
-    </message>
-    <message>
-        <source>Node window - [%1]</source>
-        <translation type="unfinished">Παράθυρο κόμβου - [%1]</translation>
-    </message>
-    <message>
-        <source>Executing command using "%1" wallet</source>
-        <translation type="unfinished">Εκτελώντας εντολή με το πορτοφόλι "%1"</translation>
-    </message>
-    <message>
-        <source>Welcome to the %1 RPC console.
-Use up and down arrows to navigate history, and %2 to clear screen.
-Use %3 and %4 to increase or decrease the font size.
-Type %5 for an overview of available commands.
-For more information on using this console, type %6.
-
-%7WARNING: 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.%8</source>
-        <extracomment>RPC console welcome message. Placeholders %7 and %8 are style tags for the warning content, and they are not space separated from the rest of the text intentionally.</extracomment>
-        <translation type="unfinished">Καλώς ήρθατε στην %1 κονσόλα RPC.
-Χρησιμοποιήστε τα πάνω και τα κάτω βέλη για πλοήγηση στο ιστορικό και %2 εκκαθάριση της οθόνης.
-Χρησιμοποιήστε %3 και %4 για να αυξήσετε ή να μειώσετε το μέγεθος της γραμματοσειράς.
-Πληκτρολογήστε %5 για επισκόπηση των διαθέσιμων εντολών.
-Για περισσότερες πληροφορίες σχετικά με τη χρήση αυτής της κονσόλας, πληκτρολογήστε %6.
-
-%7ΠΡΟΕΙΔΟΠΟΙΗΣΗ: Οι απατεώνες/scammers είναι ενεργοί, λέγοντας στους χρήστες να πληκτρολογούν εντολές εδώ, κλέβοντας το περιεχόμενο του πορτοφολιού τους. Μην χρησιμοποιείτε αυτήν την κονσόλα χωρίς να κατανοήσετε πλήρως τις συνέπειες μιας εντολής.%8</translation>
-    </message>
-    <message>
-        <source>Executing…</source>
-        <extracomment>A console message indicating an entered command is currently being executed.</extracomment>
-        <translation type="unfinished">Εκτέλεση...</translation>
-    </message>
-    <message>
-        <source>(peer: %1)</source>
-        <translation type="unfinished">(κόμβος: %1)</translation>
-    </message>
-    <message>
-        <source>via %1</source>
-        <translation type="unfinished">μέσω %1</translation>
-    </message>
-    <message>
-        <source>Yes</source>
-        <translation type="unfinished">Ναι</translation>
-    </message>
-    <message>
-        <source>No</source>
-        <translation type="unfinished">Όχι</translation>
-    </message>
-    <message>
-        <source>To</source>
-        <translation type="unfinished">Προς</translation>
-    </message>
-    <message>
-        <source>From</source>
-        <translation type="unfinished">Από</translation>
-    </message>
-    <message>
-        <source>Ban for</source>
-        <translation type="unfinished">Αποκλεισμός για</translation>
-    </message>
-    <message>
-        <source>Never</source>
-        <translation type="unfinished">Ποτέ</translation>
-    </message>
-    <message>
-        <source>Unknown</source>
-        <translation type="unfinished">Άγνωστο(α)</translation>
+        <source>Unknown</source>
+        <translation type="unfinished">Άγνωστο(α)</translation>
     </message>
 </context>
 <context>
@@ -2705,10 +2207,6 @@ For more information on using this console, type %6.
         <source>&amp;Amount:</source>
         <translation type="unfinished">&amp;Ποσό:</translation>
     </message>
-    <message>
-        <source>&amp;Label:</source>
-        <translation type="unfinished">&amp;Ετικέτα:</translation>
-    </message>
     <message>
         <source>&amp;Message:</source>
         <translation type="unfinished">&amp;Μήνυμα:</translation>
@@ -2887,10 +2385,6 @@ For more information on using this console, type %6.
         <source>Message</source>
         <translation type="unfinished">Μήνυμα</translation>
     </message>
-    <message>
-        <source>(no label)</source>
-        <translation type="unfinished">(χωρίς ετικέτα)</translation>
-    </message>
     <message>
         <source>(no message)</source>
         <translation type="unfinished">(κανένα μήνυμα)</translation>
@@ -3170,7 +2664,7 @@ Note:  Since the fee is calculated on a per-byte basis, a fee rate of "100 satos
     </message>
     <message>
         <source>Transaction fee</source>
-        <translation type="unfinished">Τέλος συναλλαγής</translation>
+        <translation type="unfinished">Τέλη συναλλαγής</translation>
     </message>
     <message>
         <source>Not signalling Replace-By-Fee, BIP-125.</source>
@@ -3198,34 +2692,6 @@ Note:  Since the fee is calculated on a per-byte basis, a fee rate of "100 satos
         <source>Confirm send coins</source>
         <translation type="unfinished"> Επιβεβαιώστε την αποστολή bitcoin</translation>
     </message>
-    <message>
-        <source>The recipient address is not valid. Please recheck.</source>
-        <translation type="unfinished">Η διεύθυση παραλήπτη δεν είναι έγκυρη. Ελέγξτε ξανά.</translation>
-    </message>
-    <message>
-        <source>The amount to pay must be larger than 0.</source>
-        <translation type="unfinished">Το ποσό που πρέπει να πληρώσει πρέπει να είναι μεγαλύτερο από το 0.</translation>
-    </message>
-    <message>
-        <source>The amount exceeds your balance.</source>
-        <translation type="unfinished">Το ποσό υπερβαίνει το υπόλοιπό σας.</translation>
-    </message>
-    <message>
-        <source>The total exceeds your balance when the %1 transaction fee is included.</source>
-        <translation type="unfinished"> Το σύνολο υπερβαίνει το υπόλοιπό σας όταν περιλαμβάνεται το τέλος συναλλαγής %1.</translation>
-    </message>
-    <message>
-        <source>Duplicate address found: addresses should only be used once each.</source>
-        <translation type="unfinished">Βρέθηκε διπλή διεύθυνση: οι διευθύνσεις θα πρέπει να χρησιμοποιούνται μόνο μία φορά.</translation>
-    </message>
-    <message>
-        <source>Transaction creation failed!</source>
-        <translation type="unfinished">Η δημιουργία της συναλλαγής απέτυχε!</translation>
-    </message>
-    <message>
-        <source>A fee higher than %1 is considered an absurdly high fee.</source>
-        <translation type="unfinished">Ένα τέλος συναλλαγής υψηλότερο από το %1 θεωρείται παράλογα υψηλό.</translation>
-    </message>
     <message numerus="yes">
         <source>Estimated to begin confirmation within %n block(s).</source>
         <translation type="unfinished">
@@ -3233,258 +2699,24 @@ Note:  Since the fee is calculated on a per-byte basis, a fee rate of "100 satos
             <numerusform>Estimated to begin confirmation within %n block(s).</numerusform>
         </translation>
     </message>
-    <message>
-        <source>Warning: Invalid Bitcoin address</source>
-        <translation type="unfinished">Προειδοποίηση: Μη έγκυρη διεύθυνση Bitcoin</translation>
-    </message>
-    <message>
-        <source>Warning: Unknown change address</source>
-        <translation type="unfinished">Προειδοποίηση: Άγνωστη διεύθυνση ρέστων</translation>
-    </message>
-    <message>
-        <source>Confirm custom change address</source>
-        <translation type="unfinished">Επιβεβαιώστε τη προσαρμοσμένη διεύθυνση ρέστων</translation>
-    </message>
-    <message>
-        <source>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?</source>
-        <translation type="unfinished">Η διεύθυνση που επιλέξατε για αλλαγή δεν αποτελεί μέρος αυτού του πορτοφολιού. Οποιαδήποτε ή όλα τα κεφάλαια στο πορτοφόλι σας μπορούν να σταλούν σε αυτή τη διεύθυνση. Είσαι σίγουρος?</translation>
-    </message>
-    <message>
-        <source>(no label)</source>
-        <translation type="unfinished">(χωρίς ετικέτα)</translation>
-    </message>
-</context>
-<context>
-    <name>SendCoinsEntry</name>
-    <message>
-        <source>A&amp;mount:</source>
-        <translation type="unfinished">&amp;Ποσό:</translation>
-    </message>
-    <message>
-        <source>Pay &amp;To:</source>
-        <translation type="unfinished">Πληρωμή &amp;σε:</translation>
-    </message>
-    <message>
-        <source>&amp;Label:</source>
-        <translation type="unfinished">&amp;Ετικέτα:</translation>
-    </message>
-    <message>
-        <source>Choose previously used address</source>
-        <translation type="unfinished">Επιλογή διεύθυνσης που έχει ήδη χρησιμοποιηθεί</translation>
-    </message>
-    <message>
-        <source>The Bitcoin address to send the payment to</source>
-        <translation type="unfinished">Η διεύθυνση Bitcoin που θα σταλεί η πληρωμή</translation>
-    </message>
-    <message>
-        <source>Paste address from clipboard</source>
-        <translation type="unfinished">Επικόλληση διεύθυνσης από το πρόχειρο</translation>
-    </message>
-    <message>
-        <source>Remove this entry</source>
-        <translation type="unfinished">Αφαίρεση αυτής της καταχώρησης</translation>
-    </message>
-    <message>
-        <source>The amount to send in the selected unit</source>
-        <translation type="unfinished">Το ποσό που θα αποσταλεί με την επιλεγμένη μονάδα</translation>
-    </message>
-    <message>
-        <source>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.</source>
-        <translation type="unfinished">Το τέλος θα αφαιρεθεί από το ποσό που αποστέλλεται. Ο παραλήπτης θα λάβει λιγότερα bitcoins από ό,τι εισάγετε στο πεδίο ποσό. Εάν επιλεγούν πολλοί παραλήπτες, το έξοδο διαιρείται εξίσου.</translation>
-    </message>
-    <message>
-        <source>S&amp;ubtract fee from amount</source>
-        <translation type="unfinished">Α&amp;φερέστε το τέλος συναλλαγής από το ποσό</translation>
-    </message>
-    <message>
-        <source>Use available balance</source>
-        <translation type="unfinished">Χρησιμοποιήστε το διαθέσιμο υπόλοιπο</translation>
-    </message>
-    <message>
-        <source>Message:</source>
-        <translation type="unfinished">Μήνυμα:</translation>
-    </message>
-    <message>
-        <source>Enter a label for this address to add it to the list of used addresses</source>
-        <translation type="unfinished">Εισάγετε μία ετικέτα για αυτή την διεύθυνση για να προστεθεί στη λίστα με τις χρησιμοποιημένες διευθύνσεις</translation>
-    </message>
-    <message>
-        <source>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.</source>
-        <translation type="unfinished">Ένα μήνυμα που επισυνάφθηκε στο bitcoin: URI το οποίο θα αποθηκευτεί με τη συναλλαγή για αναφορά. Σημείωση: Αυτό το μήνυμα δεν θα σταλεί μέσω του δικτύου Bitcoin.</translation>
-    </message>
-</context>
-<context>
-    <name>SendConfirmationDialog</name>
-    <message>
-        <source>Send</source>
-        <translation type="unfinished">Αποστολή</translation>
-    </message>
-    <message>
-        <source>Create Unsigned</source>
-        <translation type="unfinished">Δημιουργία Ανυπόγραφου</translation>
-    </message>
-</context>
+    </context>
 <context>
     <name>SignVerifyMessageDialog</name>
-    <message>
-        <source>Signatures - Sign / Verify a Message</source>
-        <translation type="unfinished">Υπογραφές - Υπογράψτε / Επαληθεύστε ένα Μήνυμα</translation>
-    </message>
-    <message>
-        <source>&amp;Sign Message</source>
-        <translation type="unfinished">&amp;Υπογραφή Μηνύματος</translation>
-    </message>
     <message>
         <source>You can sign messages/agreements with your legacy (P2PKH) 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.</source>
         <translation type="unfinished">Μπορείτε να υπογράψετε μηνύματα/συμφωνίες με τις παλαιότερες (P2PKH) διευθύνσεις σας για να αποδείξετε ότι μπορείτε να λαμβάνετε bitcoin που αποστέλλονται σε αυτές. Προσέξτε να μην υπογράψετε τίποτα αόριστο ή τυχαίο, καθώς οι επιθέσεις ηλεκτρονικού "ψαρέματος" (phishing) ενδέχεται να προσπαθήσουν να σας ξεγελάσουν ώστε να τους υπογράψετε την ταυτότητά σας. Υπογράφετε μόνο πλήρως λεπτομερείς δηλώσεις με τις οποίες συμφωνείτε.</translation>
     </message>
-    <message>
-        <source>The Bitcoin address to sign the message with</source>
-        <translation type="unfinished">Διεύθυνση Bitcoin που θα υπογράψει το μήνυμα</translation>
-    </message>
-    <message>
-        <source>Choose previously used address</source>
-        <translation type="unfinished">Επιλογή διεύθυνσης που έχει ήδη χρησιμοποιηθεί</translation>
-    </message>
-    <message>
-        <source>Paste address from clipboard</source>
-        <translation type="unfinished">Επικόλληση διεύθυνσης από το πρόχειρο</translation>
-    </message>
-    <message>
-        <source>Enter the message you want to sign here</source>
-        <translation type="unfinished">Εισάγετε εδώ το μήνυμα που θέλετε να υπογράψετε</translation>
-    </message>
-    <message>
-        <source>Signature</source>
-        <translation type="unfinished">Υπογραφή</translation>
-    </message>
     <message>
         <source>Copy the current signature to the clipboard</source>
         <translation type="unfinished">Αντιγραφή της επιλεγμένης υπογραφής στο πρόχειρο</translation>
     </message>
-    <message>
-        <source>Sign the message to prove you own this Bitcoin address</source>
-        <translation type="unfinished">Υπογράψτε το μήνυμα για να αποδείξετε πως σας ανήκει η συγκεκριμένη διεύθυνση Bitcoin</translation>
-    </message>
-    <message>
-        <source>Sign &amp;Message</source>
-        <translation type="unfinished">Υπογραφή &amp;Μηνύματος</translation>
-    </message>
-    <message>
-        <source>Reset all sign message fields</source>
-        <translation type="unfinished">Επαναφορά των πεδίων υπογραφής μηνύματος</translation>
-    </message>
-    <message>
-        <source>Clear &amp;All</source>
-        <translation type="unfinished">Καθαρισμός &amp;Όλων</translation>
-    </message>
-    <message>
-        <source>&amp;Verify Message</source>
-        <translation type="unfinished">&amp;Επιβεβαίωση Mηνύματος</translation>
-    </message>
-    <message>
-        <source>Enter the receiver's address, message (ensure you copy line breaks, spaces, tabs, etc. exactly) and signature below to verify the message. Be careful not to read more into the signature than what is in the signed message itself, to avoid being tricked by a man-in-the-middle attack. Note that this only proves the signing party receives with the address, it cannot prove sendership of any transaction!</source>
-        <translation type="unfinished">Εισαγάγετε τη διεύθυνση του παραλήπτη, το μήνυμα (βεβαιωθείτε ότι αντιγράφετε σωστά τα διαλείμματα γραμμής, τα κενά, τις καρτέλες κλπ.) και την υπογραφή παρακάτω για να επαληθεύσετε το μήνυμα. Προσέξτε να μην ερμηνεύσετε περισσότερα στην υπογραφή από ότι περιέχει το ίδιο το υπογεγραμμένο μήνυμα, ώστε να αποφύγετε να εξαπατηθείτε από μια επίθεση τύπου man-in-the-middle. Σημειώστε ότι αυτό αποδεικνύει μόνο ότι το υπογράφον μέρος μπορεί να λαμβάνει με τη διεύθυνση, δεν μπορεί να αποδείξει την αποστολή κάποιας συναλλαγής!</translation>
-    </message>
-    <message>
-        <source>The Bitcoin address the message was signed with</source>
-        <translation type="unfinished">Διεύθυνση Bitcoin με την οποία έχει υπογραφεί το μήνυμα</translation>
-    </message>
-    <message>
-        <source>The signed message to verify</source>
-        <translation type="unfinished">Το υπογεγραμμένο μήνυμα προς επιβεβαίωση</translation>
-    </message>
-    <message>
-        <source>The signature given when the message was signed</source>
-        <translation type="unfinished">Η υπογραφή που δόθηκε όταν υπογράφηκε το μήνυμα</translation>
-    </message>
-    <message>
-        <source>Verify the message to ensure it was signed with the specified Bitcoin address</source>
-        <translation type="unfinished">Επαληθεύστε το μήνυμα για να αποδειχθεί πως υπογράφηκε από τη συγκεκριμένη διεύθυνση Bitcoin</translation>
-    </message>
-    <message>
-        <source>Verify &amp;Message</source>
-        <translation type="unfinished">Επιβεβαίωση &amp;Μηνύματος</translation>
-    </message>
-    <message>
-        <source>Reset all verify message fields</source>
-        <translation type="unfinished">Επαναφορά των πεδίων επαλήθευσης μηνύματος</translation>
-    </message>
-    <message>
-        <source>Click "Sign Message" to generate signature</source>
-        <translation type="unfinished">Κάντε κλικ στην επιλογή "Υπογραφή Μηνύματος" για να δημιουργήσετε υπογραφή</translation>
-    </message>
-    <message>
-        <source>The entered address is invalid.</source>
-        <translation type="unfinished">Η καταχωρημένη διεύθυνση δεν είναι έγκυρη.</translation>
-    </message>
-    <message>
-        <source>Please check the address and try again.</source>
-        <translation type="unfinished">Ελέγξτε τη διεύθυνση και δοκιμάστε ξανά.</translation>
-    </message>
     <message>
         <source>The entered address does not refer to a legacy (P2PKH) key. Message signing for SegWit and other non-P2PKH address types is not supported in this version of %1. Please check the address and try again.</source>
         <translation type="unfinished">Η καταχωρημένη διεύθυνση δεν αναφέρεται σε παλαιότερο (P2PKH) κλειδί. Η υπογραφή μηνυμάτων για SegWit και άλλων τύπων διευθύνσεων που δεν είναι P2PKH δεν υποστηρίζεται σε αυτήν την έκδοση του %1. Ελέγξτε τη διεύθυνση και προσπαθήστε ξανά.</translation>
     </message>
-    <message>
-        <source>Wallet unlock was cancelled.</source>
-        <translation type="unfinished">Το ξεκλείδωμα του Πορτοφολιού ακυρώθηκε.</translation>
-    </message>
-    <message>
-        <source>No error</source>
-        <translation type="unfinished">Κανένα σφάλμα</translation>
-    </message>
-    <message>
-        <source>Private key for the entered address is not available.</source>
-        <translation type="unfinished">Το ιδιωτικό κλειδί για την καταχωρημένη διεύθυνση δεν είναι διαθέσιμο.</translation>
-    </message>
-    <message>
-        <source>Message signing failed.</source>
-        <translation type="unfinished">Η υπογραφή μηνύματος απέτυχε.</translation>
-    </message>
-    <message>
-        <source>Message signed.</source>
-        <translation type="unfinished">Το μήνυμα υπογράφτηκε. </translation>
-    </message>
-    <message>
-        <source>The signature could not be decoded.</source>
-        <translation type="unfinished">Δεν ήταν δυνατή η αποκωδικοποίηση της υπογραφής.</translation>
-    </message>
-    <message>
-        <source>Please check the signature and try again.</source>
-        <translation type="unfinished">Ελέγξτε την υπογραφή και δοκιμάστε ξανά.</translation>
-    </message>
-    <message>
-        <source>The signature did not match the message digest.</source>
-        <translation type="unfinished">Η υπογραφή δεν ταιριάζει με το μήνυμα digest.</translation>
-    </message>
-    <message>
-        <source>Message verification failed.</source>
-        <translation type="unfinished">Η επαλήθευση μηνύματος απέτυχε.</translation>
-    </message>
-    <message>
-        <source>Message verified.</source>
-        <translation type="unfinished">Το μήνυμα επαληθεύτηκε.</translation>
-    </message>
-</context>
-<context>
-    <name>SplashScreen</name>
-    <message>
-        <source>(press q to shutdown and continue later)</source>
-        <translation type="unfinished">(πατήστε q για κλείσιμο και συνεχίστε αργότερα)</translation>
-    </message>
-    <message>
-        <source>press q to shutdown</source>
-        <translation type="unfinished">πατήστε q για κλείσιμο</translation>
-    </message>
-</context>
+    </context>
 <context>
     <name>TransactionDesc</name>
-    <message>
-        <source>conflicted with a transaction with %1 confirmations</source>
-        <extracomment>Text explaining the current status of a transaction, shown in the status field of the details window for this transaction. This status represents an unconfirmed transaction that conflicts with a confirmed transaction.</extracomment>
-        <translation type="unfinished">σε σύγκρουση με μια συναλλαγή με %1 επιβεβαιώσεις</translation>
-    </message>
     <message>
         <source>0/unconfirmed, in memory pool</source>
         <extracomment>Text explaining the current status of a transaction, shown in the status field of the details window for this transaction. This status represents an unconfirmed transaction that is in the memory pool.</extracomment>
@@ -3495,61 +2727,10 @@ Note:  Since the fee is calculated on a per-byte basis, a fee rate of "100 satos
         <extracomment>Text explaining the current status of a transaction, shown in the status field of the details window for this transaction. This status represents an unconfirmed transaction that is not in the memory pool.</extracomment>
         <translation type="unfinished">0/μη επιβεβαιωμένες, όχι στη mempool</translation>
     </message>
-    <message>
-        <source>abandoned</source>
-        <extracomment>Text explaining the current status of a transaction, shown in the status field of the details window for this transaction. This status represents an abandoned transaction.</extracomment>
-        <translation type="unfinished">εγκαταλελειμμένος</translation>
-    </message>
-    <message>
-        <source>%1/unconfirmed</source>
-        <extracomment>Text explaining the current status of a transaction, shown in the status field of the details window for this transaction. This status represents a transaction confirmed in at least one block, but less than 6 blocks.</extracomment>
-        <translation type="unfinished">%1/μη επιβεβαιωμένο</translation>
-    </message>
-    <message>
-        <source>%1 confirmations</source>
-        <extracomment>Text explaining the current status of a transaction, shown in the status field of the details window for this transaction. This status represents a transaction confirmed in 6 or more blocks.</extracomment>
-        <translation type="unfinished">%1 επικυρώσεις</translation>
-    </message>
-    <message>
-        <source>Status</source>
-        <translation type="unfinished">Κατάσταση</translation>
-    </message>
     <message>
         <source>Date</source>
         <translation type="unfinished">Ημερομηνία</translation>
     </message>
-    <message>
-        <source>Source</source>
-        <translation type="unfinished">Πηγή</translation>
-    </message>
-    <message>
-        <source>Generated</source>
-        <translation type="unfinished">Παράχθηκε</translation>
-    </message>
-    <message>
-        <source>From</source>
-        <translation type="unfinished">Από</translation>
-    </message>
-    <message>
-        <source>unknown</source>
-        <translation type="unfinished">άγνωστο</translation>
-    </message>
-    <message>
-        <source>To</source>
-        <translation type="unfinished">Προς</translation>
-    </message>
-    <message>
-        <source>own address</source>
-        <translation type="unfinished">δική σας διεύθυνση</translation>
-    </message>
-    <message>
-        <source>label</source>
-        <translation type="unfinished">ετικέτα</translation>
-    </message>
-    <message>
-        <source>Credit</source>
-        <translation type="unfinished">Πίστωση</translation>
-    </message>
     <message numerus="yes">
         <source>matures in %n more block(s)</source>
         <translation type="unfinished">
@@ -3557,183 +2738,20 @@ Note:  Since the fee is calculated on a per-byte basis, a fee rate of "100 satos
             <numerusform>matures in %n more block(s)</numerusform>
         </translation>
     </message>
-    <message>
-        <source>not accepted</source>
-        <translation type="unfinished">μη αποδεκτό</translation>
-    </message>
-    <message>
-        <source>Debit</source>
-        <translation type="unfinished">Χρέωση</translation>
-    </message>
-    <message>
-        <source>Total debit</source>
-        <translation type="unfinished">Συνολική χρέωση</translation>
-    </message>
-    <message>
-        <source>Total credit</source>
-        <translation type="unfinished">Συνολική πίστωση</translation>
-    </message>
-    <message>
-        <source>Transaction fee</source>
-        <translation type="unfinished">Τέλη συναλλαγής</translation>
-    </message>
-    <message>
-        <source>Net amount</source>
-        <translation type="unfinished">Καθαρό ποσό</translation>
-    </message>
-    <message>
-        <source>Message</source>
-        <translation type="unfinished">Μήνυμα</translation>
-    </message>
-    <message>
-        <source>Comment</source>
-        <translation type="unfinished">Σχόλιο</translation>
-    </message>
-    <message>
-        <source>Transaction ID</source>
-        <translation type="unfinished">ID συναλλαγής</translation>
-    </message>
-    <message>
-        <source>Transaction total size</source>
-        <translation type="unfinished">Συνολικό μέγεθος συναλλαγής</translation>
-    </message>
-    <message>
-        <source>Transaction virtual size</source>
-        <translation type="unfinished">Εικονικό μέγεθος συναλλαγής</translation>
-    </message>
-    <message>
-        <source>Output index</source>
-        <translation type="unfinished">Δείκτης output</translation>
-    </message>
     <message>
         <source>%1 (Certificate was not verified)</source>
         <translation type="unfinished">%1 (Το πιστοποιητικό δεν επαληθεύτηκε)</translation>
     </message>
-    <message>
-        <source>Merchant</source>
-        <translation type="unfinished">Έμπορος</translation>
-    </message>
-    <message>
-        <source>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.</source>
-        <translation type="unfinished">Τα δημιουργημένα κέρματα πρέπει να ωριμάσουν σε %1 μπλοκ πριν να ξοδευτούν. Όταν δημιουργήσατε αυτό το μπλοκ, μεταδόθηκε στο δίκτυο για να προστεθεί στην αλυσίδα μπλοκ. Εάν αποτύχει να εισέλθει στην αλυσίδα, η κατάσταση της θα αλλάξει σε "μη αποδεκτή" και δεν θα είναι δαπανηρή. Αυτό μπορεί περιστασιακά να συμβεί εάν ένας άλλος κόμβος παράγει ένα μπλοκ μέσα σε λίγα δευτερόλεπτα από το δικό σας.</translation>
-    </message>
-    <message>
-        <source>Debug information</source>
-        <translation type="unfinished">Πληροφορίες σφαλμάτων</translation>
-    </message>
-    <message>
-        <source>Transaction</source>
-        <translation type="unfinished">Συναλλαγή</translation>
-    </message>
-    <message>
-        <source>Amount</source>
-        <translation type="unfinished">Ποσό</translation>
-    </message>
-    <message>
-        <source>true</source>
-        <translation type="unfinished">αληθής</translation>
-    </message>
-    <message>
-        <source>false</source>
-        <translation type="unfinished">ψευδής</translation>
-    </message>
-</context>
-<context>
-    <name>TransactionDescDialog</name>
-    <message>
-        <source>This pane shows a detailed description of the transaction</source>
-        <translation type="unfinished">Αυτό το παράθυρο δείχνει μια λεπτομερή περιγραφή της συναλλαγής</translation>
-    </message>
-    <message>
-        <source>Details for %1</source>
-        <translation type="unfinished">Λεπτομέρειες για %1</translation>
-    </message>
-</context>
+    </context>
 <context>
     <name>TransactionTableModel</name>
-    <message>
-        <source>Date</source>
-        <translation type="unfinished">Ημερομηνία</translation>
-    </message>
-    <message>
-        <source>Type</source>
-        <translation type="unfinished">Τύπος</translation>
-    </message>
-    <message>
-        <source>Label</source>
-        <translation type="unfinished">Ετικέτα</translation>
-    </message>
-    <message>
-        <source>Unconfirmed</source>
-        <translation type="unfinished">Μη επικυρωμένη</translation>
-    </message>
-    <message>
-        <source>Abandoned</source>
-        <translation type="unfinished">Εγκαταλελειμμένη</translation>
-    </message>
-    <message>
-        <source>Confirming (%1 of %2 recommended confirmations)</source>
-        <translation type="unfinished">Επικυρώνεται (%1 από %2 συνιστώμενες επικυρώσεις)</translation>
-    </message>
-    <message>
-        <source>Confirmed (%1 confirmations)</source>
-        <translation type="unfinished">Επικυρώθηκε (%1 επικυρώσεις)</translation>
-    </message>
-    <message>
-        <source>Conflicted</source>
-        <translation type="unfinished">Σε διένεξη</translation>
-    </message>
-    <message>
-        <source>Immature (%1 confirmations, will be available after %2)</source>
-        <translation type="unfinished">Ανώριμο (%1 επικυρώσεις, θα είναι διαθέσιμο μετά από %2)</translation>
-    </message>
-    <message>
-        <source>Generated but not accepted</source>
-        <translation type="unfinished">Δημιουργήθηκε αλλά δεν έγινε αποδεκτή</translation>
-    </message>
-    <message>
-        <source>Received with</source>
-        <translation type="unfinished">Ελήφθη με</translation>
-    </message>
-    <message>
-        <source>Received from</source>
-        <translation type="unfinished">Λήψη από</translation>
-    </message>
-    <message>
-        <source>Sent to</source>
-        <translation type="unfinished">Αποστέλλονται προς</translation>
-    </message>
-    <message>
-        <source>Mined</source>
-        <translation type="unfinished">Εξόρυξη</translation>
-    </message>
-    <message>
-        <source>(n/a)</source>
-        <translation type="unfinished">(μη διαθέσιμο)</translation>
-    </message>
-    <message>
-        <source>(no label)</source>
-        <translation type="unfinished">(χωρίς ετικέτα)</translation>
-    </message>
-    <message>
-        <source>Transaction status. Hover over this field to show number of confirmations.</source>
-        <translation type="unfinished">Κατάσταση συναλλαγής. Τοποθετήστε το δείκτη του ποντικιού πάνω από αυτό το πεδίο για να δείτε τον αριθμό των επικυρώσεων.</translation>
-    </message>
-    <message>
-        <source>Date and time that the transaction was received.</source>
-        <translation type="unfinished">Ημερομηνία και ώρα λήψης της συναλλαγής.</translation>
-    </message>
-    <message>
-        <source>Type of transaction.</source>
-        <translation type="unfinished">Είδος συναλλαγής.</translation>
-    </message>
     <message>
         <source>User-defined intent/purpose of the transaction.</source>
         <translation type="unfinished">Καθορισμένος από τον χρήστη σκοπός / σκοπός της συναλλαγής.</translation>
     </message>
     <message>
         <source>Amount removed from or added to balance.</source>
-        <translation type="unfinished">Ποσό που αφαιρέθηκε ή προστέθηκε στο υπόλοιπο.</translation>
+        <translation type="unfinished">Ποσό που αφαιρέθηκε ή προστέθηκε στην ισορροπία.</translation>
     </message>
 </context>
 <context>
@@ -3768,11 +2786,11 @@ Note:  Since the fee is calculated on a per-byte basis, a fee rate of "100 satos
     </message>
     <message>
         <source>Sent to</source>
-        <translation type="unfinished">Αποστολή προς</translation>
+        <translation type="unfinished">Αποστέλλονται προς</translation>
     </message>
     <message>
         <source>Mined</source>
-        <translation type="unfinished">Εξορυγμένη</translation>
+        <translation type="unfinished">Εξόρυξη</translation>
     </message>
     <message>
         <source>Other</source>
@@ -3780,7 +2798,7 @@ Note:  Since the fee is calculated on a per-byte basis, a fee rate of "100 satos
     </message>
     <message>
         <source>Enter address, transaction id, or label to search</source>
-        <translation type="unfinished">Εισαγάγετε τη διεύθυνση, το ID συναλλαγής ή την ετικέτα για αναζήτηση</translation>
+        <translation type="unfinished">Εισαγάγετε τη διεύθυνση, το αναγνωριστικό συναλλαγής ή την ετικέτα για αναζήτηση</translation>
     </message>
     <message>
         <source>Min amount</source>
@@ -3796,7 +2814,7 @@ Note:  Since the fee is calculated on a per-byte basis, a fee rate of "100 satos
     </message>
     <message>
         <source>Copy &amp;label</source>
-        <translation type="unfinished">Αντιγραφή &amp;ετικέτας</translation>
+        <translation type="unfinished">Αντιγραφή &amp;ετικέτα</translation>
     </message>
     <message>
         <source>Copy &amp;amount</source>
@@ -3804,7 +2822,7 @@ Note:  Since the fee is calculated on a per-byte basis, a fee rate of "100 satos
     </message>
     <message>
         <source>Copy transaction &amp;ID</source>
-        <translation type="unfinished">Αντιγραφή &amp;ID συναλλαγής</translation>
+        <translation type="unfinished">Αντιγραφή συναλλαγής &amp;ID</translation>
     </message>
     <message>
         <source>Copy &amp;raw transaction</source>
@@ -3812,7 +2830,7 @@ Note:  Since the fee is calculated on a per-byte basis, a fee rate of "100 satos
     </message>
     <message>
         <source>Copy full transaction &amp;details</source>
-        <translation type="unfinished">Αντιγραφή πλήρων &amp;λεπτομερειών συναλλαγής</translation>
+        <translation type="unfinished">Αντιγραφή όλων των πληροφοριών συναλλαγής &amp;λεπτομερειών</translation>
     </message>
     <message>
         <source>&amp;Show transaction details</source>
@@ -3820,11 +2838,11 @@ Note:  Since the fee is calculated on a per-byte basis, a fee rate of "100 satos
     </message>
     <message>
         <source>Increase transaction &amp;fee</source>
-        <translation type="unfinished">Αύξηση &amp;τελών συναλλαγής</translation>
+        <translation type="unfinished">Αύξηση &amp;κρατήσεων συναλλαγής</translation>
     </message>
     <message>
         <source>A&amp;bandon transaction</source>
-        <translation type="unfinished">&amp;Εγκατάλειψη συναλλαγής</translation>
+        <translation type="unfinished">Α&amp;πόρριψη συναλλαγής</translation>
     </message>
     <message>
         <source>&amp;Edit address label</source>
@@ -3837,7 +2855,7 @@ Note:  Since the fee is calculated on a per-byte basis, a fee rate of "100 satos
     </message>
     <message>
         <source>Export Transaction History</source>
-        <translation type="unfinished">Εξαγωγή Ιστορικού Συναλλαγών</translation>
+        <translation type="unfinished">Εξαγωγή ιστορικού συναλλαγών</translation>
     </message>
     <message>
         <source>Comma separated file</source>
@@ -3861,8 +2879,8 @@ Note:  Since the fee is calculated on a per-byte basis, a fee rate of "100 satos
         <translation type="unfinished">Ετικέτα</translation>
     </message>
     <message>
-        <source>Address</source>
-        <translation type="unfinished">Διεύθυνση</translation>
+        <source>ID</source>
+        <translation type="unfinished">ταυτότητα</translation>
     </message>
     <message>
         <source>Exporting Failed</source>
@@ -3896,12 +2914,12 @@ Note:  Since the fee is calculated on a per-byte basis, a fee rate of "100 satos
 Go to File &gt; Open Wallet to load a wallet.
 - OR -</source>
         <translation type="unfinished">Δεν έχει φορτωθεί κανένα πορτοφόλι.
-Μεταβείτε στο Αρχείο &gt; Άνοιγμα Πορτοφολιού για να φορτώσετε .
-- Η -</translation>
+Μεταβείτε στο Αρχείο&gt;Άνοιγμα πορτοφολιού για φόρτωση.
+-Η-</translation>
     </message>
     <message>
         <source>Create a new wallet</source>
-        <translation type="unfinished">Δημιουργία νέου πορτοφολιού</translation>
+        <translation type="unfinished">Δημιουργία νέου Πορτοφολιού</translation>
     </message>
     <message>
         <source>Error</source>
@@ -3913,11 +2931,11 @@ Go to File &gt; Open Wallet to load a wallet.
     </message>
     <message>
         <source>Load Transaction Data</source>
-        <translation type="unfinished">Φόρτωση Δεδομένων Συναλλαγής</translation>
+        <translation type="unfinished">Φόρτωση δεδομένων συναλλαγής</translation>
     </message>
     <message>
         <source>Partially Signed Transaction (*.psbt)</source>
-        <translation type="unfinished">Μερικώς Υπογεγραμμένη Συναλλαγή (*.psbt)</translation>
+        <translation type="unfinished">Μερικώς υπογεγραμμένη συναλλαγή (*.psbt)</translation>
     </message>
     <message>
         <source>PSBT file must be smaller than 100 MiB</source>
@@ -3925,7 +2943,7 @@ Go to File &gt; Open Wallet to load a wallet.
     </message>
     <message>
         <source>Unable to decode PSBT</source>
-        <translation type="unfinished">Αδυναμία αποκωδικοποίησης PSBT</translation>
+        <translation type="unfinished">Αδυναμία στην αποκωδικοποίηση του PSBT</translation>
     </message>
 </context>
 <context>
@@ -3936,7 +2954,7 @@ Go to File &gt; Open Wallet to load a wallet.
     </message>
     <message>
         <source>Fee bump error</source>
-        <translation type="unfinished">Σφάλμα αύξησης τέλους συναλλαγής</translation>
+        <translation type="unfinished">Σφάλμα πρόσκρουσης τέλους</translation>
     </message>
     <message>
         <source>Increasing transaction fee failed</source>
@@ -3945,11 +2963,11 @@ Go to File &gt; Open Wallet to load a wallet.
     <message>
         <source>Do you want to increase the fee?</source>
         <extracomment>Asks a user if they would like to manually increase the fee of a transaction that has already been created.</extracomment>
-        <translation type="unfinished">Θέλετε να αυξήσετε το τέλος συναλλαγής;</translation>
+        <translation type="unfinished">Θέλετε να αυξήσετε το τέλος;</translation>
     </message>
     <message>
         <source>Current fee:</source>
-        <translation type="unfinished">Τρέχων τέλος συναλλαγής:</translation>
+        <translation type="unfinished">Τρέχουσα χρέωση:</translation>
     </message>
     <message>
         <source>Increase:</source>
@@ -3957,7 +2975,7 @@ Go to File &gt; Open Wallet to load a wallet.
     </message>
     <message>
         <source>New fee:</source>
-        <translation type="unfinished">Νέο τέλη:</translation>
+        <translation type="unfinished">Νέο έξοδο:</translation>
     </message>
     <message>
         <source>Warning: This may pay the additional fee by reducing change outputs or adding inputs, when necessary. It may add a new change output if one does not already exist. These changes may potentially leak privacy.</source>
@@ -3965,7 +2983,7 @@ Go to File &gt; Open Wallet to load a wallet.
     </message>
     <message>
         <source>Confirm fee bump</source>
-        <translation type="unfinished">Επιβεβαίωση αύξησης τελών συναλλαγής</translation>
+        <translation type="unfinished">Επιβεβαίωση χρέωσης εξόδων</translation>
     </message>
     <message>
         <source>Can't draft transaction.</source>
@@ -3985,7 +3003,7 @@ Go to File &gt; Open Wallet to load a wallet.
     </message>
     <message>
         <source>Could not commit transaction</source>
-        <translation type="unfinished">Δεν ήταν δυνατή η καταχώρηση της συναλλαγής</translation>
+        <translation type="unfinished">Δεν ήταν δυνατή η ανάληψη συναλλαγής</translation>
     </message>
     <message>
         <source>Signer error</source>
@@ -4004,7 +3022,7 @@ Go to File &gt; Open Wallet to load a wallet.
     </message>
     <message>
         <source>Export the data in the current tab to a file</source>
-        <translation type="unfinished">Εξαγωγή δεδομένων της καρτέλας σε αρχείο</translation>
+        <translation type="unfinished">Εξαγωγή δεδομένων καρτέλας σε αρχείο</translation>
     </message>
     <message>
         <source>Backup Wallet</source>
@@ -4062,6 +3080,14 @@ Go to File &gt; Open Wallet to load a wallet.
         <source>Error reading %s! Transaction data may be missing or incorrect. Rescanning wallet.</source>
         <translation type="unfinished">Σφάλμα ανάγνωσης %s! Τα δεδομένα της συναλλαγής ενδέχεται να είναι ελλειπή ή λανθασμένα. Επανεξέταση πορτοφολιού.</translation>
     </message>
+    <message>
+        <source>Error: Dumpfile format record is incorrect. Got "%s", expected "format".</source>
+        <translation type="unfinished">Σφάλμα: Η καταγραφή του φορμά του αρχείου dump είναι εσφαλμένη. Ελήφθη: «%s», αναμενόταν: «φορμά».</translation>
+    </message>
+    <message>
+        <source>Error: Dumpfile version is not supported. This version of bitcoin-wallet only supports version 1 dumpfiles. Got dumpfile with version %s</source>
+        <translation type="unfinished">Σφάλμα: Η έκδοση του αρχείου dump δεν υποστηρίζεται. Αυτή η έκδοση του bitcoin-wallet υποστηρίζει αρχεία dump μόνο της έκδοσης 1. Δόθηκε αρχείο dump έκδοσης %s.</translation>
+    </message>
     <message>
         <source>File %s already exists. If you are sure this is what you want, move it out of the way first.</source>
         <translation type="unfinished">Το αρχείο %s υπάρχει ήδη. Αν είστε σίγουροι ότι αυτό θέλετε, βγάλτε το πρώτα από τη μέση.</translation>
@@ -4126,10 +3152,6 @@ Go to File &gt; Open Wallet to load a wallet.
         <source>Warning: Private keys detected in wallet {%s} with disabled private keys</source>
         <translation type="unfinished">Προειδοποίηση: Ιδιωτικά κλειδιά εντοπίστηκαν στο πορτοφόλι {%s} με απενεργοποιημένα ιδιωτικά κλειδιά</translation>
     </message>
-    <message>
-        <source>Warning: We do not appear to fully agree with our peers! You may need to upgrade, or other nodes may need to upgrade.</source>
-        <translation type="unfinished">Προειδοποίηση: Δεν φαίνεται να συμφωνούμε πλήρως με τους υπόλοιπους κόμβους! Ίσως χρειάζεται να κάνετε αναβάθμιση, ή ίσως οι άλλοι κόμβοι χρειάζονται αναβάθμιση.</translation>
-    </message>
     <message>
         <source>You need to rebuild the database using -reindex to go back to unpruned mode.  This will redownload the entire blockchain</source>
         <translation type="unfinished">Πρέπει να επαναδημιουργηθεί η βάση δεδομένων με το -reindex για να επιστρέψετε στη λειτουργία χωρίς περικοπή χώρου. Αυτό θα κάνει εκ νέου λήψη ολόκληρου του blockchain</translation>
@@ -4214,10 +3236,6 @@ Unable to restore backup of wallet.</source>
         <source>Block verification was interrupted</source>
         <translation type="unfinished">Η επαλήθευση μπλοκ διακόπηκε</translation>
     </message>
-    <message>
-        <source>Cannot add WalletDescriptor to a non-descriptor wallet</source>
-        <translation type="unfinished">Δεν είναι δυνατή η προσθήκη WalletDescriptor σε πορτοφόλι χωρίς descriptors</translation>
-    </message>
     <message>
         <source>Config setting for %s only applied on %s network when in [%s] section.</source>
         <translation type="unfinished">Η ρύθμιση Config για το %s εφαρμόστηκε μόνο στο δίκτυο %s όταν βρίσκεται στην ενότητα [%s].</translation>
@@ -4254,18 +3272,10 @@ Unable to restore backup of wallet.</source>
         <source>Dump file %s does not exist.</source>
         <translation type="unfinished">Το αρχείο dump %s δεν υπάρχει.</translation>
     </message>
-    <message>
-        <source>Error creating %s</source>
-        <translation type="unfinished">Σφάλμα στη δημιουργία %s</translation>
-    </message>
     <message>
         <source>Error loading %s</source>
         <translation type="unfinished">Σφάλμα κατά τη φόρτωση %s</translation>
     </message>
-    <message>
-        <source>Error loading %s: Private keys can only be disabled during creation</source>
-        <translation type="unfinished">Σφάλμα κατά τη φόρτωση %s: Τα ιδιωτικά κλειδιά μπορούν να απενεργοποιηθούν μόνο κατά τη δημιουργία</translation>
-    </message>
     <message>
         <source>Error loading %s: Wallet corrupted</source>
         <translation type="unfinished">Σφάλμα κατά τη φόρτωση %s: Κατεστραμμένο Πορτοφόλι</translation>
@@ -4346,10 +3356,6 @@ Unable to restore backup of wallet.</source>
         <source>Failed to write block.</source>
         <translation type="unfinished">Αποτυχία εγγραφής block.</translation>
     </message>
-    <message>
-        <source>Failed to write to coin database.</source>
-        <translation type="unfinished">Αποτυχία εγγραφής στη βάση δεδομένων κερμάτων.</translation>
-    </message>
     <message>
         <source>Failed to write undo data.</source>
         <translation type="unfinished">Αποτυχία εγγραφής δεδομένων αναίρεσης.</translation>
@@ -4448,11 +3454,11 @@ Unable to restore backup of wallet.</source>
     </message>
     <message>
         <source>Prune cannot be configured with a negative value.</source>
-        <translation type="unfinished">Η περικοπή χώρου δεν μπορεί να ρυθμιστεί με αρνητική τιμή.</translation>
+        <translation type="unfinished">Ο δακτύλιος δεν μπορεί να ρυθμιστεί με αρνητική τιμή.</translation>
     </message>
     <message>
         <source>Prune mode is incompatible with -txindex.</source>
-        <translation type="unfinished">Η λειτουργία περικοπής δεν είναι συμβατή με το -txindex.</translation>
+        <translation type="unfinished">Η λειτουργία κοπής δεν είναι συμβατή με το -txindex.</translation>
     </message>
     <message>
         <source>Pruning blockstore…</source>
@@ -4516,15 +3522,15 @@ Unable to restore backup of wallet.</source>
     </message>
     <message>
         <source>Specified -walletdir "%s" is not a directory</source>
-        <translation type="unfinished">Η διαδρομή -walletdir "%s" δεν είναι φάκελος</translation>
+        <translation type="unfinished">Το συγκεκριμένο -walletdir "%s" δεν είναι κατάλογος</translation>
     </message>
     <message>
         <source>Specified blocks directory "%s" does not exist.</source>
-        <translation type="unfinished">Δεν υπάρχει ο καθορισμένος φάκελος blocks "%s".</translation>
+        <translation type="unfinished">Δεν υπάρχει κατάλογος καθορισμένων μπλοκ "%s".</translation>
     </message>
     <message>
         <source>Specified data directory "%s" does not exist.</source>
-        <translation type="unfinished">Ο καθορισμένος φάκελος δεδομένων "%s" δεν υπάρχει.</translation>
+        <translation type="unfinished">Ο ορισμένος κατάλογος δεδομένων "%s" δεν υπάρχει.</translation>
     </message>
     <message>
         <source>Starting network threads…</source>
@@ -4542,50 +3548,6 @@ Unable to restore backup of wallet.</source>
         <source>The transaction amount is too small to pay the fee</source>
         <translation type="unfinished">Το ποσό της συναλλαγής είναι πολύ μικρό για να πληρώσει το έξοδο</translation>
     </message>
-    <message>
-        <source>The wallet will avoid paying less than the minimum relay fee.</source>
-        <translation type="unfinished">Το πορτοφόλι θα αποφύγει να πληρώσει λιγότερο από το ελάχιστο έξοδο αναμετάδοσης.</translation>
-    </message>
-    <message>
-        <source>This is experimental software.</source>
-        <translation type="unfinished">Η εφαρμογή είναι σε πειραματικό στάδιο.</translation>
-    </message>
-    <message>
-        <source>This is the minimum transaction fee you pay on every transaction.</source>
-        <translation type="unfinished">Αυτή είναι η ελάχιστη χρέωση συναλλαγής που πληρώνετε για κάθε συναλλαγή.</translation>
-    </message>
-    <message>
-        <source>This is the transaction fee you will pay if you send a transaction.</source>
-        <translation type="unfinished">Αυτή είναι η χρέωση συναλλαγής που θα πληρώσετε εάν στείλετε μια συναλλαγή.</translation>
-    </message>
-    <message>
-        <source>Transaction amount too small</source>
-        <translation type="unfinished">Το ποσό της συναλλαγής είναι πολύ μικρό</translation>
-    </message>
-    <message>
-        <source>Transaction amounts must not be negative</source>
-        <translation type="unfinished">Τα ποσά των συναλλαγών δεν πρέπει να είναι αρνητικά</translation>
-    </message>
-    <message>
-        <source>Transaction must have at least one recipient</source>
-        <translation type="unfinished">Η συναλλαγή πρέπει να έχει τουλάχιστον έναν παραλήπτη</translation>
-    </message>
-    <message>
-        <source>Transaction too large</source>
-        <translation type="unfinished">Η συναλλαγή είναι πολύ μεγάλη</translation>
-    </message>
-    <message>
-        <source>Unable to bind to %s on this computer (bind returned error %s)</source>
-        <translation type="unfinished">Δεν είναι δυνατή η δέσμευση του %s σε αυτόν τον υπολογιστή (η δέσμευση επέστρεψε σφάλμα %s)</translation>
-    </message>
-    <message>
-        <source>Unable to bind to %s on this computer. %s is probably already running.</source>
-        <translation type="unfinished">Δεν είναι δυνατή η δέσμευση του %s σε αυτόν τον υπολογιστή. Το %s πιθανώς ήδη εκτελείται.</translation>
-    </message>
-    <message>
-        <source>Unable to create the PID file '%s': %s</source>
-        <translation type="unfinished">Δεν είναι δυνατή η δημιουργία του PID αρχείου '%s': %s</translation>
-    </message>
     <message>
         <source>Unable to open %s for writing</source>
         <translation type="unfinished">Αδυναμία στο άνοιγμα του %s για εγγραφή</translation>
diff --git a/src/qt/locale/bitcoin_eo.ts b/src/qt/locale/bitcoin_eo.ts
index 53b086a12e5c..98ff923e07bf 100644
--- a/src/qt/locale/bitcoin_eo.ts
+++ b/src/qt/locale/bitcoin_eo.ts
@@ -29,6 +29,10 @@
         <source>Enter address or label to search</source>
         <translation type="unfinished">Tajpu adreson aŭ etikedon por serĉi</translation>
     </message>
+    <message>
+        <source>Copy the currently selected address to the clipboard</source>
+        <translation type="unfinished">Kopii la nune elektita adreso al la tondujo</translation>
+    </message>
     <message>
         <source>Export the data in the current tab to a file</source>
         <translation type="unfinished">Eksporti la datumojn el la aktuala langeto al dosiero</translation>
@@ -481,6 +485,14 @@ Signing is only possible with addresses of the type 'legacy'.</source>
         <extracomment>Label of the input field where the name of the wallet is entered.</extracomment>
         <translation type="unfinished">Monujo-Nomo</translation>
     </message>
+    <message>
+        <source>Invalid Wallet Name</source>
+        <translation type="unfinished">Nevalida monuja nomo</translation>
+    </message>
+    <message>
+        <source>Wallet name cannot be empty</source>
+        <translation type="unfinished">La monuja nomo ne povas esti malplena</translation>
+    </message>
     <message>
         <source>&amp;Window</source>
         <translation type="unfinished">&amp;Fenestro</translation>
@@ -901,6 +913,10 @@ Signing is only possible with addresses of the type 'legacy'.</source>
         <source>Form</source>
         <translation type="unfinished">Formularo</translation>
     </message>
+    <message>
+        <source>Number of blocks left</source>
+        <translation type="unfinished">Nombro de restantaj blokoj</translation>
+    </message>
     <message>
         <source>Last block time</source>
         <translation type="unfinished">Horo de la lasta bloko</translation>
@@ -935,7 +951,7 @@ Signing is only possible with addresses of the type 'legacy'.</source>
     <message>
         <source>Paste address from clipboard</source>
         <extracomment>Tooltip text for button that allows you to paste an address that is in your clipboard.</extracomment>
-        <translation type="unfinished">Alglui adreson de tondejo</translation>
+        <translation type="unfinished">Alglui adreson de tondujo</translation>
     </message>
 </context>
 <context>
@@ -1119,6 +1135,13 @@ Signing is only possible with addresses of the type 'legacy'.</source>
         <source>Close</source>
         <translation type="unfinished">Fermi</translation>
     </message>
+    <message numerus="yes">
+        <source>Signed %n input(s), but more signatures are still required.</source>
+        <translation type="unfinished">
+            <numerusform />
+            <numerusform />
+        </translation>
+    </message>
     <message>
         <source>own address</source>
         <translation type="unfinished">propra adreso</translation>
@@ -1131,6 +1154,13 @@ Signing is only possible with addresses of the type 'legacy'.</source>
         <source>or</source>
         <translation type="unfinished">aŭ</translation>
     </message>
+    <message numerus="yes">
+        <source>Transaction has %n unsigned input(s).</source>
+        <translation type="unfinished">
+            <numerusform />
+            <numerusform />
+        </translation>
+    </message>
     </context>
 <context>
     <name>PaymentServer</name>
@@ -1565,10 +1595,6 @@ Signing is only possible with addresses of the type 'legacy'.</source>
         <source>The amount exceeds your balance.</source>
         <translation type="unfinished">La sumo estas pli granda ol via saldo.</translation>
     </message>
-    <message>
-        <source>The total exceeds your balance when the %1 transaction fee is included.</source>
-        <translation type="unfinished">La sumo kun la %1 krompago estas pli granda ol via saldo.</translation>
-    </message>
     <message>
         <source>Transaction creation failed!</source>
         <translation type="unfinished">Kreo de transakcio fiaskis!</translation>
@@ -2063,10 +2089,6 @@ Signing is only possible with addresses of the type 'legacy'.</source>
         <source>This is a pre-release test build - use at your own risk - do not use for mining or merchant applications</source>
         <translation type="unfinished">Tiu ĉi estas antaŭeldona testa versio - uzu laŭ via propra risko - ne uzu por minado aŭ por aplikaĵoj por vendistoj</translation>
     </message>
-    <message>
-        <source>Warning: We do not appear to fully agree with our peers! You may need to upgrade, or other nodes may need to upgrade.</source>
-        <translation type="unfinished">Averto: ŝajne ni ne tute konsentas kun niaj samtavolanoj! Eble vi devas ĝisdatigi vian klienton, aŭ eble aliaj nodoj faru same.</translation>
-    </message>
     <message>
         <source>default wallet</source>
         <translation type="unfinished">defaŭlta monujo</translation>
diff --git a/src/qt/locale/bitcoin_es.ts b/src/qt/locale/bitcoin_es.ts
index 81891f692108..58013978a736 100644
--- a/src/qt/locale/bitcoin_es.ts
+++ b/src/qt/locale/bitcoin_es.ts
@@ -324,7 +324,7 @@ Solo es posible firmar con direcciones de tipo "legacy".</translation>
     </message>
     <message>
         <source>Enter a Bitcoin address (e.g. %1)</source>
-        <translation type="unfinished">Ingresa una dirección de Bitcoin (Ejemplo: %1)</translation>
+        <translation type="unfinished">Ingresa una dirección de Bitcoin (p. ej., %1)</translation>
     </message>
     <message>
         <source>Unroutable</source>
@@ -358,7 +358,12 @@ Solo es posible firmar con direcciones de tipo "legacy".</translation>
     <message>
         <source>Address Fetch</source>
         <extracomment>Short-lived peer connection type that solicits known addresses from a peer.</extracomment>
-        <translation type="unfinished">Obtención de direcciones</translation>
+        <translation type="unfinished">Recuperación de direcciones</translation>
+    </message>
+    <message>
+        <source>Private Broadcast</source>
+        <extracomment>Short-lived peer connection type that is used for broadcasting privacy-sensitive data.</extracomment>
+        <translation type="unfinished">Transmisión privada</translation>
     </message>
     <message>
         <source>None</source>
@@ -439,7 +444,7 @@ Solo es posible firmar con direcciones de tipo "legacy".</translation>
     </message>
     <message>
         <source>E&amp;xit</source>
-        <translation type="unfinished">S&amp;alir</translation>
+        <translation type="unfinished">&amp;Salir</translation>
     </message>
     <message>
         <source>Quit application</source>
@@ -508,7 +513,7 @@ Solo es posible firmar con direcciones de tipo "legacy".</translation>
     </message>
     <message>
         <source>&amp;Options…</source>
-        <translation type="unfinished">&amp;Opciones...</translation>
+        <translation type="unfinished">&amp;Opciones…</translation>
     </message>
     <message>
         <source>&amp;Encrypt Wallet…</source>
@@ -520,15 +525,15 @@ Solo es posible firmar con direcciones de tipo "legacy".</translation>
     </message>
     <message>
         <source>&amp;Backup Wallet…</source>
-        <translation type="unfinished">&amp;Realizar copia de seguridad del monedero...</translation>
+        <translation type="unfinished">&amp;Realizar copia de seguridad del monedero…</translation>
     </message>
     <message>
         <source>&amp;Change Passphrase…</source>
-        <translation type="unfinished">&amp;Cambiar contraseña...</translation>
+        <translation type="unfinished">&amp;Cambiar frase de contraseña…</translation>
     </message>
     <message>
         <source>Sign &amp;message…</source>
-        <translation type="unfinished">Firmar &amp;mensaje...</translation>
+        <translation type="unfinished">Firmar &amp;mensaje…</translation>
     </message>
     <message>
         <source>Sign messages with your Bitcoin addresses to prove you own them</source>
@@ -536,7 +541,7 @@ Solo es posible firmar con direcciones de tipo "legacy".</translation>
     </message>
     <message>
         <source>&amp;Verify message…</source>
-        <translation type="unfinished">&amp;Verificar mensaje...</translation>
+        <translation type="unfinished">&amp;Verificar mensaje…</translation>
     </message>
     <message>
         <source>Verify messages to ensure they were signed with specified Bitcoin addresses</source>
@@ -562,6 +567,10 @@ Solo es posible firmar con direcciones de tipo "legacy".</translation>
         <source>Close All Wallets…</source>
         <translation type="unfinished">Cerrar todos los monederos...</translation>
     </message>
+    <message>
+        <source>Restore and Migrate Wallet File…</source>
+        <translation type="unfinished">Restaurar y migrar archivo de monedero</translation>
+    </message>
     <message>
         <source>&amp;File</source>
         <translation type="unfinished">&amp;Archivo</translation>
@@ -572,7 +581,7 @@ Solo es posible firmar con direcciones de tipo "legacy".</translation>
     </message>
     <message>
         <source>&amp;Help</source>
-        <translation type="unfinished">&amp;Ayuda</translation>
+        <translation type="unfinished">A&amp;yuda</translation>
     </message>
     <message>
         <source>Tabs toolbar</source>
@@ -596,23 +605,7 @@ Solo es posible firmar con direcciones de tipo "legacy".</translation>
     </message>
     <message>
         <source>Connecting to peers…</source>
-        <translation type="unfinished">Conectando con pares...</translation>
-    </message>
-    <message>
-        <source>Request payments (generates QR codes and bitcoin: URIs)</source>
-        <translation type="unfinished">Solicitar pagos (genera códigos QR y URI de tipo "bitcoin:")</translation>
-    </message>
-    <message>
-        <source>Show the list of used sending addresses and labels</source>
-        <translation type="unfinished">Mostrar la lista de direcciones de envío y etiquetas utilizadas</translation>
-    </message>
-    <message>
-        <source>Show the list of used receiving addresses and labels</source>
-        <translation type="unfinished">Muestra la lista de direcciones de recepción y etiquetas utilizadas</translation>
-    </message>
-    <message>
-        <source>&amp;Command-line options</source>
-        <translation type="unfinished">&amp;Opciones de línea de comandos</translation>
+        <translation type="unfinished">Conectando con sus pares ...</translation>
     </message>
     <message numerus="yes">
         <source>Processed %n block(s) of transaction history.</source>
@@ -623,19 +616,15 @@ Solo es posible firmar con direcciones de tipo "legacy".</translation>
     </message>
     <message>
         <source>%1 behind</source>
-        <translation type="unfinished">%1 detrás</translation>
+        <translation type="unfinished">%1 atrás</translation>
     </message>
     <message>
         <source>Catching up…</source>
-        <translation type="unfinished">Poniéndose al día...</translation>
+        <translation type="unfinished">Actualizando...</translation>
     </message>
     <message>
         <source>Last received block was generated %1 ago.</source>
-        <translation type="unfinished">El último bloque recibido se generó hace %1.</translation>
-    </message>
-    <message>
-        <source>Transactions after this will not yet be visible.</source>
-        <translation type="unfinished">Las transacciones posteriores aún no estarán visibles.</translation>
+        <translation type="unfinished">El último bloque recibido fue generado hace %1 horas.</translation>
     </message>
     <message>
         <source>Warning</source>
@@ -645,13 +634,9 @@ Solo es posible firmar con direcciones de tipo "legacy".</translation>
         <source>Information</source>
         <translation type="unfinished">Información</translation>
     </message>
-    <message>
-        <source>Up to date</source>
-        <translation type="unfinished">Actualizado</translation>
-    </message>
     <message>
         <source>Load Partially Signed Bitcoin Transaction</source>
-        <translation type="unfinished">Cargar transacción de Bitcoin parcialmente firmada</translation>
+        <translation type="unfinished">Cargar una transacción de Bitcoin parcialmente firmada</translation>
     </message>
     <message>
         <source>Load PSBT from &amp;clipboard…</source>
@@ -687,7 +672,7 @@ Solo es posible firmar con direcciones de tipo "legacy".</translation>
     </message>
     <message>
         <source>Open a wallet</source>
-        <translation type="unfinished">Abre un monedero</translation>
+        <translation type="unfinished">Abrir monedero</translation>
     </message>
     <message>
         <source>Close wallet</source>
@@ -751,6 +736,23 @@ Solo es posible firmar con direcciones de tipo "legacy".</translation>
         <extracomment>Label of the input field where the name of the wallet is entered.</extracomment>
         <translation type="unfinished">Nombre del monedero</translation>
     </message>
+    <message>
+        <source>Invalid Wallet Name</source>
+        <translation type="unfinished">Nombre del monedero inválido</translation>
+    </message>
+    <message>
+        <source>Wallet name cannot be empty</source>
+        <translation type="unfinished">El nombre del monedero no puede estar vacío</translation>
+    </message>
+    <message>
+        <source>Restore and Migrate Wallet Backup</source>
+        <translation type="unfinished">Restaurar y migrar copia de seguridad del monedero</translation>
+    </message>
+    <message>
+        <source>Restore and Migrate Wallet</source>
+        <extracomment>Title of pop-up window shown when the user is attempting to restore a wallet.</extracomment>
+        <translation type="unfinished">Restaurar y migrar monedero</translation>
+    </message>
     <message>
         <source>&amp;Window</source>
         <translation type="unfinished">&amp;Ventana</translation>
@@ -907,7 +909,7 @@ Solo es posible firmar con direcciones de tipo "legacy".</translation>
     </message>
     <message>
         <source>After Fee:</source>
-        <translation type="unfinished">Después de la comisión:</translation>
+        <translation type="unfinished">Tras comisión:</translation>
     </message>
     <message>
         <source>Change:</source>
@@ -971,11 +973,11 @@ Solo es posible firmar con direcciones de tipo "legacy".</translation>
     </message>
     <message>
         <source>L&amp;ock unspent</source>
-        <translation type="unfinished">B&amp;loquear salidas no gastadas</translation>
+        <translation type="unfinished">&amp;Bloquear importe no gastado</translation>
     </message>
     <message>
         <source>&amp;Unlock unspent</source>
-        <translation type="unfinished">&amp;Desbloquear lo no gastado</translation>
+        <translation type="unfinished">&amp;Desbloquear importe no gastado</translation>
     </message>
     <message>
         <source>Copy quantity</source>
@@ -987,7 +989,7 @@ Solo es posible firmar con direcciones de tipo "legacy".</translation>
     </message>
     <message>
         <source>Copy after fee</source>
-        <translation type="unfinished">Copiar después de la comisión</translation>
+        <translation type="unfinished">Copiar importe después de comisión</translation>
     </message>
     <message>
         <source>Copy bytes</source>
@@ -1102,6 +1104,24 @@ El proceso de migración creará una copia de seguridad del monedero antes de mi
         <source>Solvable but not watched scripts have been migrated to a new wallet named '%1'.</source>
         <translation type="unfinished">Los scripts solucionables pero no de observación se migraron a un nuevo monedero llamado "%1".</translation>
     </message>
+    <message>
+        <source>Restore and Migrate wallet</source>
+        <translation type="unfinished">Restaurar y migrar monedero</translation>
+    </message>
+    <message>
+        <source>Are you sure you wish to restore the wallet file &lt;i&gt;%1&lt;/i&gt; to &lt;i&gt;%2&lt;/i&gt; and migrate it?</source>
+        <translation type="unfinished">¿Está seguro de que desea restaurar el archivo de monedero &lt;i&gt;%1&lt;/i&gt; a &lt;i&gt;%2&lt;/i&gt; y migrarlo?</translation>
+    </message>
+    <message>
+        <source>Restore Wallet</source>
+        <extracomment>Title of progress window which is displayed when wallets are being restored.</extracomment>
+        <translation type="unfinished">Restaurar monedero</translation>
+    </message>
+    <message>
+        <source>Restoring Wallet &lt;b&gt;%1&lt;/b&gt;…</source>
+        <extracomment>Descriptive text of the restore wallets progress window which indicates to the user that wallets are currently being restored.</extracomment>
+        <translation type="unfinished">Restaurando monedero &lt;b&gt;%1&lt;/b&gt;…</translation>
+    </message>
     <message>
         <source>Migration failed</source>
         <translation type="unfinished">Migración incorrecta</translation>
@@ -1129,7 +1149,7 @@ El proceso de migración creará una copia de seguridad del monedero antes de mi
     <message>
         <source>Opening Wallet &lt;b&gt;%1&lt;/b&gt;…</source>
         <extracomment>Descriptive text of the open wallet progress window which indicates to the user which wallet is currently being opened.</extracomment>
-        <translation type="unfinished">Abriendo monedero &lt;b&gt;%1&lt;/b&gt;...</translation>
+        <translation type="unfinished">Abriendo monedero &lt;b&gt;%1&lt;/b&gt;…</translation>
     </message>
 </context>
 <context>
@@ -1226,8 +1246,8 @@ El proceso de migración creará una copia de seguridad del monedero antes de mi
         <translation type="unfinished">Deshabilitar claves privadas</translation>
     </message>
     <message>
-        <source>Make a blank wallet. Blank wallets do not initially have private keys or scripts. Private keys and addresses can be imported, or an HD seed can be set, at a later time.</source>
-        <translation type="unfinished">Crear un monedero vacío. Los monederos vacíos inicialmente no tienen claves privadas ni scripts. Las claves privadas y direcciones pueden importarse, o puede establecerse una semilla HD posteriormente.</translation>
+        <source>Make a blank wallet. Blank wallets do not initially have private keys or scripts. Private keys and addresses can be imported using descriptors at a later time.</source>
+        <translation type="unfinished">Crear un monedero vacío. Monederos vacíos no tienen claves privadas ni scripts . Claves privadas y direcciones pueden importarse usando descriptores más tarde.</translation>
     </message>
     <message>
         <source>Make Blank Wallet</source>
@@ -1248,7 +1268,7 @@ El proceso de migración creará una copia de seguridad del monedero antes de mi
     <message>
         <source>Compiled without external signing support (required for external signing)</source>
         <extracomment>"External signing" means using devices such as hardware wallets.</extracomment>
-        <translation type="unfinished">Compilado sin compatibilidad con firmante externo (se requiere para la firma externa)</translation>
+        <translation type="unfinished">Compilado sin compatibilidad con firma externa (se requiere para la firma externa)</translation>
     </message>
 </context>
 <context>
@@ -1287,7 +1307,7 @@ El proceso de migración creará una copia de seguridad del monedero antes de mi
     </message>
     <message>
         <source>The entered address "%1" is not a valid Bitcoin address.</source>
-        <translation type="unfinished">La dirección introducida "%1" no es una dirección de Bitcoin válida.</translation>
+        <translation type="unfinished">La dirección introducida "%1" no es una dirección Bitcoin válida.</translation>
     </message>
     <message>
         <source>Address "%1" already exists as a receiving address with label "%2" and so cannot be added as a sending address.</source>
@@ -1299,7 +1319,7 @@ El proceso de migración creará una copia de seguridad del monedero antes de mi
     </message>
     <message>
         <source>Could not unlock wallet.</source>
-        <translation type="unfinished">No se pudo desbloquear el monedero.</translation>
+        <translation type="unfinished">No se ha podido desbloquear el monedero.</translation>
     </message>
     <message>
         <source>New key generation failed.</source>
@@ -1791,7 +1811,7 @@ El proceso de migración creará una copia de seguridad del monedero antes de mi
     <message>
         <source>Compiled without external signing support (required for external signing)</source>
         <extracomment>"External signing" means using devices such as hardware wallets.</extracomment>
-        <translation type="unfinished">Compilado sin compatibilidad con firmante externo (se requiere para la firma externa)</translation>
+        <translation type="unfinished">Compilado sin compatibilidad con firma externa (se requiere para la firma externa)</translation>
     </message>
     <message>
         <source>default</source>
@@ -1907,22 +1927,22 @@ El proceso de migración creará una copia de seguridad del monedero antes de mi
     </message>
     <message>
         <source>Privacy mode activated for the Overview tab. To unmask the values, uncheck Settings-&gt;Mask values.</source>
-        <translation type="unfinished">Modo de privacidad activado en la pestaña de vista general. Para mostrar los valores, desmarca "Configuración -&gt; Ocultar valores".</translation>
+        <translation type="unfinished">Modo de privacidad activado para la pestaña de vista general. Para mostrar los valores, anula la selección de "Configuración-&gt;Ocultar valores".</translation>
     </message>
 </context>
 <context>
     <name>PSBTOperationsDialog</name>
     <message>
         <source>PSBT Operations</source>
-        <translation type="unfinished">Operaciones de PSBT</translation>
+        <translation type="unfinished">Operaciones de TBPF</translation>
     </message>
     <message>
         <source>Sign Tx</source>
-        <translation type="unfinished">Firmar Tx</translation>
+        <translation type="unfinished">Firmar transacción</translation>
     </message>
     <message>
         <source>Broadcast Tx</source>
-        <translation type="unfinished">Emitir Tx</translation>
+        <translation type="unfinished">Transmitir transacción</translation>
     </message>
     <message>
         <source>Copy to Clipboard</source>
@@ -1938,11 +1958,11 @@ El proceso de migración creará una copia de seguridad del monedero antes de mi
     </message>
     <message>
         <source>Failed to load transaction: %1</source>
-        <translation type="unfinished">Error al cargar la transacción: %1</translation>
+        <translation type="unfinished">Error en la carga de transacción: %1</translation>
     </message>
     <message>
         <source>Failed to sign transaction: %1</source>
-        <translation type="unfinished">Error al firmar la transacción: %1</translation>
+        <translation type="unfinished">Error en la firma de transacción: %1</translation>
     </message>
     <message>
         <source>Cannot sign inputs while wallet is locked.</source>
@@ -1950,15 +1970,18 @@ El proceso de migración creará una copia de seguridad del monedero antes de mi
     </message>
     <message>
         <source>Could not sign any more inputs.</source>
-        <translation type="unfinished">No se pudo firmar más entradas.</translation>
+        <translation type="unfinished">No se han podido firmar más entradas.</translation>
     </message>
-    <message>
-        <source>Signed %1 inputs, but more signatures are still required.</source>
-        <translation type="unfinished">Se han firmado %1 entradas, pero aún se requieren más firmas.</translation>
+    <message numerus="yes">
+        <source>Signed %n input(s), but more signatures are still required.</source>
+        <translation type="unfinished">
+            <numerusform />
+            <numerusform />
+        </translation>
     </message>
     <message>
         <source>Signed transaction successfully. Transaction is ready to broadcast.</source>
-        <translation type="unfinished">Se ha firmado correctamente. La transacción está lista para difundirse.</translation>
+        <translation type="unfinished">La transacción se ha firmado correctamente y está lista para transmitirse.</translation>
     </message>
     <message>
         <source>Unknown error processing transaction.</source>
@@ -1966,15 +1989,15 @@ El proceso de migración creará una copia de seguridad del monedero antes de mi
     </message>
     <message>
         <source>Transaction broadcast successfully! Transaction ID: %1</source>
-        <translation type="unfinished">La transacción se transmitió correctamente. ID de la transacción: %1</translation>
+        <translation type="unfinished">¡La transacción se ha transmitido correctamente! Identificador de transacción: %1</translation>
     </message>
     <message>
         <source>Transaction broadcast failed: %1</source>
-        <translation type="unfinished">Ha habido un error en la difusión de la transacción: %1</translation>
+        <translation type="unfinished">Error al transmitir la transacción: %1</translation>
     </message>
     <message>
         <source>PSBT copied to clipboard.</source>
-        <translation type="unfinished">PSBT copiada al portapapeles.</translation>
+        <translation type="unfinished">TBPF copiada al portapapeles.</translation>
     </message>
     <message>
         <source>Save Transaction Data</source>
@@ -1983,11 +2006,11 @@ El proceso de migración creará una copia de seguridad del monedero antes de mi
     <message>
         <source>Partially Signed Transaction (Binary)</source>
         <extracomment>Expanded name of the binary PSBT file format. See: BIP 174.</extracomment>
-        <translation type="unfinished">Transacción parcialmente firmada (binaria)</translation>
+        <translation type="unfinished">Transacción parcialmente firmada (binario)</translation>
     </message>
     <message>
         <source>PSBT saved to disk.</source>
-        <translation type="unfinished">PSBT guardada en disco.</translation>
+        <translation type="unfinished">TBPF guardada en disco.</translation>
     </message>
     <message>
         <source>Sends %1 to %2</source>
@@ -1999,11 +2022,11 @@ El proceso de migración creará una copia de seguridad del monedero antes de mi
     </message>
     <message>
         <source>Unable to calculate transaction fee or total transaction amount.</source>
-        <translation type="unfinished">No se puede calcular la comisión o el importe total de la transacción.</translation>
+        <translation type="unfinished">No se ha podido calcular la comisión de transacción o la totalidad del importe de la transacción.</translation>
     </message>
     <message>
         <source>Pays transaction fee: </source>
-        <translation type="unfinished">Paga la comisión de transacción:</translation>
+        <translation type="unfinished">Pagar comisión de transacción:</translation>
     </message>
     <message>
         <source>Total Amount</source>
@@ -2013,13 +2036,16 @@ El proceso de migración creará una copia de seguridad del monedero antes de mi
         <source>or</source>
         <translation type="unfinished">o</translation>
     </message>
-    <message>
-        <source>Transaction has %1 unsigned inputs.</source>
-        <translation type="unfinished">La transacción tiene %1 entradas no firmadas.</translation>
+    <message numerus="yes">
+        <source>Transaction has %n unsigned input(s).</source>
+        <translation type="unfinished">
+            <numerusform />
+            <numerusform />
+        </translation>
     </message>
     <message>
         <source>Transaction is missing some information about inputs.</source>
-        <translation type="unfinished">Falta alguna información sobre las entradas de la transacción.</translation>
+        <translation type="unfinished">A la transacción le falta información sobre entradas.</translation>
     </message>
     <message>
         <source>Transaction still needs signature(s).</source>
@@ -2027,19 +2053,19 @@ El proceso de migración creará una copia de seguridad del monedero antes de mi
     </message>
     <message>
         <source>(But no wallet is loaded.)</source>
-        <translation type="unfinished">(No existe ningún monedero cargado.)</translation>
+        <translation type="unfinished">(No hay ningún monedero cargado).</translation>
     </message>
     <message>
         <source>(But this wallet cannot sign transactions.)</source>
-        <translation type="unfinished">(Este monedero no puede firmar transacciones.)</translation>
+        <translation type="unfinished">(Este monedero no puede firmar transacciones).</translation>
     </message>
     <message>
         <source>(But this wallet does not have the right keys.)</source>
-        <translation type="unfinished">(Este monedero no tiene las claves adecuadas.)</translation>
+        <translation type="unfinished">(Este monedero no tiene las claves adecuadas).</translation>
     </message>
     <message>
         <source>Transaction is fully signed and ready for broadcast.</source>
-        <translation type="unfinished">La transacción se ha firmado correctamente y está lista para difundirse.</translation>
+        <translation type="unfinished">La transacción se ha firmado completamente y está lista para transmitirse.</translation>
     </message>
     <message>
         <source>Transaction status is unknown.</source>
@@ -2054,7 +2080,7 @@ El proceso de migración creará una copia de seguridad del monedero antes de mi
     </message>
     <message>
         <source>Cannot start bitcoin: click-to-pay handler</source>
-        <translation type="unfinished">No se puede iniciar Bitcoin: controlador de pago en un clic</translation>
+        <translation type="unfinished">No se puede iniciar el controlador "bitcoin: click-to-pay"</translation>
     </message>
     <message>
         <source>URI handling</source>
@@ -2068,17 +2094,17 @@ El proceso de migración creará una copia de seguridad del monedero antes de mi
         <source>Cannot process payment request because BIP70 is not supported.
 Due to widespread security flaws in BIP70 it's strongly recommended that any merchant instructions to switch wallets be ignored.
 If you are receiving this error you should request the merchant provide a BIP21 compatible URI.</source>
-        <translation type="unfinished">No se puede procesar la solicitud de pago debido a que no se mantiene BIP70.
-Debido a los fallos de seguridad generalizados en el BIP70, se recomienda encarecidamente ignorar las instrucciones del comerciante para cambiar de monedero.
-Si recibe este error, debe solicitar al comerciante que le proporcione un URI compatible con BIP21.</translation>
+        <translation type="unfinished">No se puede procesar la solicitud de pago porque no existe compatibilidad con BIP70.
+Debido a los fallos de seguridad generalizados en BIP70, se recomienda encarecidamente ignorar las instrucciones del comerciante para cambiar de monedero.
+Si recibes este error, debes solicitar al comerciante que te proporcione un URI compatible con BIP21.</translation>
     </message>
     <message>
         <source>URI cannot be parsed! This can be caused by an invalid Bitcoin address or malformed URI parameters.</source>
-        <translation type="unfinished">¡No se puede interpretar la URI! Esto puede deberse a una dirección Bitcoin inválida o a parámetros de URI mal formados.</translation>
+        <translation type="unfinished">No se puede analizar el URI. Esto se puede deber a una dirección de Bitcoin inválida o a parámetros de URI con formato incorrecto.</translation>
     </message>
     <message>
         <source>Payment request file handling</source>
-        <translation type="unfinished">Gestión del archivo de solicitud de pago</translation>
+        <translation type="unfinished">Gestión de archivos de solicitud de pago</translation>
     </message>
 </context>
 <context>
@@ -2086,17 +2112,17 @@ Si recibe este error, debe solicitar al comerciante que le proporcione un URI co
     <message>
         <source>User Agent</source>
         <extracomment>Title of Peers Table column which contains the peer's User Agent string.</extracomment>
-        <translation type="unfinished">Agente del usuario</translation>
+        <translation type="unfinished">Agente de usuario</translation>
     </message>
     <message>
         <source>Peer</source>
         <extracomment>Title of Peers Table column which contains a unique number used to identify a connection.</extracomment>
-        <translation type="unfinished">Pareja</translation>
+        <translation type="unfinished">Par</translation>
     </message>
     <message>
         <source>Age</source>
         <extracomment>Title of Peers Table column which indicates the duration (length of time) since the peer connection started.</extracomment>
-        <translation type="unfinished">Duración</translation>
+        <translation type="unfinished">Antigüedad</translation>
     </message>
     <message>
         <source>Direction</source>
@@ -2191,7 +2217,7 @@ Si recibe este error, debe solicitar al comerciante que le proporcione un URI co
     </message>
     <message>
         <source>To specify a non-default location of the data directory use the '%1' option.</source>
-        <translation type="unfinished">Para especificar un lugar personalizado del directorio de datos, utiliza la opción "%1".</translation>
+        <translation type="unfinished">Para especificar una localización personalizada del directorio de datos, usa la opción "%1".</translation>
     </message>
     <message>
         <source>Blocksdir</source>
@@ -2239,7 +2265,7 @@ Si recibe este error, debe solicitar al comerciante que le proporcione un URI co
     </message>
     <message>
         <source>Memory usage</source>
-        <translation type="unfinished">Memoria utilizada</translation>
+        <translation type="unfinished">Uso de memoria</translation>
     </message>
     <message>
         <source>Wallet: </source>
@@ -2301,10 +2327,6 @@ Si recibe este error, debe solicitar al comerciante que le proporcione un URI co
         <source>Transaction Relay</source>
         <translation type="unfinished">Retransmisión de transacciones</translation>
     </message>
-    <message>
-        <source>Starting Block</source>
-        <translation type="unfinished">Bloque de inicio</translation>
-    </message>
     <message>
         <source>Synced Headers</source>
         <translation type="unfinished">Encabezados sincronizados</translation>
@@ -2328,7 +2350,7 @@ Si recibe este error, debe solicitar al comerciante que le proporcione un URI co
     <message>
         <source>Whether we relay addresses to this peer.</source>
         <extracomment>Tooltip text for the Address Relay field in the peer details area, which displays whether we relay addresses to this peer (Yes/No).</extracomment>
-        <translation type="unfinished">Establecer si retransmitimos las direcciones a este par.</translation>
+        <translation type="unfinished">Si retransmitimos las direcciones a este par.</translation>
     </message>
     <message>
         <source>Address Relay</source>
@@ -2338,12 +2360,12 @@ Si recibe este error, debe solicitar al comerciante que le proporcione un URI co
     <message>
         <source>The total number of addresses received from this peer that were processed (excludes addresses that were dropped due to rate-limiting).</source>
         <extracomment>Tooltip text for the Addresses Processed field in the peer details area, which displays the total number of addresses received from this peer that were processed (excludes addresses that were dropped due to rate-limiting).</extracomment>
-        <translation type="unfinished">El número total de direcciones recibidas desde este par que se procesaron (excluye las direcciones desestimadas debido a la limitación de volumen).</translation>
+        <translation type="unfinished">El número total de direcciones recibidas desde este par que han sido procesadas (excluyendo las direcciones que han sido desestimadas debido a la limitación de volumen).</translation>
     </message>
     <message>
         <source>The total number of addresses received from this peer that were dropped (not processed) due to rate-limiting.</source>
         <extracomment>Tooltip text for the Addresses Rate-Limited field in the peer details area, which displays the total number of addresses received from this peer that were dropped (not processed) due to rate-limiting.</extracomment>
-        <translation type="unfinished">El número total de direcciones recibidas desde este par que se desestimaron (no se procesaron) debido a la limitación de volumen.</translation>
+        <translation type="unfinished">El número total de direcciones recibidas desde este par que han sido desestimadas (no procesadas) debido a la limitación de volumen.</translation>
     </message>
     <message>
         <source>Addresses Processed</source>
@@ -2353,11 +2375,11 @@ Si recibe este error, debe solicitar al comerciante que le proporcione un URI co
     <message>
         <source>Addresses Rate-Limited</source>
         <extracomment>Text title for the Addresses Rate-Limited field in the peer details area, which displays the total number of addresses received from this peer that were dropped (not processed) due to rate-limiting.</extracomment>
-        <translation type="unfinished">Direcciones omitidas por limitación de volumen</translation>
+        <translation type="unfinished">Direcciones desestimadas por limitación de volumen</translation>
     </message>
     <message>
         <source>User Agent</source>
-        <translation type="unfinished">Agente del usuario</translation>
+        <translation type="unfinished">Agente de usuario</translation>
     </message>
     <message>
         <source>Node window</source>
@@ -2369,15 +2391,15 @@ Si recibe este error, debe solicitar al comerciante que le proporcione un URI co
     </message>
     <message>
         <source>Open the %1 debug log file from the current data directory. This can take a few seconds for large log files.</source>
-        <translation type="unfinished">Abrir el archivo de registro de depuración %1 en el directorio de datos actual. Esto puede tardar unos segundos para los archivos de registro grandes.</translation>
+        <translation type="unfinished">Abre el archivo de registro de depuración %1 del directorio de datos actual. Esto puede tomar unos segundos para archivos de registro grandes.</translation>
     </message>
     <message>
         <source>Decrease font size</source>
-        <translation type="unfinished">Disminuir tamaño de fuente</translation>
+        <translation type="unfinished">Reducir el tamaño de la fuente</translation>
     </message>
     <message>
         <source>Increase font size</source>
-        <translation type="unfinished">Aumentar tamaño de fuente</translation>
+        <translation type="unfinished">Aumentar el tamaño de la fuente</translation>
     </message>
     <message>
         <source>Permissions</source>
@@ -2385,11 +2407,11 @@ Si recibe este error, debe solicitar al comerciante que le proporcione un URI co
     </message>
     <message>
         <source>The direction and type of peer connection: %1</source>
-        <translation type="unfinished">La dirección y el tipo de conexión entre pares: %1</translation>
+        <translation type="unfinished">El sentido y el tipo de conexión entre pares: %1</translation>
     </message>
     <message>
         <source>Direction/Type</source>
-        <translation type="unfinished">Dirección/Tipo</translation>
+        <translation type="unfinished">Sentido/Tipo</translation>
     </message>
     <message>
         <source>The BIP324 session ID string in hex.</source>
@@ -2405,11 +2427,11 @@ Si recibe este error, debe solicitar al comerciante que le proporcione un URI co
     </message>
     <message>
         <source>High bandwidth BIP152 compact block relay: %1</source>
-        <translation type="unfinished">Retransmisión de bloques compactos BIP152 en ancho de banda alto: %1</translation>
+        <translation type="unfinished">Retransmisión de bloques compactos BIP152 en banda ancha: %1</translation>
     </message>
     <message>
         <source>High Bandwidth</source>
-        <translation type="unfinished">Ancho de banda alto</translation>
+        <translation type="unfinished">Banda ancha</translation>
     </message>
     <message>
         <source>Connection Time</source>
@@ -2515,13 +2537,18 @@ Si recibe este error, debe solicitar al comerciante que le proporcione un URI co
     <message>
         <source>Outbound Feeler: short-lived, for testing addresses</source>
         <extracomment>Explanatory text for a short-lived outbound peer connection that is used to test the aliveness of known addresses.</extracomment>
-        <translation type="unfinished">Sensor saliente: de duración breve para probar direcciones</translation>
+        <translation type="unfinished">Sensor saliente: de corta duración para probar direcciones</translation>
     </message>
     <message>
         <source>Outbound Address Fetch: short-lived, for soliciting addresses</source>
         <extracomment>Explanatory text for a short-lived outbound peer connection that is used to request addresses from a peer.</extracomment>
         <translation type="unfinished">Recuperación de direcciones saliente: de corta duración para solicitar direcciones</translation>
     </message>
+    <message>
+        <source>Private broadcast: short-lived, for broadcasting privacy-sensitive transactions</source>
+        <extracomment>Explanatory text for a short-lived outbound peer connection that is used to broadcast privacy-sensitive data (like our transactions).</extracomment>
+        <translation type="unfinished">Transmisión privada: de corta duración, para transmitir transacciones sensibles en materia de privacidad.</translation>
+    </message>
     <message>
         <source>detecting: peer could be v1 or v2</source>
         <extracomment>Explanatory text for "detecting" transport type.</extracomment>
@@ -2543,7 +2570,7 @@ Si recibe este error, debe solicitar al comerciante que le proporcione un URI co
     </message>
     <message>
         <source>the peer selected us for high bandwidth relay</source>
-        <translation type="unfinished">El par nos seleccionó para la retransmisión en ancho de banda alto</translation>
+        <translation type="unfinished">el par nos seleccionó para la retransmisión de gran ancho de banda</translation>
     </message>
     <message>
         <source>no high bandwidth relay selected</source>
@@ -2702,11 +2729,11 @@ Para obtener más información sobre cómo usar esta consola, escribe %6.
     </message>
     <message>
         <source>Clear all fields of the form.</source>
-        <translation type="unfinished">Borrar todos los campos del formulario.</translation>
+        <translation type="unfinished">Vaciar todos los campos del formulario.</translation>
     </message>
     <message>
         <source>Clear</source>
-        <translation type="unfinished">Borrar</translation>
+        <translation type="unfinished">Vaciar</translation>
     </message>
     <message>
         <source>Requested payments history</source>
@@ -2748,10 +2775,6 @@ Para obtener más información sobre cómo usar esta consola, escribe %6.
         <source>Copy &amp;amount</source>
         <translation type="unfinished">Copiar &amp;importe</translation>
     </message>
-    <message>
-        <source>Base58 (Legacy)</source>
-        <translation type="unfinished">Base58 (Heredada)</translation>
-    </message>
     <message>
         <source>Not recommended due to higher fees and less protection against typos.</source>
         <translation type="unfinished">No se recomienda debido a las altas comisiones y la poca protección contra errores tipográficos.</translation>
@@ -2947,7 +2970,7 @@ Para obtener más información sobre cómo usar esta consola, escribe %6.
     </message>
     <message>
         <source>Clear all fields of the form.</source>
-        <translation type="unfinished">Borrar todos los campos del formulario.</translation>
+        <translation type="unfinished">Vaciar todos los campos del formulario.</translation>
     </message>
     <message>
         <source>Inputs…</source>
@@ -2995,7 +3018,7 @@ Nota: Dado que la comisión se calcula por byte, una tasa de "100 satoshis por k
     </message>
     <message>
         <source>Clear &amp;All</source>
-        <translation type="unfinished">Borrar &amp;todo</translation>
+        <translation type="unfinished">Vaciar &amp;todo</translation>
     </message>
     <message>
         <source>Balance:</source>
@@ -3023,7 +3046,7 @@ Nota: Dado que la comisión se calcula por byte, una tasa de "100 satoshis por k
     </message>
     <message>
         <source>Copy after fee</source>
-        <translation type="unfinished">Copiar tras comisión</translation>
+        <translation type="unfinished">Copiar importe después de comisión</translation>
     </message>
     <message>
         <source>Copy bytes</source>
@@ -3128,7 +3151,7 @@ Nota: Dado que la comisión se calcula por byte, una tasa de "100 satoshis por k
     <message>
         <source>Please, review your transaction. You can create and send this transaction or create a Partially Signed Bitcoin Transaction (PSBT), which you can save or copy and then sign with, e.g., an offline %1 wallet, or a PSBT-compatible hardware wallet.</source>
         <extracomment>Text to inform a user attempting to create a transaction of their current options. At this stage, a user can send their transaction or create a PSBT. This string is displayed when both private keys and PSBT controls are enabled.</extracomment>
-        <translation type="unfinished">Revisa la transacción. Puedes crear y enviar esta transacción de Bitcoin parcialmente firmada (PSBT), que además puedes guardar o copiar y, luego, firmar; por ejemplo, con un monedero %1 sin conexión o un monedero de hardware compatible con PSBT.</translation>
+        <translation type="unfinished">Revisa la transacción. Puedes crear y enviar esta transacción o crear una transacción de Bitcoin parcialmente firmada (PSBT), que además puedes guardar o copiar y, luego, firmar; por ejemplo, con un monedero %1 sin conexión o un monedero de hardware compatible con PSBT.</translation>
     </message>
     <message>
         <source>Please, review your transaction.</source>
@@ -3155,11 +3178,11 @@ Nota: Dado que la comisión se calcula por byte, una tasa de "100 satoshis por k
     </message>
     <message>
         <source>The PSBT has been copied to the clipboard. You can also save it.</source>
-        <translation type="unfinished">Se copió la  PSBT al portapapeles. También puedes guardarla.</translation>
+        <translation type="unfinished">Se copió la PSBT al portapapeles. También puedes guardarla.</translation>
     </message>
     <message>
         <source>PSBT saved to disk</source>
-        <translation type="unfinished"> PSBT guardada en disco</translation>
+        <translation type="unfinished">PSBT guardada en disco</translation>
     </message>
     <message>
         <source>Confirm send coins</source>
@@ -3177,13 +3200,9 @@ Nota: Dado que la comisión se calcula por byte, una tasa de "100 satoshis por k
         <source>The amount exceeds your balance.</source>
         <translation type="unfinished">El importe sobrepasa el saldo.</translation>
     </message>
-    <message>
-        <source>The total exceeds your balance when the %1 transaction fee is included.</source>
-        <translation type="unfinished">El total sobrepasa el saldo cuando se incluye la comisión de transacción de %1.</translation>
-    </message>
     <message>
         <source>Duplicate address found: addresses should only be used once each.</source>
-        <translation type="unfinished">Se encontró una dirección duplicada: las direcciones solo se deben usar una vez.</translation>
+        <translation type="unfinished">Se ha encontrado una dirección duplicada: las direcciones solo se deben usar una vez.</translation>
     </message>
     <message>
         <source>Transaction creation failed!</source>
@@ -3363,11 +3382,11 @@ Nota: Dado que la comisión se calcula por byte, una tasa de "100 satoshis por k
     </message>
     <message>
         <source>The signature given when the message was signed</source>
-        <translation type="unfinished">La firma proporcionada cuando se firmó el mensaje</translation>
+        <translation type="unfinished">La firma proporcionada cuando el mensaje fue firmado</translation>
     </message>
     <message>
         <source>Verify the message to ensure it was signed with the specified Bitcoin address</source>
-        <translation type="unfinished">Verifica el mensaje para asegurarte de que se firmó con la dirección de Bitcoin especificada</translation>
+        <translation type="unfinished">Verifica el mensaje para asegurarte de que se firmó con la dirección de Bitcoin especificada.</translation>
     </message>
     <message>
         <source>Verify &amp;Message</source>
@@ -3379,7 +3398,7 @@ Nota: Dado que la comisión se calcula por byte, una tasa de "100 satoshis por k
     </message>
     <message>
         <source>Click "Sign Message" to generate signature</source>
-        <translation type="unfinished">Haz clic en "Firmar mensaje" para generar una firma</translation>
+        <translation type="unfinished">Hacer clic en "Firmar mensaje" para generar una firma</translation>
     </message>
     <message>
         <source>The entered address is invalid.</source>
@@ -3395,7 +3414,7 @@ Nota: Dado que la comisión se calcula por byte, una tasa de "100 satoshis por k
     </message>
     <message>
         <source>Wallet unlock was cancelled.</source>
-        <translation type="unfinished">Se canceló el desbloqueo del monedero.</translation>
+        <translation type="unfinished">Se ha cancelado el desbloqueo del monedero. </translation>
     </message>
     <message>
         <source>No error</source>
@@ -3415,7 +3434,7 @@ Nota: Dado que la comisión se calcula por byte, una tasa de "100 satoshis por k
     </message>
     <message>
         <source>The signature could not be decoded.</source>
-        <translation type="unfinished">La firma no pudo decodificarse.</translation>
+        <translation type="unfinished">La firma no ha podido decodificarse.</translation>
     </message>
     <message>
         <source>Please check the signature and try again.</source>
@@ -3423,7 +3442,7 @@ Nota: Dado que la comisión se calcula por byte, una tasa de "100 satoshis por k
     </message>
     <message>
         <source>The signature did not match the message digest.</source>
-        <translation type="unfinished">La firma no coincide con la huella digital del mensaje.</translation>
+        <translation type="unfinished">La firma no coincide con la síntesis del mensaje.</translation>
     </message>
     <message>
         <source>Message verification failed.</source>
@@ -3727,7 +3746,7 @@ Nota: Dado que la comisión se calcula por byte, una tasa de "100 satoshis por k
     </message>
     <message>
         <source>Last month</source>
-        <translation type="unfinished">Mes pasado</translation>
+        <translation type="unfinished">El mes pasado </translation>
     </message>
     <message>
         <source>This year</source>
@@ -3747,7 +3766,7 @@ Nota: Dado que la comisión se calcula por byte, una tasa de "100 satoshis por k
     </message>
     <message>
         <source>Other</source>
-        <translation type="unfinished">Otro</translation>
+        <translation type="unfinished">Otra</translation>
     </message>
     <message>
         <source>Enter address, transaction id, or label to search</source>
@@ -3817,7 +3836,7 @@ Nota: Dado que la comisión se calcula por byte, una tasa de "100 satoshis por k
     </message>
     <message>
         <source>Confirmed</source>
-        <translation type="unfinished">Confirmado</translation>
+        <translation type="unfinished">Confirmada</translation>
     </message>
     <message>
         <source>Date</source>
@@ -3845,7 +3864,7 @@ Nota: Dado que la comisión se calcula por byte, una tasa de "100 satoshis por k
     </message>
     <message>
         <source>There was an error trying to save the transaction history to %1.</source>
-        <translation type="unfinished">Ocurrió un error al intentar guardar el historial de transacciones en %1.</translation>
+        <translation type="unfinished">Ha ocurrido un error al intentar guardar el historial de transacciones en %1.</translation>
     </message>
     <message>
         <source>Exporting Successful</source>
@@ -3853,7 +3872,7 @@ Nota: Dado que la comisión se calcula por byte, una tasa de "100 satoshis por k
     </message>
     <message>
         <source>The transaction history was successfully saved to %1.</source>
-        <translation type="unfinished">El historial de transacciones se guardó correctamente en %1.</translation>
+        <translation type="unfinished">El historial de transacciones ha sido guardado exitosamente en %1</translation>
     </message>
     <message>
         <source>Range:</source>
@@ -3870,17 +3889,17 @@ Nota: Dado que la comisión se calcula por byte, una tasa de "100 satoshis por k
         <source>No wallet has been loaded.
 Go to File &gt; Open Wallet to load a wallet.
 - OR -</source>
-        <translation type="unfinished">No se cargó ningún monedero.
-Ir a "Archivo &gt; Abrir monedero" para cargar uno.
+        <translation type="unfinished">No se ha cargado ningún monedero.
+Ve a "Archivo &gt; Abrir monedero" para cargar uno.
 - O -</translation>
     </message>
     <message>
         <source>Create a new wallet</source>
-        <translation type="unfinished">Crea un monedero nuevo</translation>
+        <translation type="unfinished">Crear monedero nuevo</translation>
     </message>
     <message>
         <source>Unable to decode PSBT from clipboard (invalid base64)</source>
-        <translation type="unfinished">No se puede decodificar la  PSBT desde el portapapeles (Base64 inválida)</translation>
+        <translation type="unfinished">No se puede decodificar la TBPF desde el portapapeles (Base64 inválida)</translation>
     </message>
     <message>
         <source>Load Transaction Data</source>
@@ -3892,11 +3911,11 @@ Ir a "Archivo &gt; Abrir monedero" para cargar uno.
     </message>
     <message>
         <source>PSBT file must be smaller than 100 MiB</source>
-        <translation type="unfinished">El archivo de la  PSBT debe ser inferior a 100 MiB</translation>
+        <translation type="unfinished">El archivo de la TBPF debe ser inferior a 100 MiB</translation>
     </message>
     <message>
         <source>Unable to decode PSBT</source>
-        <translation type="unfinished">No es posible descodificar la  PSBT</translation>
+        <translation type="unfinished">No es posible descodificar la TBPF</translation>
     </message>
 </context>
 <context>
@@ -3907,16 +3926,16 @@ Ir a "Archivo &gt; Abrir monedero" para cargar uno.
     </message>
     <message>
         <source>Fee bump error</source>
-        <translation type="unfinished">Error al incrementar la comisión</translation>
+        <translation type="unfinished">Error de incremento de comisión</translation>
     </message>
     <message>
         <source>Increasing transaction fee failed</source>
-        <translation type="unfinished">No se pudo aumentar la comisión de transacción</translation>
+        <translation type="unfinished">Fallo al incrementar la comisión de transacción</translation>
     </message>
     <message>
         <source>Do you want to increase the fee?</source>
         <extracomment>Asks a user if they would like to manually increase the fee of a transaction that has already been created.</extracomment>
-        <translation type="unfinished">¿Quieres aumentar la comisión?</translation>
+        <translation type="unfinished">¿Deseas incrementar la comisión?</translation>
     </message>
     <message>
         <source>Current fee:</source>
@@ -3944,11 +3963,11 @@ Ir a "Archivo &gt; Abrir monedero" para cargar uno.
     </message>
     <message>
         <source>PSBT copied</source>
-        <translation type="unfinished"> PSBT copiada </translation>
+        <translation type="unfinished">TBPF copiada </translation>
     </message>
     <message>
         <source>Fee-bump PSBT copied to clipboard</source>
-        <translation type="unfinished"> PSBT con incremento de comisión copiada en el portapapeles</translation>
+        <translation type="unfinished">PSBT con incremento de comisión copiada en el portapapeles</translation>
     </message>
     <message>
         <source>Can't sign transaction.</source>
@@ -3956,7 +3975,7 @@ Ir a "Archivo &gt; Abrir monedero" para cargar uno.
     </message>
     <message>
         <source>Could not commit transaction</source>
-        <translation type="unfinished">No se pudo confirmar la transacción</translation>
+        <translation type="unfinished">No se ha podido confirmar la transacción</translation>
     </message>
     <message>
         <source>Signer error</source>
@@ -4019,7 +4038,7 @@ Ir a "Archivo &gt; Abrir monedero" para cargar uno.
     </message>
     <message>
         <source>%s request to listen on port %u. This port is considered "bad" and thus it is unlikely that any peer will connect to it. See doc/p2p-bad-ports.md for details and a full list.</source>
-        <translation type="unfinished">Solicitud de %s para escuchar en el puerto %u. Este puerto se considera "malo" y, por lo tanto, es poco probable que algún par se conecte a él. Consulta doc/p2p-bad-ports.md para obtener detalles y una lista completa.</translation>
+        <translation type="unfinished">%s solicitud para escuchar en el puerto %u. Este puerto se considera "malo" y, por lo tanto, es poco probable que algún par se conecte a él. Consulta doc/p2p-bad-ports.md para obtener detalles y una lista completa.</translation>
     </message>
     <message>
         <source>Disk space for %s may not accommodate the block files. Approximately %u GB of data will be stored in this directory.</source>
@@ -4043,7 +4062,7 @@ Ir a "Archivo &gt; Abrir monedero" para cargar uno.
     </message>
     <message>
         <source>Error: Dumpfile format record is incorrect. Got "%s", expected "format".</source>
-        <translation type="unfinished">Error: El registro del formato del archivo de volcado es incorrecto. Se obtuvo "%s", mientras que se esperaba "format".</translation>
+        <translation type="unfinished">Error: El registro del formato del archivo de volcado es incorrecto. Se obtuvo "%s", mientras que se esperaba "formato".</translation>
     </message>
     <message>
         <source>Error: Dumpfile identifier record is incorrect. Got "%s", expected "%s".</source>
@@ -4051,11 +4070,11 @@ Ir a "Archivo &gt; Abrir monedero" para cargar uno.
     </message>
     <message>
         <source>Error: Dumpfile version is not supported. This version of bitcoin-wallet only supports version 1 dumpfiles. Got dumpfile with version %s</source>
-        <translation type="unfinished">Error: La versión del archivo de volcado no es compatible. Esta versión del monedero de Bitcoin solo admite archivos de volcado de la versión 1. Se obtuvo un archivo de volcado con la versión %s.</translation>
+        <translation type="unfinished">Error: la versión del archivo volcado no es compatible. Esta versión del monedero de Bitcoin solo admite archivos de volcado de la versión 1. Se obtuvo un archivo de volcado con la versión %s.</translation>
     </message>
     <message>
         <source>Error: Unable to produce descriptors for this legacy wallet. Make sure to provide the wallet's passphrase if it is encrypted.</source>
-        <translation type="unfinished">Error: No se pueden producir descriptores para este monedero de tipo legacy. Asegúrate de proporcionar la frase de contraseña del monedero si está encriptada.</translation>
+        <translation type="unfinished">Error: No se pueden producir descriptores para este monedero tipo "legacy". Asegúrate de proporcionar la frase de contraseña del monedero si está encriptada.</translation>
     </message>
     <message>
         <source>File %s already exists. If you are sure this is what you want, move it out of the way first.</source>
@@ -4063,7 +4082,7 @@ Ir a "Archivo &gt; Abrir monedero" para cargar uno.
     </message>
     <message>
         <source>Invalid or corrupt peers.dat (%s). If you believe this is a bug, please report it to %s. As a workaround, you can move the file (%s) out of the way (rename, move, or delete) to have a new one created on the next start.</source>
-        <translation type="unfinished">Archivo "peers.dat" inválido o dañado (%s). Si crees que se trata de un error, infórmalo a %s. Como alternativa, puedes quitar el archivo %s (renombrarlo, moverlo o eliminarlo) para que se cree uno nuevo en el siguiente inicio.</translation>
+        <translation type="unfinished">Archivo peers.dat inválido o corrupto (%s). Si crees que se trata de un error, infórmalo a %s. Como alternativa, puedes quitar el archivo %s (renombrarlo, moverlo o eliminarlo) para que se cree uno nuevo en el siguiente inicio.</translation>
     </message>
     <message>
         <source>Invalid value detected for '-wallet' or '-nowallet'. '-wallet' requires a string value, while '-nowallet' accepts only '1' to disable all wallets</source>
@@ -4075,23 +4094,23 @@ Ir a "Archivo &gt; Abrir monedero" para cargar uno.
     </message>
     <message>
         <source>No dump file provided. To use createfromdump, -dumpfile=&lt;filename&gt; must be provided.</source>
-        <translation type="unfinished">No se proporcionó el archivo de volcado. Para usar createfromdump, se debe proporcionar  -dumpfile=&lt;filename&gt;.</translation>
+        <translation type="unfinished">No se ha proporcionado ningún archivo de volcado. Para usar createfromdump, se debe proporcionar  -dumpfile=&lt;filename&gt;.</translation>
     </message>
     <message>
         <source>No dump file provided. To use dump, -dumpfile=&lt;filename&gt; must be provided.</source>
-        <translation type="unfinished">No se proporcionó el archivo de volcado. Para usar dump, se debe proporcionar  -dumpfile=&lt;filename&gt;.</translation>
+        <translation type="unfinished">No se ha proporcionado ningún archivo de volcado. Para usar el volcado, debe proporcionarse -dumpfile=&lt;filename&gt;.</translation>
     </message>
     <message>
         <source>Please contribute if you find %s useful. Visit %s for further information about the software.</source>
-        <translation type="unfinished">Contribuya si encuentra %s de utilidad. Visite %s para más información acerca del programa.</translation>
+        <translation type="unfinished">Contribuye si te parece que %s es útil. Visita %s para obtener más información acerca del software.</translation>
     </message>
     <message>
         <source>Prune configured below the minimum of %d MiB.  Please use a higher number.</source>
-        <translation type="unfinished">La poda se ha configurado por debajo del mínimo de %d MiB. Por favor utiliza un valor mas alto.</translation>
+        <translation type="unfinished">La poda se configuró por debajo del mínimo de %d MiB. Usa un valor más alto.</translation>
     </message>
     <message>
         <source>Prune mode is incompatible with -reindex-chainstate. Use full -reindex instead.</source>
-        <translation type="unfinished">El modo poda no es compatible con -reindex-chainstate. Haz uso de un -reindex completo en su lugar.</translation>
+        <translation type="unfinished">El modo de poda no es compatible con -reindex-chainstate. Usa -reindex completo en su lugar.</translation>
     </message>
     <message>
         <source>Rename of '%s' -&gt; '%s' failed. You should resolve this by manually moving or deleting the invalid snapshot directory %s, otherwise you will encounter the same error again on the next startup.</source>
@@ -4099,11 +4118,11 @@ Ir a "Archivo &gt; Abrir monedero" para cargar uno.
     </message>
     <message>
         <source>SQLiteDatabase: Unknown sqlite wallet schema version %d. Only version %d is supported</source>
-        <translation type="unfinished">SQLiteDatabase: versión del esquema de la monedero sqlite desconocido %d. Sólo version %d se admite</translation>
+        <translation type="unfinished">SQLiteDatabase: versión del esquema de monedero sqlite desconocido (%d). Solo se admite la versión %d.</translation>
     </message>
     <message>
         <source>The block database contains a block which appears to be from the future. This may be due to your computer's date and time being set incorrectly. Only rebuild the block database if you are sure that your computer's date and time are correct</source>
-        <translation type="unfinished">La base de datos de bloques contiene un bloque que parece ser del futuro. Esto puede ser porque la fecha y hora de su equipo están mal ajustados. Reconstruya la base de datos de bloques solo si está seguro de que la fecha y hora de su equipo están ajustadas correctamente.</translation>
+        <translation type="unfinished">La base de datos de bloques contiene un bloque que parece ser del futuro. Esto puede deberse a que la fecha y hora del equipo están mal configuradas. Reconstruye la base de datos de bloques solo tienes la certeza de que la fecha y hora del equipo están configuradas correctamente.</translation>
     </message>
     <message>
         <source>The transaction amount is too small to send after the fee has been deducted</source>
@@ -4135,7 +4154,7 @@ Ir a "Archivo &gt; Abrir monedero" para cargar uno.
     </message>
     <message>
         <source>Unsupported category-specific logging level %1$s=%2$s. Expected %1$s=&lt;category&gt;:&lt;loglevel&gt;. Valid categories: %3$s. Valid loglevels: %4$s.</source>
-        <translation type="unfinished">El nivel de registro específico de la categoría no es compatible: %1$s=%2$s. Se esperaba %1$s=&lt;category&gt;:&lt;loglevel&gt;. Categorías válidas: %3$s. Niveles de registro válidos: %4 $s.</translation>
+        <translation type="unfinished">El nivel de registro específico de la categoría no es compatible: %1$s=%2$s. Se esperaba %1$s=&lt;category&gt;:&lt;loglevel&gt;. Categorías válidas: %3$s. Niveles de registro válidos: %4$s.</translation>
     </message>
     <message>
         <source>Unsupported chainstate database format found. Please restart with -reindex-chainstate. This will rebuild the chainstate database.</source>
@@ -4145,10 +4164,6 @@ Ir a "Archivo &gt; Abrir monedero" para cargar uno.
         <source>Warning: Private keys detected in wallet {%s} with disabled private keys</source>
         <translation type="unfinished">Advertencia: Claves privadas detectadas en el monedero {%s} con claves privadas deshabilitadas.</translation>
     </message>
-    <message>
-        <source>Warning: We do not appear to fully agree with our peers! You may need to upgrade, or other nodes may need to upgrade.</source>
-        <translation type="unfinished">Advertencia: Al parecer no estamos completamente de acuerdo con nuestros pares. Es posible que tengas que realizar una actualización o que los demás nodos tengan que hacerlo.</translation>
-    </message>
     <message>
         <source>Witness data for blocks after height %d requires validation. Please restart with -reindex.</source>
         <translation type="unfinished">Los datos del testigo para los bloques después de la altura %d requieren validación. Reinicia con -reindex.</translation>
@@ -4167,11 +4182,11 @@ Ir a "Archivo &gt; Abrir monedero" para cargar uno.
     </message>
     <message>
         <source>Cannot obtain a lock on directory %s. %s is probably already running.</source>
-        <translation type="unfinished">No se puede obtener un bloqueo en el directorio %s. %s probablemente ya se está ejecutando</translation>
+        <translation type="unfinished">No se puede obtener un bloqueo en el directorio %s. %s probablemente ya se está ejecutando.</translation>
     </message>
     <message>
         <source>Cannot resolve -%s address: '%s'</source>
-        <translation type="unfinished">No se puede resolver la dirección de -%s: "%s"</translation>
+        <translation type="unfinished">No se puede resolver - dirección%s: "%s"</translation>
     </message>
     <message>
         <source>Cannot set -forcednsseed to true when setting -dnsseed to false.</source>
@@ -4187,11 +4202,11 @@ Ir a "Archivo &gt; Abrir monedero" para cargar uno.
     </message>
     <message>
         <source>Cannot provide specific connections and have addrman find outgoing connections at the same time.</source>
-        <translation type="unfinished">No se pueden proporcionar conexiones específicas y hacer que addrman encuentre conexiones salientes al mismo tiempo.</translation>
+        <translation type="unfinished">No se puede proporcionar conexiones específicas y hacer que addrman encuentre conexiones salientes al mismo tiempo.</translation>
     </message>
     <message>
         <source>Error loading %s: External signer wallet being loaded without external signer support compiled</source>
-        <translation type="unfinished">Error al cargar %s: Se está cargando el monedero del firmante externo sin que se haya compilado la compatibilidad del firmante externo.</translation>
+        <translation type="unfinished">Error de carga %s : Se está cargando el monedero del firmante externo sin que se haya compilado el soporte del firmante externo</translation>
     </message>
     <message>
         <source>Error reading %s! All keys read correctly, but transaction data or address metadata may be missing or incorrect.</source>
@@ -4199,15 +4214,15 @@ Ir a "Archivo &gt; Abrir monedero" para cargar uno.
     </message>
     <message>
         <source>Error: Address book data in wallet cannot be identified to belong to migrated wallets</source>
-        <translation type="unfinished">Error: No se puede identificar si los datos de la libreta de direcciones en el monedero pertenecen a monederos migrados.</translation>
+        <translation type="unfinished">Error: los datos de la libreta de direcciones en el monedero no se identifican como pertenecientes a monederos migrados</translation>
     </message>
     <message>
         <source>Error: Duplicate descriptors created during migration. Your wallet may be corrupted.</source>
-        <translation type="unfinished">Error: Se crearon descriptores duplicados durante la migración. Tu monedero puede estar dañado.</translation>
+        <translation type="unfinished">Error: Se han creado descriptores duplicados durante la migración. Tu monedero puede estar dañado.</translation>
     </message>
     <message>
         <source>Error: Transaction %s in wallet cannot be identified to belong to migrated wallets</source>
-        <translation type="unfinished">Error: No se puede identificar si la transacción %s en el monedero pertenece a monederos migrados.</translation>
+        <translation type="unfinished">Error: La transacción %s del monedero no se puede identificar como perteneciente a monederos migrados</translation>
     </message>
     <message>
         <source>Failed to remove snapshot chainstate dir (%s). Manually remove it before restarting.
@@ -4233,11 +4248,11 @@ Ir a "Archivo &gt; Abrir monedero" para cargar uno.
     </message>
     <message>
         <source>Incompatible options: -dnsseed=1 was explicitly specified, but -onlynet forbids connections to IPv4/IPv6</source>
-        <translation type="unfinished">Opciones incompatibles: -dnsseed=1 se especificó explicitamente, pero  -onlynet impide conexiones a IPv4/IPv6</translation>
+        <translation type="unfinished">Opciones incompatibles: -dnsseed=1 se especificó explícitamente, pero -onlynet impide conexiones a IPv4/IPv6</translation>
     </message>
     <message>
         <source>Invalid amount for %s=&lt;amount&gt;: '%s' (must be at least the minrelay fee of %s to prevent stuck transactions)</source>
-        <translation type="unfinished">Importe inválido para %s=&lt;amount&gt;: '%s' (debe ser al menos la comisión mínima de retransmisión de %s para evitar transacciones atascadas)</translation>
+        <translation type="unfinished">Importe inválido para %s=&lt;amount&gt;: "%s" (debe ser al menos la comisión mínima de retransmisión de %s para evitar transacciones atascadas)</translation>
     </message>
     <message>
         <source>Maximum transaction weight is less than transaction weight without inputs</source>
@@ -4249,15 +4264,7 @@ Ir a "Archivo &gt; Abrir monedero" para cargar uno.
     </message>
     <message>
         <source>Option '-checkpoints' is set but checkpoints were removed. This option has no effect.</source>
-        <translation type="unfinished">La opción '-checkpoints' está activa pero los puntos de guardado han sido eliminados. Esta opción no tiene efecto.</translation>
-    </message>
-    <message>
-        <source>Option '-maxorphantx' is set but no longer has any effect (see release notes). Please remove it from your configuration.</source>
-        <translation type="unfinished">La opción '-maxorphantx' está activada pero ya no tiene ningún efecto (mirar notas de lanzamiento) . Por favor, elimínala de su configuración.</translation>
-    </message>
-    <message>
-        <source>Options '-datacarrier' or '-datacarriersize' are set but are marked as deprecated. They will be removed in a future version.</source>
-        <translation type="unfinished">Las opciones '-datacarrier' o '-datacarriersize' están activadas, pero están marcadas como obsoletas. Serán eliminadas en una futura versión. </translation>
+        <translation type="unfinished">La opción "-checkpoints" está configurada, pero se eliminaron los puntos de control. Esta opción no tiene efecto.</translation>
     </message>
     <message>
         <source>Outbound connections restricted to CJDNS (-onlynet=cjdns) but -cjdnsreachable is not provided</source>
@@ -4277,11 +4284,11 @@ Ir a "Archivo &gt; Abrir monedero" para cargar uno.
     </message>
     <message>
         <source>Prune: last wallet synchronisation goes beyond pruned data. You need to -reindex (download the whole blockchain again in case of a pruned node)</source>
-        <translation type="unfinished">Poda: la última sincronización sobrepasa los datos podados. Tiene que -reindex (descarga toda la cadena de bloques de nuevo en caso de tener un nodo podado).</translation>
+        <translation type="unfinished">Poda: la última sincronización sobrepasa los datos podados. Debes ejecutar "-reindex" (descargar toda la cadena de bloques de nuevo en caso de tener un nodo podado).</translation>
     </message>
     <message>
         <source>Rename of '%s' -&gt; '%s' failed. Cannot clean up the background chainstate leveldb directory.</source>
-        <translation type="unfinished">Error al cambiar el nombre de ''%s" a ''%s". No se puede limpiar el directorio leveldb del estado de la cadena de fondo.</translation>
+        <translation type="unfinished">Error al cambiar el nombre de ''%s" a ''%s". No se puede eliminar el directorio leveldb de chainstate en segundo plano.</translation>
     </message>
     <message>
         <source>Specified -blockmaxweight (%d) exceeds consensus maximum block weight (%d)</source>
@@ -4309,18 +4316,18 @@ Ir a "Archivo &gt; Abrir monedero" para cargar uno.
     </message>
     <message>
         <source>UTXO snapshot failed to validate. Restart to resume normal initial block download, or try loading a different snapshot.</source>
-        <translation type="unfinished">No se validó la instantánea de UTXO. Reinicia para reanudar la descarga de bloques inicial normal o intenta cargar una instantánea diferente.</translation>
+        <translation type="unfinished">No se validó la instantánea de la UTXO. Reinicia para reanudar la descarga normal del bloque inicial o intenta cargar una instantánea diferente.</translation>
     </message>
     <message>
         <source>Unconfirmed UTXOs are available, but spending them creates a chain of transactions that will be rejected by the mempool</source>
-        <translation type="unfinished">Las UTXO sin confirmar están disponibles, pero si se gastan, se crea una cadena de transacciones que rechazará el mempool.</translation>
+        <translation type="unfinished">Las UTXO sin confirmar están disponibles, pero si se gastan, se crea una cadena de transacciones que rechazará la mempool.</translation>
     </message>
     <message>
         <source>Unexpected legacy entry in descriptor wallet found. Loading wallet %s
 
 The wallet might have been tampered with or created with malicious intent.
 </source>
-        <translation type="unfinished">Se encontró una entrada inesperada tipo legacy en el monedero basado en descriptores. Cargando monedero %s
+        <translation type="unfinished">Se encontró una entrada inesperada tipo "legacy" en el monedero basado en descriptores. Cargando monedero %s
 
 Es posible que el monedero haya sido manipulado o creado con malas intenciones.
 </translation>
@@ -4349,10 +4356,6 @@ No se puede restaurar la copia de seguridad del monedero.</translation>
         <source>whitebind may only be used for incoming connections ("out" was passed)</source>
         <translation type="unfinished">whitebind solo puede utilizarse para conexiones entrantes (se pasó "out")</translation>
     </message>
-    <message>
-        <source>-paytxfee is deprecated and will be fully removed in v31.0.</source>
-        <translation type="unfinished">-paytxfee está obsoleto y será completamente eliminado en v31.0</translation>
-    </message>
     <message>
         <source>A fatal internal error occurred, see debug.log for details: </source>
         <translation type="unfinished">Ocurrió un error interno grave. Consulta debug.log para obtener más información:</translation>
@@ -4367,15 +4370,11 @@ No se puede restaurar la copia de seguridad del monedero.</translation>
     </message>
     <message>
         <source>Can't spend unconfirmed version %d pre-selected input with a version 3 tx</source>
-        <translation type="unfinished">No se puede gastar la versión sin confirmar %d entrada preseleccionada con una version 3 tx</translation>
+        <translation type="unfinished">No se puede gastar una entrada preseleccionada de versión %d sin confirmar con una transacción de versión 3</translation>
     </message>
     <message>
         <source>Can't spend unconfirmed version 3 pre-selected input with a version %d tx</source>
-        <translation type="unfinished">No se puede gastar una entrada preseleccionada de la versión 3 sin confirmar con una version %d tx</translation>
-    </message>
-    <message>
-        <source>Cannot add WalletDescriptor to a non-descriptor wallet</source>
-        <translation type="unfinished">No se puede añadir un monedero basado en descriptores a un monedero no basado en descriptores</translation>
+        <translation type="unfinished">No se puede gastar una entrada preseleccionada de versión 3 sin confirmar con una transacción de version %d</translation>
     </message>
     <message>
         <source>Cannot write to directory '%s'; check permissions.</source>
@@ -4403,12 +4402,16 @@ No se puede restaurar la copia de seguridad del monedero.</translation>
     </message>
     <message>
         <source>Could not generate scriptPubKeys (cache is empty)</source>
-        <translation type="unfinished">No se ha podido generar scriptPubKeys ( la cache esta vacía)</translation>
+        <translation type="unfinished">No se pudo generar scriptPubKeys (la caché está vacía)</translation>
     </message>
     <message>
         <source>Could not parse asmap file %s</source>
         <translation type="unfinished">No se pudo analizar el archivo asmap %s</translation>
     </message>
+    <message>
+        <source>Could not read embedded asmap data</source>
+        <translation type="unfinished">No se pudieron leer los datos asmap integrados</translation>
+    </message>
     <message>
         <source>Could not top up scriptPubKeys</source>
         <translation type="unfinished">No se pudo recargar los scriptPubKeys</translation>
@@ -4430,8 +4433,8 @@ No se puede restaurar la copia de seguridad del monedero.</translation>
         <translation type="unfinished">Fallo en la prueba de cordura de la criptografía de curva elíptica. %s se apagará.</translation>
     </message>
     <message>
-        <source>Error creating %s</source>
-        <translation type="unfinished">Error al crear %s</translation>
+        <source>Embedded asmap data not available</source>
+        <translation type="unfinished">Datos asmap integrados no disponibles</translation>
     </message>
     <message>
         <source>Error initializing block database</source>
@@ -4441,10 +4444,6 @@ No se puede restaurar la copia de seguridad del monedero.</translation>
         <source>Error loading %s</source>
         <translation type="unfinished">Error al cargar %s</translation>
     </message>
-    <message>
-        <source>Error loading %s: Private keys can only be disabled during creation</source>
-        <translation type="unfinished">Error al cargar %s: Las claves privadas solo se pueden deshabilitar durante la creación</translation>
-    </message>
     <message>
         <source>Error loading %s: Wallet corrupted</source>
         <translation type="unfinished">Error al cargar %s: monedero dañado</translation>
@@ -4487,11 +4486,11 @@ No se puede restaurar la copia de seguridad del monedero.</translation>
     </message>
     <message>
         <source>Error: Couldn't create cursor into database</source>
-        <translation type="unfinished">Error: No se pudo crear el cursor en la base de datos</translation>
+        <translation type="unfinished">Error: No pudo crear el cursor en la base de datos</translation>
     </message>
     <message>
         <source>Error: Disk space is low for %s</source>
-        <translation type="unfinished">Error: El espacio en disco es pequeño para %s</translation>
+        <translation type="unfinished">Error: El espacio en disco es bajo para %s</translation>
     </message>
     <message>
         <source>Error: Dumpfile checksum does not match. Computed %s, expected %s</source>
@@ -4523,11 +4522,11 @@ No se puede restaurar la copia de seguridad del monedero.</translation>
     </message>
     <message>
         <source>Error: Not all address book records were migrated</source>
-        <translation type="unfinished">Error: No todos los registros del libro de direcciones han sido migrados</translation>
+        <translation type="unfinished">Error: No se migraron todos los registros de la libreta de direcciones.</translation>
     </message>
     <message>
         <source>Error: Not all transaction records were migrated</source>
-        <translation type="unfinished">Error: No todos los registros de transacción han sido migrados</translation>
+        <translation type="unfinished">Error: No se migraron todos los registros de transacciones</translation>
     </message>
     <message>
         <source>Error: This wallet already uses SQLite</source>
@@ -4583,19 +4582,15 @@ No se puede restaurar la copia de seguridad del monedero.</translation>
     </message>
     <message>
         <source>Failed to acquire rescan reserver during wallet initialization</source>
-        <translation type="unfinished">No se pudo adquirir la reserva de reescaneo durante la inicialización del monedero </translation>
+        <translation type="unfinished">No se pudo adquirir la reserva de reescaneo durante la inicialización del monedero</translation>
     </message>
     <message>
         <source>Failed to close block undo file.</source>
-        <translation type="unfinished">No se ha podido cerrar el archivo undo</translation>
+        <translation type="unfinished">No se pudo cerrar el archivo undo de bloques.</translation>
     </message>
     <message>
         <source>Failed to close file when writing block.</source>
-        <translation type="unfinished">No se ha podido cerrar el archivo mientras se escribía un bloque</translation>
-    </message>
-    <message>
-        <source>Failed to connect best block (%s).</source>
-        <translation type="unfinished">No se pudo conectar el mejor bloque (%s).</translation>
+        <translation type="unfinished">No se pudo cerrar el archivo al escribir un bloque.</translation>
     </message>
     <message>
         <source>Failed to disconnect block.</source>
@@ -4621,14 +4616,6 @@ No se puede restaurar la copia de seguridad del monedero.</translation>
         <source>Failed to write block.</source>
         <translation type="unfinished">No se pudo escribir el bloque.</translation>
     </message>
-    <message>
-        <source>Failed to write to block index database.</source>
-        <translation type="unfinished">Error al escribir en la base de datos del índice de bloques.</translation>
-    </message>
-    <message>
-        <source>Failed to write to coin database.</source>
-        <translation type="unfinished">Error al escribir en la base de datos de monedas.</translation>
-    </message>
     <message>
         <source>Failed to write undo data.</source>
         <translation type="unfinished">Error al escribir datos undo.</translation>
@@ -4643,7 +4630,7 @@ No se puede restaurar la copia de seguridad del monedero.</translation>
     </message>
     <message>
         <source>Ignoring duplicate -wallet %s.</source>
-        <translation type="unfinished">Ignorar duplicación de -wallet %s.</translation>
+        <translation type="unfinished">Ignorando -wallet %s duplicado.</translation>
     </message>
     <message>
         <source>Incorrect or no genesis block found. Wrong datadir for network?</source>
@@ -4681,14 +4668,26 @@ No se puede restaurar la copia de seguridad del monedero.</translation>
         <source>Invalid P2P permission: '%s'</source>
         <translation type="unfinished">Permiso P2P inválido: "%s"</translation>
     </message>
-    <message>
-        <source>Invalid amount for %s=&lt;amount&gt;: '%s' (must be at least %s)</source>
-        <translation type="unfinished">Importe inválido para %s=&lt;amount&gt;: "%s" (debe ser por lo menos %s)</translation>
-    </message>
     <message>
         <source>Invalid amount for %s=&lt;amount&gt;: '%s'</source>
         <translation type="unfinished">Importe inválido para %s=&lt;amount&gt;: "%s"</translation>
     </message>
+    <message>
+        <source>A %zu MiB dbcache may be too large for a system memory of only %zu MiB.</source>
+        <translation type="unfinished">%zuMiB dbcache es demasiado grande para una memoria del sistema de solamente %zu MiB.</translation>
+    </message>
+    <message>
+        <source>Creating wallet…</source>
+        <translation type="unfinished">Creando monedero...</translation>
+    </message>
+    <message>
+        <source>Duplicate binding configuration for address %s. Please check your -bind, -bind=...=onion and -whitebind settings.</source>
+        <translation type="unfinished">Configuración de enlace duplicada para la dirección %s. Compruebe sus ajustes -bind, -bind=...=onion y -whitebind.</translation>
+    </message>
+    <message>
+        <source>Error creating %s: Could not write version metadata.</source>
+        <translation type="unfinished">Error creando %s: No se pudieron escribir metadatos de la versión.</translation>
+    </message>
     <message>
         <source>Invalid amount for -%s=&lt;amount&gt;: '%s'</source>
         <translation type="unfinished">Importe inválido para -%s=&lt;amount&gt;: "%s"</translation>
@@ -4715,7 +4714,7 @@ No se puede restaurar la copia de seguridad del monedero.</translation>
     </message>
     <message>
         <source>Loading block index…</source>
-        <translation type="unfinished">Cargando índice de bloques...</translation>
+        <translation type="unfinished">Cargando índice de bloques…</translation>
     </message>
     <message>
         <source>Loading wallet…</source>
@@ -4753,6 +4752,18 @@ No se puede restaurar la copia de seguridad del monedero.</translation>
         <source>Only direction was set, no permissions: '%s'</source>
         <translation type="unfinished">Solo se estableció la dirección, sin permisos: "%s"</translation>
     </message>
+    <message>
+        <source>Option '-limitancestorsize' is given but ancestor size limits have been replaced with cluster size limits (see -limitclustersize). This option has no effect.</source>
+        <translation type="unfinished">Se ha indicado la opción  '-limitancestorsize' pero el límite del tamaño del ancestro ha sido reemplazado por el límite de tamaño de clúster. Esta opción no tiene efecto.</translation>
+    </message>
+    <message>
+        <source>Option '-limitdescendantsize' is given but descendant size limits have been replaced with cluster size limits (see -limitclustersize). This option has no effect.</source>
+        <translation type="unfinished">Se ha indicado la opción '-limitdescendantsize' pero el límite del tamaño del descendiente ha sido reemplazado por el  límite de tamaño de clúster. Esta opción no tiene efecto.</translation>
+    </message>
+    <message>
+        <source>Private broadcast of own transactions requested (-privatebroadcast) and -proxyrandomize is disabled. Tor circuits for private broadcast connections may be correlated to other connections over Tor. For maximum privacy set -proxyrandomize=1.</source>
+        <translation type="unfinished">Se ha solicitado el envío privado de transacciones propias (-privatebroadcast) y -proxyrandomize está desactivado. Los circuitos de Tor utilizados para las conexiones de envío privado podrían correlacionarse con otras conexiones a través de Tor. Para obtener la máxima privacidad, configure -proxyrandomize=1.</translation>
+    </message>
     <message>
         <source>Prune cannot be configured with a negative value.</source>
         <translation type="unfinished">La poda no se puede configurar con un valor negativo.</translation>
@@ -4779,7 +4790,7 @@ No se puede restaurar la copia de seguridad del monedero.</translation>
     </message>
     <message>
         <source>SQLiteDatabase: Failed to execute statement to verify database: %s</source>
-        <translation type="unfinished">SQLiteDatabase: Fallo al ejecutar la instrucción para verificar la base de datos (%s)</translation>
+        <translation type="unfinished">SQLiteDatabase: Fallo al ejecutar la instrucción para verificar la base de datos: %s</translation>
     </message>
     <message>
         <source>SQLiteDatabase: Failed to prepare statement to verify database: %s</source>
@@ -4819,7 +4830,7 @@ No se puede restaurar la copia de seguridad del monedero.</translation>
     </message>
     <message>
         <source>Specified -walletdir "%s" is a relative path</source>
-        <translation type="unfinished">El valor especificado de -walletdir "%s" es una ruta de acceso relativa</translation>
+        <translation type="unfinished">El valor especificado de -walletdir "%s" es una ruta relativa</translation>
     </message>
     <message>
         <source>Specified -walletdir "%s" is not a directory</source>
@@ -4851,7 +4862,7 @@ No se puede restaurar la copia de seguridad del monedero.</translation>
     </message>
     <message>
         <source>The %s path uses exFAT, which is known to have intermittent corruption problems on macOS. Move this directory to a different filesystem to avoid data loss.</source>
-        <translation type="unfinished">El %s ruta de acceso usa exFAT, el cual es conocido por tener problemas de corrupción intermitente en macOS. Mueve este directorio a un sistema de ficheros distinto para prevenir perdida de datos.</translation>
+        <translation type="unfinished">La ruta %s usa exFAT, que se sabe que presenta problemas de corrupción intermitente en macOS. Mueve este directorio a un sistema de archivos distinto para evitar la pérdida de datos.</translation>
     </message>
     <message>
         <source>The source code is available from %s.</source>
@@ -4867,7 +4878,7 @@ No se puede restaurar la copia de seguridad del monedero.</translation>
     </message>
     <message>
         <source>The transactions removal process can only be executed within a db txn</source>
-        <translation type="unfinished">El proceso de eliminación de transacciones solo puede ejecutarse dentro de una transacción de base de datos</translation>
+        <translation type="unfinished">El proceso de eliminación de transacciones sólo puede ejecutarse dentro de una base de datos de transacción</translation>
     </message>
     <message>
         <source>The wallet will avoid paying less than the minimum relay fee.</source>
@@ -4875,7 +4886,7 @@ No se puede restaurar la copia de seguridad del monedero.</translation>
     </message>
     <message>
         <source>There is no ScriptPubKeyManager for this address</source>
-        <translation type="unfinished">No hay ningún ScriptPubKeyManager para esta dirección</translation>
+        <translation type="unfinished">No hay ningún ScriptPubKeyManager para esta dirección.</translation>
     </message>
     <message>
         <source>This is experimental software.</source>
@@ -4885,10 +4896,6 @@ No se puede restaurar la copia de seguridad del monedero.</translation>
         <source>This is the minimum transaction fee you pay on every transaction.</source>
         <translation type="unfinished">Esta es la comisión mínima que pagas en cada transacción.</translation>
     </message>
-    <message>
-        <source>This is the transaction fee you will pay if you send a transaction.</source>
-        <translation type="unfinished">Esta es la comisión que pagarás si envías una transacción.</translation>
-    </message>
     <message>
         <source>Transaction %s does not belong to this wallet</source>
         <translation type="unfinished">La transacción %s no pertenece a este monedero</translation>
@@ -4919,7 +4926,7 @@ No se puede restaurar la copia de seguridad del monedero.</translation>
     </message>
     <message>
         <source>Unable to bind to %s on this computer (bind returned error %s)</source>
-        <translation type="unfinished">No se puede establecer un enlace a %s en esta computadora (bind devolvió el error %s)</translation>
+        <translation type="unfinished">No se puede establecer un enlace a %s en este equipo (bind ha devuelto el error %s)</translation>
     </message>
     <message>
         <source>Unable to bind to %s on this computer. %s is probably already running.</source>
@@ -4931,7 +4938,7 @@ No se puede restaurar la copia de seguridad del monedero.</translation>
     </message>
     <message>
         <source>Unable to find UTXO for external input</source>
-        <translation type="unfinished">No se puede encontrar una UTXO para la entrada externa</translation>
+        <translation type="unfinished">No se puede encontrar UTXO para la entrada externa</translation>
     </message>
     <message>
         <source>Unable to open %s for writing</source>
@@ -4939,11 +4946,11 @@ No se puede restaurar la copia de seguridad del monedero.</translation>
     </message>
     <message>
         <source>Unable to parse -maxuploadtarget: '%s'</source>
-        <translation type="unfinished">No se pudo analizar -maxuploadtarget: "%s"</translation>
+        <translation type="unfinished">No se ha podido analizar -maxuploadtarget: "%s"</translation>
     </message>
     <message>
         <source>Unable to start HTTP server. See debug log for details.</source>
-        <translation type="unfinished">No se pudo iniciar el servidor HTTP. Ver registro de depuración para obtener detalles.</translation>
+        <translation type="unfinished">No se ha podido iniciar el servidor HTTP. Ver registro de depuración para obtener detalles.</translation>
     </message>
     <message>
         <source>Unknown -blockfilterindex value %s.</source>
@@ -4987,15 +4994,15 @@ No se puede restaurar la copia de seguridad del monedero.</translation>
     </message>
     <message>
         <source>Error loading %s: Wallet is a legacy wallet. Please migrate to a descriptor wallet using the migration tool (migratewallet RPC).</source>
-        <translation type="unfinished">Error cargando %s: El monedero es un monedero tipo legacy. Por favor migra a un monedero basado en descriptores usando la herramienta de migrado  (migratewallet RPC).</translation>
+        <translation type="unfinished">Error al cargar %s: El monedero es de tipo legacy. Realiza la migración a un monedero basado en descriptores mediante la herramienta de migración (RPC migratewallet).</translation>
     </message>
     <message>
         <source>Error: Dumpfile specifies an unsupported database format (%s). Only sqlite database dumps are supported</source>
-        <translation type="unfinished">Error: El archivo de volcado especifica un formato de base de datos no compatible (%s). Sólo se admiten volcados de bases de datos SQLite.</translation>
+        <translation type="unfinished">Error: El archivo de volcado especifica un formato de base de datos no compatible (%s). Solo se admiten volcados de bases de datos SQLite.</translation>
     </message>
     <message>
         <source>Failed to calculate bump fees, because unconfirmed UTXOs depend on an enormous cluster of unconfirmed transactions.</source>
-        <translation type="unfinished">No se ha podido calcular la comisión de incremento porque las UTXO sin confirmar dependen de un grupo enorme de transacciones no confirmadas.</translation>
+        <translation type="unfinished">Las comisiones de incremento no se pudieron calcular, ya que los UTXO sin confirmar dependen de un enorme grupo de transacciones sin confirmar.</translation>
     </message>
     <message>
         <source>Transaction requires one destination of non-zero value, a non-zero feerate, or a pre-selected input</source>
@@ -5007,7 +5014,7 @@ No se puede restaurar la copia de seguridad del monedero.</translation>
 The wallet might have been created on a newer version.
 Please try running the latest software version.
 </source>
-        <translation type="unfinished">Se encontró un descriptor desconocido. Cargando monedero %s.
+        <translation type="unfinished">Se encontró un descriptor desconocido. Cargando monedero %s
 
 El monedero se podría haber creado con una versión más reciente.
 Intenta ejecutar la última versión del software.
@@ -5035,11 +5042,11 @@ Intenta ejecutar la última versión del software.
     </message>
     <message>
         <source>Failed to start indexes, shutting down…</source>
-        <translation type="unfinished">Error al iniciar los índices, cerrando...</translation>
+        <translation type="unfinished">Error al iniciar los índices, cerrando…</translation>
     </message>
     <message>
         <source>Invalid -proxy address or hostname, ends with '=': '%s'</source>
-        <translation type="unfinished">La dirección -proxy o el nombre de host no es válido, acaba con  '=':'%s'</translation>
+        <translation type="unfinished">La dirección -proxy o el nombre de host no son válidos; acaba con "=":"%s"</translation>
     </message>
     <message>
         <source>Not enough file descriptors available. %d available, %d required.</source>
@@ -5047,7 +5054,7 @@ Intenta ejecutar la última versión del software.
     </message>
     <message>
         <source>Unrecognized network in -proxy='%s': '%s'</source>
-        <translation type="unfinished">Red no reconocida en -proxy:'%s':'%s'</translation>
+        <translation type="unfinished">Red no reconocida en -proxy="%s": "%s"</translation>
     </message>
     <message>
         <source>User Agent comment (%s) contains unsafe characters.</source>
@@ -5059,7 +5066,7 @@ Intenta ejecutar la última versión del software.
     </message>
     <message>
         <source>Verifying wallet(s)…</source>
-        <translation type="unfinished">Verificando monedero(s)...</translation>
+        <translation type="unfinished">Verificando monedero(s)…</translation>
     </message>
     <message>
         <source>Wallet needed to be rewritten: restart %s to complete</source>
diff --git a/src/qt/locale/bitcoin_et.ts b/src/qt/locale/bitcoin_et.ts
index a9781f3bedab..12d7e2e15340 100644
--- a/src/qt/locale/bitcoin_et.ts
+++ b/src/qt/locale/bitcoin_et.ts
@@ -170,6 +170,14 @@ Signing is only possible with addresses of the type 'legacy'.</source>
         <source>Enter the old passphrase and new passphrase for the wallet.</source>
         <translation type="unfinished">Sisesta rahakoti vana salafraas ja uus salafraas.</translation>
     </message>
+    <message>
+        <source>Continue</source>
+        <translation type="unfinished">Jätka</translation>
+    </message>
+    <message>
+        <source>Back</source>
+        <translation type="unfinished">Tagasi</translation>
+    </message>
     <message>
         <source>Remember that encrypting your wallet cannot fully protect your bitcoins from being stolen by malware infecting your computer.</source>
         <translation type="unfinished">Pea meeles, et rahakoti krüpteerimine ei välista bitcoinide vargust, kui sinu arvuti on nakatunud pahavaraga.</translation>
@@ -214,6 +222,10 @@ Signing is only possible with addresses of the type 'legacy'.</source>
         <source>Wallet passphrase was successfully changed.</source>
         <translation type="unfinished">Rahakoti parooli vahetus õnnestus.</translation>
     </message>
+    <message>
+        <source>Passphrase change failed</source>
+        <translation type="unfinished">Parooli muutmine ei õnnestunud</translation>
+    </message>
     <message>
         <source>Warning: The Caps Lock key is on!</source>
         <translation type="unfinished">Hoiatus:Klaviatuuri suurtähelukk on peal.</translation>
@@ -418,6 +430,10 @@ Signing is only possible with addresses of the type 'legacy'.</source>
         <source>Verify messages to ensure they were signed with specified Bitcoin addresses</source>
         <translation type="unfinished">Kinnita sõnumid kindlustamaks et need allkirjastati määratud Bitcoini aadressiga</translation>
     </message>
+    <message>
+        <source>Open &amp;URI…</source>
+        <translation type="unfinished">Ava &amp;URI…</translation>
+    </message>
     <message>
         <source>Close Wallet…</source>
         <translation type="unfinished">Sulge Rahakott...</translation>
@@ -426,6 +442,10 @@ Signing is only possible with addresses of the type 'legacy'.</source>
         <source>Create Wallet…</source>
         <translation type="unfinished">Loo Rahakott...</translation>
     </message>
+    <message>
+        <source>Close All Wallets…</source>
+        <translation type="unfinished">Sulge kõik rahakotid</translation>
+    </message>
     <message>
         <source>&amp;File</source>
         <translation type="unfinished">&amp;Fail</translation>
@@ -932,6 +952,10 @@ Signing is only possible with addresses of the type 'legacy'.</source>
         <extracomment>Window title text of pop-up window shown when the user has chosen to reset options.</extracomment>
         <translation type="unfinished">Kinnita valikute algseadistamine</translation>
     </message>
+    <message>
+        <source>Continue</source>
+        <translation type="unfinished">Jätka</translation>
+    </message>
     <message>
         <source>Error</source>
         <translation type="unfinished">Viga</translation>
@@ -974,6 +998,13 @@ Signing is only possible with addresses of the type 'legacy'.</source>
     </context>
 <context>
     <name>PSBTOperationsDialog</name>
+    <message numerus="yes">
+        <source>Signed %n input(s), but more signatures are still required.</source>
+        <translation type="unfinished">
+            <numerusform />
+            <numerusform />
+        </translation>
+    </message>
     <message>
         <source>own address</source>
         <translation type="unfinished">oma aadress</translation>
@@ -982,6 +1013,13 @@ Signing is only possible with addresses of the type 'legacy'.</source>
         <source>or</source>
         <translation type="unfinished">või</translation>
     </message>
+    <message numerus="yes">
+        <source>Transaction has %n unsigned input(s).</source>
+        <translation type="unfinished">
+            <numerusform />
+            <numerusform />
+        </translation>
+    </message>
     </context>
 <context>
     <name>PaymentServer</name>
@@ -1382,10 +1420,6 @@ Signing is only possible with addresses of the type 'legacy'.</source>
         <source>The amount exceeds your balance.</source>
         <translation type="unfinished">Summa ületab jäägi.</translation>
     </message>
-    <message>
-        <source>The total exceeds your balance when the %1 transaction fee is included.</source>
-        <translation type="unfinished">Summa koos tehingu tasuga %1 ületab sinu jääki.</translation>
-    </message>
     <message numerus="yes">
         <source>Estimated to begin confirmation within %n block(s).</source>
         <translation type="unfinished">
diff --git a/src/qt/locale/bitcoin_eu.ts b/src/qt/locale/bitcoin_eu.ts
index 32a6dc83b7da..4aa74a91aa22 100644
--- a/src/qt/locale/bitcoin_eu.ts
+++ b/src/qt/locale/bitcoin_eu.ts
@@ -3,11 +3,11 @@
     <name>AddressBookPage</name>
     <message>
         <source>Right-click to edit address or label</source>
-        <translation type="unfinished">Eskuin-klika helbidea edo etiketa aldatzeko</translation>
+        <translation type="unfinished">Helbidea edo etiketa editatzeko, egin eskuineko klik</translation>
     </message>
     <message>
         <source>Create a new address</source>
-        <translation type="unfinished">Sortu helbide berria</translation>
+        <translation type="unfinished">Helbide berria sortu</translation>
     </message>
     <message>
         <source>&amp;New</source>
@@ -29,9 +29,13 @@
         <source>Enter address or label to search</source>
         <translation type="unfinished">Bilatzeko, helbide edo etiketa sartu</translation>
     </message>
+    <message>
+        <source>Copy the currently selected address to the clipboard</source>
+        <translation type="unfinished">Kopiatu hautatutako helbidea arbelean</translation>
+    </message>
     <message>
         <source>Export the data in the current tab to a file</source>
-        <translation type="unfinished">Uneko fitxategian datuak esportatu</translation>
+        <translation type="unfinished">Uneko fitxako datuak fitxategi batera esportatu</translation>
     </message>
     <message>
         <source>&amp;Export</source>
@@ -43,11 +47,11 @@
     </message>
     <message>
         <source>Choose the address to send coins to</source>
-        <translation type="unfinished">Dirua bidaltzeko helbidea hautatu</translation>
+        <translation type="unfinished">Aukeratu txanponak bidaltzeko helbidea</translation>
     </message>
     <message>
         <source>Choose the address to receive coins with</source>
-        <translation type="unfinished">Dirua jasotzeko helbidea hautatu</translation>
+        <translation type="unfinished">Aukeratu txanponak jasotzeko erabiliko den helbidea</translation>
     </message>
     <message>
         <source>C&amp;hoose</source>
@@ -55,21 +59,21 @@
     </message>
     <message>
         <source>These are your Bitcoin addresses for sending payments. Always check the amount and the receiving address before sending coins.</source>
-        <translation type="unfinished">Hauek dira zuk dirua jaso dezaketen Bitcoin helbideak. Egiaztatu beti diru-kopurua eta dirua jasoko duen helbidea zuzen egon daitezen, txanponak bidali baino lehen.</translation>
+        <translation type="unfinished">Hauek dira ordainketak egiteko zure Bitcoin helbideak. Txanponak bidali aurretik, beti egiaztatu zenbatekoa eta hartzailearen helbidea.</translation>
     </message>
     <message>
         <source>These are your Bitcoin addresses for receiving payments. Use the 'Create new receiving address' button in the receive tab to create new addresses.
 Signing is only possible with addresses of the type 'legacy'.</source>
-        <translation type="unfinished">Hauek dira ordainketak jasotzeko zure Bitcoin helbideak. Jaso taulako 'Jasotzeko helbide berri bat sortu' botoia erabili helbide berri bat sortzeko.
-Sinatzea 'legacy' motako helbideekin soilik da posible</translation>
+        <translation type="unfinished">Hauek dira ordainketak jasotzeko zure Bitcoin helbideak. Helbide berriak sortzeko, erabili 'Jasotzeko helbide berria sortu' botoia "jasotzea" fitxan.
+Sinatzea soilik posible da 'legacy' motako helbideekin.</translation>
     </message>
     <message>
         <source>&amp;Copy Address</source>
-        <translation type="unfinished">&amp;Helbidea kopiatu</translation>
+        <translation type="unfinished">&amp;Kopiatu helbidea</translation>
     </message>
     <message>
         <source>Copy &amp;Label</source>
-        <translation type="unfinished">Etiketa &amp;Kopiatu</translation>
+        <translation type="unfinished">Kopiatu &amp;etiketa</translation>
     </message>
     <message>
         <source>&amp;Edit</source>
@@ -87,7 +91,7 @@ Sinatzea 'legacy' motako helbideekin soilik da posible</translation>
     <message>
         <source>There was an error trying to save the address list to %1. Please try again.</source>
         <extracomment>An error message. %1 is a stand-in argument for the name of the file we attempted to save to.</extracomment>
-        <translation type="unfinished">Akats bat egon da helbide lista %1-ean gordetzen sahiatzean. Mesedez, saiatu berriro.</translation>
+        <translation type="unfinished">Errore bat gertatu da %1(e)ra helbide-zerrenda gordetzen saiatzean. Saiatu berriro, mesedez.</translation>
     </message>
     <message>
         <source>Sending addresses - %1</source>
@@ -133,7 +137,7 @@ Sinatzea 'legacy' motako helbideekin soilik da posible</translation>
     </message>
     <message>
         <source>Repeat new passphrase</source>
-        <translation type="unfinished">Pasahitz berria errepiikatu</translation>
+        <translation type="unfinished">Pasahitz berria errepikatu</translation>
     </message>
     <message>
         <source>Show passphrase</source>
@@ -141,15 +145,15 @@ Sinatzea 'legacy' motako helbideekin soilik da posible</translation>
     </message>
     <message>
         <source>Encrypt wallet</source>
-        <translation type="unfinished">Diruzorroa enkriptatu</translation>
+        <translation type="unfinished">Zorroa enkriptatu</translation>
     </message>
     <message>
         <source>This operation needs your wallet passphrase to unlock the wallet.</source>
-        <translation type="unfinished">Diruzorroaren pasahitza behar du eragiketa honek, diruzorroa desblokeatzeko.</translation>
+        <translation type="unfinished">zorroaren pasahitza behar du eragiketa honek, zure zorroa desblokeatzeko.</translation>
     </message>
     <message>
         <source>Unlock wallet</source>
-        <translation type="unfinished">Diruzorroa desblokeatu</translation>
+        <translation type="unfinished">Zorroa desblokeatu</translation>
     </message>
     <message>
         <source>Change passphrase</source>
@@ -157,19 +161,19 @@ Sinatzea 'legacy' motako helbideekin soilik da posible</translation>
     </message>
     <message>
         <source>Confirm wallet encryption</source>
-        <translation type="unfinished">Diruorroaren enkriptazioa berretsi</translation>
+        <translation type="unfinished">Zorroaren enkriptazioa berretsi</translation>
     </message>
     <message>
         <source>Warning: If you encrypt your wallet and lose your passphrase, you will &lt;b&gt;LOSE ALL OF YOUR BITCOINS&lt;/b&gt;!</source>
-        <translation type="unfinished">Abisua: Diruzorroa enkriptatzen baduzu eta zure pasahitza galtzen baduzu, &lt;b&gt;BITCOIN GUZTIAK GALDUKO DITUZU&lt;/b&gt;!</translation>
+        <translation type="unfinished">Abisua: Zure zorroa enkriptatzen baduzu eta zure pasahitza galtzen baduzu, &lt;b&gt;BITCOIN GUZTIAK GALDUKO DITUZU&lt;/b&gt;!</translation>
     </message>
     <message>
         <source>Are you sure you wish to encrypt your wallet?</source>
-        <translation type="unfinished">Seguru al zaude, zure diruzorroa enkriptatu nahi duzula?</translation>
+        <translation type="unfinished">Seguru al zaude, zorroa enkriptatu nahi duzula?</translation>
     </message>
     <message>
         <source>Wallet encrypted</source>
-        <translation type="unfinished">Zorroa enkriptatuta</translation>
+        <translation type="unfinished">Diruzorroa enkriptatuta</translation>
     </message>
     <message>
         <source>Enter the new passphrase for the wallet.&lt;br/&gt;Please use a passphrase of &lt;b&gt;ten or more random characters&lt;/b&gt;, or &lt;b&gt;eight or more words&lt;/b&gt;.</source>
@@ -177,7 +181,7 @@ Sinatzea 'legacy' motako helbideekin soilik da posible</translation>
     </message>
     <message>
         <source>Enter the old passphrase and new passphrase for the wallet.</source>
-        <translation type="unfinished">Diruzorroaren pasahitz zahar zein berria sartu.</translation>
+        <translation type="unfinished">Zorroaren pasahitz zahar zein berria sartu.</translation>
     </message>
     <message>
         <source>Continue</source>
@@ -189,31 +193,31 @@ Sinatzea 'legacy' motako helbideekin soilik da posible</translation>
     </message>
     <message>
         <source>Remember that encrypting your wallet cannot fully protect your bitcoins from being stolen by malware infecting your computer.</source>
-        <translation type="unfinished">Gogoan izan diruzorroaren enkripzioak ezin dituela zure bitcoinak zure ordenagailuan izan dezakezun malware batengandik lapurtuak izatetik guztiz babestu .</translation>
+        <translation type="unfinished">Gogoan izan zorroaren enkripzioak ezin dituela zure bitcoinak zure ordenagailuan izan dezakezun malware batengandik lapurtuak izatetik guztiz babestu .</translation>
     </message>
     <message>
         <source>Wallet to be encrypted</source>
-        <translation type="unfinished">Enkriptatzeko diruzorroa</translation>
+        <translation type="unfinished">Enkriptatzeko zorroa</translation>
     </message>
     <message>
         <source>Your wallet is about to be encrypted. </source>
-        <translation type="unfinished">Zure diruzorroa enkriptatzekotan dago</translation>
+        <translation type="unfinished">Zure zorroa enkriptatzekotan dago</translation>
     </message>
     <message>
         <source>Your wallet is now encrypted. </source>
-        <translation type="unfinished">Zure diruzorroa enkriptatua dago orain.</translation>
+        <translation type="unfinished">Zure zorroa enkriptatua dago orain.</translation>
     </message>
     <message>
         <source>IMPORTANT: Any previous backups you have made of your wallet file should be replaced with the newly generated, encrypted wallet file. For security reasons, previous backups of the unencrypted wallet file will become useless as soon as you start using the new, encrypted wallet.</source>
-        <translation type="unfinished">GARRANTZITSUA: Diruzorroaren segurtasun-kopia, wallet.dat, erabilezina bihurtuko da enkriptazioa burutu ondoren. Ondorioz, segurtasun-kopia berriekin ordezkatu beharko zenituzke zure jada eginik dituzun diruzorroaren kopiak.</translation>
+        <translation type="unfinished">GARRANTZITSUA: Zure zorro-fitxategiaren aurrez egindako segurtasun-kopiak ordezkatu behar dira sortu berri den, zifratutako zorro-fitxategiarekin. Segurtasun arrazoiengatik, zifratu gabe zeuden aurreko segurtasun-kopiak baliogabe bihurtuko dira zorro berria erabiltzen hasten zarenean.</translation>
     </message>
     <message>
         <source>Wallet encryption failed</source>
-        <translation type="unfinished">Diruzorroaren enkriptazioak huts egin du</translation>
+        <translation type="unfinished">Zorroaren enkriptazioak huts egin du</translation>
     </message>
     <message>
         <source>Wallet encryption failed due to an internal error. Your wallet was not encrypted.</source>
-        <translation type="unfinished">Diruzorroaren enkriptazioak huts egin du barne-akats baten ondorioz. Zure diruzorroa ez da enkriptatu.</translation>
+        <translation type="unfinished">Zorroaren enkriptazioak huts egin du barne-akats baten ondorioz. Zure zorroa ez da enkriptatu.</translation>
     </message>
     <message>
         <source>The supplied passphrases do not match.</source>
@@ -221,27 +225,31 @@ Sinatzea 'legacy' motako helbideekin soilik da posible</translation>
     </message>
     <message>
         <source>Wallet unlock failed</source>
-        <translation type="unfinished">Zorroaren desblokeoak huts egin du</translation>
+        <translation type="unfinished">Diruzorroaren desblokeoak huts egin du</translation>
     </message>
     <message>
         <source>The passphrase entered for the wallet decryption was incorrect.</source>
-        <translation type="unfinished">Zorroa desenkriptatzeko sartutako pasahitza okerra da.</translation>
+        <translation type="unfinished">Diruzorroa desenkriptatzeko sartutako pasahitza okerra da.</translation>
     </message>
     <message>
         <source>The passphrase entered for the wallet decryption is incorrect. It contains a null character (ie - a zero byte). If the passphrase was set with a version of this software prior to 25.0, please try again with only the characters up to — but not including — the first null character. If this is successful, please set a new passphrase to avoid this issue in the future.</source>
-        <translation type="unfinished">Kartera deszifratzeko sartu den pasahitza ez da zuzena. Karaktere nulua du (adib - zero byte). Passphrasak software honen bertsio bat bazuen 25.0 bertsioaren aurretik, mesedez, saia zaitez berriro karaktere hutsekin, lehen karaktere nulua barne hartu gabe. Arrakasta izanez gero, jar ezazu passphrase berri bat etorkizunean hori saihesteko.</translation>
+        <translation type="unfinished">Zorroa deszifratzeko sartutako pasahitza ez da zuzena. Null karaktere bat dauka (hau da, zero byte bat). Pasahitza 25.0 bertsioa baino lehenagoko software-bertsio batekin ezarri bazen, saiatu berriro lehen null karaktereraino (baina hura barne hartu gabe) dauden karaktereak soilik sartzen. Horrela funtzionatzen badu, ezarri pasahitz berri bat etorkizunean arazo hori saihesteko.</translation>
     </message>
     <message>
         <source>Wallet passphrase was successfully changed.</source>
-        <translation type="unfinished">Diruzorroaren pasahitza arrakastaz aldatu da.</translation>
+        <translation type="unfinished">Zorroaren pasahitza arrakastaz aldatu da.</translation>
     </message>
     <message>
         <source>Passphrase change failed</source>
-        <translation type="unfinished">Passphrase aldaketak porrot egin du.</translation>
+        <translation type="unfinished">Pasahitzaren aldaketa huts egin du</translation>
+    </message>
+    <message>
+        <source>The old passphrase entered for the wallet decryption is incorrect. It contains a null character (ie - a zero byte). If the passphrase was set with a version of this software prior to 25.0, please try again with only the characters up to — but not including — the first null character.</source>
+        <translation type="unfinished">Zorroa deszifratzeko sartutako pasahitz zaharra ez da zuzena. Null karaktere bat dauka (hau da, zero byte bat). Pasahitza software honen 25.0 bertsioa baino lehenagoko batean ezarri bazen, saiatu berriro lehen null karaktereraino dauden karaktereak soilik sartzen, baina karaktere hori barne hartu gabe.</translation>
     </message>
     <message>
         <source>Warning: The Caps Lock key is on!</source>
-        <translation type="unfinished">Abisua: Mayuskulak blokeatuak dituzu!</translation>
+        <translation type="unfinished">Abisua: Maiuskulen blokeo tekla aktibatuta dago!</translation>
     </message>
 </context>
 <context>
@@ -259,39 +267,119 @@ Sinatzea 'legacy' motako helbideekin soilik da posible</translation>
     <name>BitcoinApplication</name>
     <message>
         <source>Settings file %1 might be corrupt or invalid.</source>
-        <translation type="unfinished">%1 Konfigurazio fitxategian akatsa edo baliogabea izan daiteke</translation>
+        <translation type="unfinished">Ezarpen-fitxategia %1 hondatuta edo baliogabe egon daiteke.</translation>
     </message>
     <message>
         <source>Runaway exception</source>
-        <translation type="unfinished">Ranaway exception</translation>
+        <translation type="unfinished">Salbuespen iheslaria</translation>
     </message>
     <message>
         <source>A fatal error occurred. %1 can no longer continue safely and will quit.</source>
-        <translation type="unfinished">Akats larri bat gertatu zen. %1-ek ezin du segurtasunez jarraitu eta itxi egingo da.</translation>
+        <translation type="unfinished">Errore larria gertatu da. %1 ezin da segurtasunez jarraitu eta itxiko da.</translation>
     </message>
     <message>
         <source>Internal error</source>
         <translation type="unfinished">Barne errorea</translation>
     </message>
-    </context>
+    <message>
+        <source>An internal error occurred. %1 will attempt to continue safely. This is an unexpected bug which can be reported as described below.</source>
+        <translation type="unfinished">Barne-errore bat gertatu da. %1 saiatuko da segurtasunez jarraitzen. Hau ustekabeko akatsa da, eta behean azaltzen den moduan jakinarazi daiteke.</translation>
+    </message>
+</context>
 <context>
     <name>QObject</name>
+    <message>
+        <source>Do you want to reset settings to default values, or to abort without making changes?</source>
+        <extracomment>Explanatory text shown on startup when the settings file cannot be read. Prompts user to make a choice between resetting or aborting.</extracomment>
+        <translation type="unfinished">Ezarpenak lehenetsitako balioetara berrezarri nahi dituzu, ala aldaketarik egin gabe bertan behera utzi?</translation>
+    </message>
+    <message>
+        <source>A fatal error occurred. Check that settings file is writable, or try running with -nosettings.</source>
+        <extracomment>Explanatory text shown on startup when the settings file could not be written. Prompts user to check that we have the ability to write to the file. Explains that the user has the option of running without a settings file.</extracomment>
+        <translation type="unfinished">Errore larria gertatu da. Egiaztatu ezarpenen fitxategia idazgarria dela, edo saiatu -nosettings aukerarekin exekutatzen.</translation>
+    </message>
     <message>
         <source>Error: %1</source>
-        <translation type="unfinished">Akatsa: %1</translation>
+        <translation type="unfinished">Errorea: %1</translation>
     </message>
     <message>
         <source>%1 didn't yet exit safely…</source>
-        <translation type="unfinished">%1 ez da oraindik segurtasunez itxi…</translation>
+        <translation type="unfinished">%1 oraindik ez da segurtasunez itxi…</translation>
     </message>
     <message>
         <source>unknown</source>
         <translation type="unfinished">ezezaguna</translation>
     </message>
+    <message>
+        <source>Embedded "%1"</source>
+        <translation type="unfinished">"%1" barneratua</translation>
+    </message>
+    <message>
+        <source>Default system font "%1"</source>
+        <translation type="unfinished">Sistema letra tipo lehenetsia "%1"</translation>
+    </message>
+    <message>
+        <source>Custom…</source>
+        <translation type="unfinished">Pertsonalizatu…</translation>
+    </message>
     <message>
         <source>Amount</source>
         <translation type="unfinished">Kopurua</translation>
     </message>
+    <message>
+        <source>Enter a Bitcoin address (e.g. %1)</source>
+        <translation type="unfinished">Sartu Bitcoin helbide bat (adibidez:%1 )</translation>
+    </message>
+    <message>
+        <source>Unroutable</source>
+        <translation type="unfinished">Bideraezina</translation>
+    </message>
+    <message>
+        <source>Onion</source>
+        <comment>network name</comment>
+        <extracomment>Name of Tor network in peer info</extracomment>
+        <translation type="unfinished">Tipula</translation>
+    </message>
+    <message>
+        <source>Inbound</source>
+        <extracomment>An inbound connection from a peer. An inbound connection is a connection initiated by a peer.</extracomment>
+        <translation type="unfinished">Sarrerakoa</translation>
+    </message>
+    <message>
+        <source>Outbound</source>
+        <extracomment>An outbound connection to a peer. An outbound connection is a connection initiated by us.</extracomment>
+        <translation type="unfinished">Irteerakoa</translation>
+    </message>
+    <message>
+        <source>Full Relay</source>
+        <extracomment>Peer connection type that relays all network information.</extracomment>
+        <translation type="unfinished"> Erabateko erreleboa</translation>
+    </message>
+    <message>
+        <source>Block Relay</source>
+        <extracomment>Peer connection type that relays network information about blocks and not transactions or addresses.</extracomment>
+        <translation type="unfinished">Bloke-erreleboa</translation>
+    </message>
+    <message>
+        <source>Manual</source>
+        <extracomment>Peer connection type established manually through one of several methods.</extracomment>
+        <translation type="unfinished">Eskuzkoa</translation>
+    </message>
+    <message>
+        <source>Feeler</source>
+        <extracomment>Short-lived peer connection type that tests the aliveness of known addresses.</extracomment>
+        <translation type="unfinished">Miaketa</translation>
+    </message>
+    <message>
+        <source>Address Fetch</source>
+        <extracomment>Short-lived peer connection type that solicits known addresses from a peer.</extracomment>
+        <translation type="unfinished">Helbide Bilaketa</translation>
+    </message>
+    <message>
+        <source>Private Broadcast</source>
+        <extracomment>Short-lived peer connection type that is used for broadcasting privacy-sensitive data.</extracomment>
+        <translation type="unfinished">Emisio pribatua</translation>
+    </message>
     <message>
         <source>%1 d</source>
         <translation type="unfinished">%1 e</translation>
@@ -300,51 +388,59 @@ Sinatzea 'legacy' motako helbideekin soilik da posible</translation>
         <source>%1 h</source>
         <translation type="unfinished">%1 o</translation>
     </message>
+    <message>
+        <source>None</source>
+        <translation type="unfinished">Bat ere ez</translation>
+    </message>
     <message numerus="yes">
         <source>%n second(s)</source>
         <translation type="unfinished">
-            <numerusform />
-            <numerusform />
+            <numerusform>%nsegundu</numerusform>
+            <numerusform>%nsegundu</numerusform>
         </translation>
     </message>
     <message numerus="yes">
         <source>%n minute(s)</source>
         <translation type="unfinished">
-            <numerusform />
-            <numerusform />
+            <numerusform>%nminutu</numerusform>
+            <numerusform>%nminutu</numerusform>
         </translation>
     </message>
     <message numerus="yes">
         <source>%n hour(s)</source>
         <translation type="unfinished">
-            <numerusform />
-            <numerusform />
+            <numerusform>%nordu</numerusform>
+            <numerusform>%nordu</numerusform>
         </translation>
     </message>
     <message numerus="yes">
         <source>%n day(s)</source>
         <translation type="unfinished">
-            <numerusform />
-            <numerusform />
+            <numerusform>%negun</numerusform>
+            <numerusform>%negun</numerusform>
         </translation>
     </message>
     <message numerus="yes">
         <source>%n week(s)</source>
         <translation type="unfinished">
-            <numerusform />
-            <numerusform />
+            <numerusform>%naste </numerusform>
+            <numerusform>%naste</numerusform>
         </translation>
     </message>
+    <message>
+        <source>%1 and %2</source>
+        <translation type="unfinished">%1eta%2</translation>
+    </message>
     <message numerus="yes">
         <source>%n year(s)</source>
         <translation type="unfinished">
-            <numerusform />
-            <numerusform />
+            <numerusform>%nurte</numerusform>
+            <numerusform>%nurte</numerusform>
         </translation>
     </message>
     <message>
         <source>default wallet</source>
-        <translation type="unfinished">Diruzorro lehenetsia</translation>
+        <translation type="unfinished">Zorro lehenetsia</translation>
     </message>
 </context>
 <context>
@@ -355,7 +451,7 @@ Sinatzea 'legacy' motako helbideekin soilik da posible</translation>
     </message>
     <message>
         <source>Show general overview of wallet</source>
-        <translation type="unfinished">Diruzorroaren begirada orokorra ikusi</translation>
+        <translation type="unfinished">Zorroaren begirada orokorra ikusi</translation>
     </message>
     <message>
         <source>&amp;Transactions</source>
@@ -363,11 +459,11 @@ Sinatzea 'legacy' motako helbideekin soilik da posible</translation>
     </message>
     <message>
         <source>Browse transaction history</source>
-        <translation type="unfinished">Ikusi transakzioen historia</translation>
+        <translation type="unfinished">Transakzio-historiala arakatu</translation>
     </message>
     <message>
         <source>E&amp;xit</source>
-        <translation type="unfinished">Irten</translation>
+        <translation type="unfinished">I&amp;rten</translation>
     </message>
     <message>
         <source>Quit application</source>
@@ -391,11 +487,11 @@ Sinatzea 'legacy' motako helbideekin soilik da posible</translation>
     </message>
     <message>
         <source>Modify configuration options for %1</source>
-        <translation type="unfinished">%1-ren konfiguraketa aukerak aldatu</translation>
+        <translation type="unfinished">%1-ren konfigurazio-aukerak aldatu</translation>
     </message>
     <message>
         <source>Create a new wallet</source>
-        <translation type="unfinished">Diruzorro berri bat sortu</translation>
+        <translation type="unfinished">Zorro berri bat sortu</translation>
     </message>
     <message>
         <source>&amp;Minimize</source>
@@ -403,7 +499,7 @@ Sinatzea 'legacy' motako helbideekin soilik da posible</translation>
     </message>
     <message>
         <source>Wallet:</source>
-        <translation type="unfinished">Diruzorroa:</translation>
+        <translation type="unfinished">Zorroa:</translation>
     </message>
     <message>
         <source>Network activity disabled.</source>
@@ -420,11 +516,11 @@ Sinatzea 'legacy' motako helbideekin soilik da posible</translation>
     </message>
     <message>
         <source>Backup wallet to another location</source>
-        <translation type="unfinished">Diru-zorroaren segurtasun-kopia beste leku batean.</translation>
+        <translation type="unfinished">Zorroaren segurtasun kopia beste leku batean.</translation>
     </message>
     <message>
         <source>Change the passphrase used for wallet encryption</source>
-        <translation type="unfinished">Diruzorroa enkriptatzeko erabilitako pasahitza aldatu</translation>
+        <translation type="unfinished">Zorroa enkriptatzeko erabilitako pasahitza aldatu</translation>
     </message>
     <message>
         <source>&amp;Send</source>
@@ -440,19 +536,19 @@ Sinatzea 'legacy' motako helbideekin soilik da posible</translation>
     </message>
     <message>
         <source>&amp;Encrypt Wallet…</source>
-        <translation type="unfinished">&amp;Diruzorroa enkriptatu...</translation>
+        <translation type="unfinished">&amp;Zorroa enkriptatu...</translation>
     </message>
     <message>
         <source>Encrypt the private keys that belong to your wallet</source>
-        <translation type="unfinished">Zure diru-zorroari dagozkion giltza pribatuak enkriptatu.</translation>
+        <translation type="unfinished">Zure zorroari dagozkion gako pribatuak zifratu.</translation>
     </message>
     <message>
         <source>&amp;Backup Wallet…</source>
-        <translation type="unfinished">Diruzorroaren &amp;segurtasun kopia egin...</translation>
+        <translation type="unfinished">Zorroaren &amp;segurtasun kopia egin...</translation>
     </message>
     <message>
         <source>&amp;Change Passphrase…</source>
-        <translation type="unfinished">&amp;aldatu pasahitza</translation>
+        <translation type="unfinished">&amp;Aldatu Pasahitza</translation>
     </message>
     <message>
         <source>Sign &amp;message…</source>
@@ -460,15 +556,15 @@ Sinatzea 'legacy' motako helbideekin soilik da posible</translation>
     </message>
     <message>
         <source>Sign messages with your Bitcoin addresses to prove you own them</source>
-        <translation type="unfinished">Sinatu mezuak Bitcoinen helbideekin, jabetza frogatzeko.</translation>
+        <translation type="unfinished">Sinatu mezuak zure Bitcoin helbideekin haien jabetza duzula frogatzeko.</translation>
     </message>
     <message>
         <source>&amp;Verify message…</source>
-        <translation type="unfinished">Mezua &amp;balioztatu</translation>
+        <translation type="unfinished">Mezua &amp;balioztatu...</translation>
     </message>
     <message>
         <source>Verify messages to ensure they were signed with specified Bitcoin addresses</source>
-        <translation type="unfinished">Egiaztatu mesua Bitcoin helbide espezifikoarekin erregistratu direla ziurtatzeko</translation>
+        <translation type="unfinished">Egiaztatu mezuak zehaztutako Bitcoin helbideekin sinatu direla ziurtatzeko.</translation>
     </message>
     <message>
         <source>&amp;Load PSBT from file…</source>
@@ -476,19 +572,19 @@ Sinatzea 'legacy' motako helbideekin soilik da posible</translation>
     </message>
     <message>
         <source>Open &amp;URI…</source>
-        <translation type="unfinished">Ireki&amp;URI...</translation>
+        <translation type="unfinished">Irek i&amp;URI...</translation>
     </message>
     <message>
         <source>Close Wallet…</source>
-        <translation type="unfinished">Diruzorroa itxi...</translation>
+        <translation type="unfinished">Zorroa itxi...</translation>
     </message>
     <message>
         <source>Create Wallet…</source>
-        <translation type="unfinished">Diruzorroa sortu...</translation>
+        <translation type="unfinished">Zorroa sortu...</translation>
     </message>
     <message>
         <source>Close All Wallets…</source>
-        <translation type="unfinished">Diru-zorro guztiak itxi...</translation>
+        <translation type="unfinished">Zorro guztiak itxi...</translation>
     </message>
     <message>
         <source>&amp;File</source>
@@ -508,7 +604,7 @@ Sinatzea 'legacy' motako helbideekin soilik da posible</translation>
     </message>
     <message>
         <source>Syncing Headers (%1%)…</source>
-        <translation type="unfinished">Burukoak sinkronizatzen (%1%)...</translation>
+        <translation type="unfinished">Goiburuak sinkronizatzen (%1%)…</translation>
     </message>
     <message>
         <source>Synchronizing with network…</source>
@@ -526,6 +622,10 @@ Sinatzea 'legacy' motako helbideekin soilik da posible</translation>
         <source>Connecting to peers…</source>
         <translation type="unfinished">Pareekin konektatzen...</translation>
     </message>
+    <message>
+        <source>Request payments (generates QR codes and bitcoin: URIs)</source>
+        <translation type="unfinished">Ordainketak eskatu (QR kodeak eta bitcoin: URIak sortzen ditu)</translation>
+    </message>
     <message>
         <source>Show the list of used sending addresses and labels</source>
         <translation type="unfinished"> Bidalketa-helbideen eta etiketen zerrenda erakutsi</translation>
@@ -541,8 +641,8 @@ Sinatzea 'legacy' motako helbideekin soilik da posible</translation>
     <message numerus="yes">
         <source>Processed %n block(s) of transaction history.</source>
         <translation type="unfinished">
-            <numerusform />
-            <numerusform />
+            <numerusform>Transakzio-historiako %n bloke(k) prozesatu dira.</numerusform>
+            <numerusform>%n bloke prozesatu dira transakzio-historialetik.</numerusform>
         </translation>
     </message>
     <message>
@@ -579,7 +679,7 @@ Sinatzea 'legacy' motako helbideekin soilik da posible</translation>
     </message>
     <message>
         <source>Load Partially Signed Bitcoin Transaction</source>
-        <translation type="unfinished">Partzialki sinatutako Bitcoin transakzioa kargatu</translation>
+        <translation type="unfinished">Zati batean sinatutako Bitcoin transakzioa kargatu</translation>
     </message>
     <message>
         <source>Load PSBT from &amp;clipboard…</source>
@@ -587,12 +687,16 @@ Sinatzea 'legacy' motako helbideekin soilik da posible</translation>
     </message>
     <message>
         <source>Load Partially Signed Bitcoin Transaction from clipboard</source>
-        <translation type="unfinished">Partzialki sinatutako Bitcoin transakzioa kargatu arbeletik</translation>
+        <translation type="unfinished">Kargatu zati batean sinatutako Bitcoin transakzioa arbeletik.</translation>
     </message>
     <message>
         <source>Node window</source>
         <translation type="unfinished">Adabegiaren leihoa</translation>
     </message>
+    <message>
+        <source>Open node debugging and diagnostic console</source>
+        <translation type="unfinished">Ireki nodoaren arazketa- eta diagnostiko-kontsola</translation>
+    </message>
     <message>
         <source>&amp;Sending addresses</source>
         <translation type="unfinished">&amp;Helbideak bidaltzen</translation>
@@ -607,39 +711,91 @@ Sinatzea 'legacy' motako helbideekin soilik da posible</translation>
     </message>
     <message>
         <source>Open Wallet</source>
-        <translation type="unfinished">Diruzorroa zabaldu</translation>
+        <translation type="unfinished">Zorroa zabaldu</translation>
     </message>
     <message>
         <source>Open a wallet</source>
-        <translation type="unfinished">Diruzorro bat zabaldu</translation>
+        <translation type="unfinished">Zorro bat zabaldu</translation>
     </message>
     <message>
         <source>Close wallet</source>
-        <translation type="unfinished">Diruzorroa itxi</translation>
+        <translation type="unfinished">Zorroa itxi</translation>
     </message>
     <message>
         <source>Restore Wallet…</source>
         <extracomment>Name of the menu item that restores wallet from a backup file.</extracomment>
-        <translation type="unfinished">Diru-zorroa berrezarri...</translation>
+        <translation type="unfinished">Zorroa berrezarri...</translation>
     </message>
     <message>
         <source>Restore a wallet from a backup file</source>
         <extracomment>Status tip for Restore Wallet menu item</extracomment>
-        <translation type="unfinished">Berrezarri diru-zorro bat babeskopia artxibo batetik.</translation>
+        <translation type="unfinished">Berreskuratu zorro bat segurtasun-kopia-fitxategi batetik.</translation>
     </message>
     <message>
         <source>Close all wallets</source>
-        <translation type="unfinished">Diruzorro guztiak itxi</translation>
+        <translation type="unfinished">Zorro guztiak itxi</translation>
+    </message>
+    <message>
+        <source>Migrate Wallet</source>
+        <translation type="unfinished">Migra ezazu zorroa</translation>
+    </message>
+    <message>
+        <source>Migrate a wallet</source>
+        <translation type="unfinished">Zorroren bat migratu</translation>
+    </message>
+    <message>
+        <source>Show the %1 help message to get a list with possible Bitcoin command-line options</source>
+        <translation type="unfinished">Erakutsi %1(r)en laguntza-mezua Bitcoin-en komando-lerroko aukera posibleen zerrenda lortzeko.</translation>
+    </message>
+    <message>
+        <source>&amp;Mask values</source>
+        <translation type="unfinished">&amp;Maskaratu balioak</translation>
+    </message>
+    <message>
+        <source>Mask the values in the Overview tab</source>
+        <translation type="unfinished">Maskaratu balioak "Ikuspegi orokorra" fitxan.</translation>
     </message>
     <message>
         <source>No wallets available</source>
         <translation type="unfinished">Ez dago diru-zorrorik eskura</translation>
     </message>
+    <message>
+        <source>Wallet Data</source>
+        <extracomment>Name of the wallet data file format.</extracomment>
+        <translation type="unfinished">Zorroaren datuak</translation>
+    </message>
+    <message>
+        <source>Load Wallet Backup</source>
+        <extracomment>The title for Restore Wallet File Windows</extracomment>
+        <translation type="unfinished">Kargatu zorroaren segurtasun-kopia.</translation>
+    </message>
+    <message>
+        <source>Restore Wallet</source>
+        <extracomment>Title of pop-up window shown when the user is attempting to restore a wallet.</extracomment>
+        <translation type="unfinished">Zorroa berreskuratu</translation>
+    </message>
     <message>
         <source>Wallet Name</source>
         <extracomment>Label of the input field where the name of the wallet is entered.</extracomment>
         <translation type="unfinished">Diruzorroaren izena</translation>
     </message>
+    <message>
+        <source>Invalid Wallet Name</source>
+        <translation type="unfinished">Zorroaren izen baliogabea</translation>
+    </message>
+    <message>
+        <source>Wallet name cannot be empty</source>
+        <translation type="unfinished">Zorroaren izena ezin da hutsik egon</translation>
+    </message>
+    <message>
+        <source>Restore and Migrate Wallet Backup</source>
+        <translation type="unfinished">Zorroaren segurtasun kopia berreskuratu eta migratu</translation>
+    </message>
+    <message>
+        <source>Restore and Migrate Wallet</source>
+        <extracomment>Title of pop-up window shown when the user is attempting to restore a wallet.</extracomment>
+        <translation type="unfinished">Zorroa berreskuratu eta migratu</translation>
+    </message>
     <message>
         <source>&amp;Window</source>
         <translation type="unfinished">&amp;Lehioa</translation>
@@ -668,8 +824,8 @@ Sinatzea 'legacy' motako helbideekin soilik da posible</translation>
         <source>%n active connection(s) to Bitcoin network.</source>
         <extracomment>A substring of the tooltip.</extracomment>
         <translation type="unfinished">
-            <numerusform />
-            <numerusform />
+            <numerusform>%nBitcoin sarearekiko konexio aktibo.</numerusform>
+            <numerusform>%n konexio aktibo Bitcoin sarearekin.</numerusform>
         </translation>
     </message>
     <message>
@@ -680,21 +836,25 @@ Sinatzea 'legacy' motako helbideekin soilik da posible</translation>
     <message>
         <source>Show Peers tab</source>
         <extracomment>A context menu item. The "Peers tab" is an element of the "Node window".</extracomment>
-        <translation type="unfinished">Erakutxi kideen fitxa</translation>
+        <translation type="unfinished">Erakutsi "Parekoak" fitxa.</translation>
     </message>
     <message>
         <source>Disable network activity</source>
         <extracomment>A context menu item.</extracomment>
-        <translation type="unfinished">Sareko jarduera desaktibatu</translation>
+        <translation type="unfinished">Desaktibatu sare jarduera.</translation>
     </message>
     <message>
         <source>Enable network activity</source>
         <extracomment>A context menu item. The network activity was disabled previously.</extracomment>
-        <translation type="unfinished">Sareko jarduera aktibatu</translation>
+        <translation type="unfinished">Gaitu sare jarduera</translation>
+    </message>
+    <message>
+        <source>Pre-syncing Headers (%1%)…</source>
+        <translation type="unfinished">Goiburuak aurresinkronizatzen (%1%)…</translation>
     </message>
     <message>
         <source>Error: %1</source>
-        <translation type="unfinished">Akatsa: %1</translation>
+        <translation type="unfinished">Errorea: %1</translation>
     </message>
     <message>
         <source>Warning: %1</source>
@@ -715,7 +875,7 @@ Sinatzea 'legacy' motako helbideekin soilik da posible</translation>
     <message>
         <source>Wallet: %1
 </source>
-        <translation type="unfinished">Diruzorroa: %1
+        <translation type="unfinished">Zorroa: %1
 </translation>
     </message>
     <message>
@@ -769,6 +929,13 @@ Sinatzea 'legacy' motako helbideekin soilik da posible</translation>
         <translation type="unfinished">Jatorrizko mezua:</translation>
     </message>
 </context>
+<context>
+    <name>UnitDisplayStatusBarControl</name>
+    <message>
+        <source>Unit to show amounts in. Click to select another unit.</source>
+        <translation type="unfinished">Kopuruak bistaratzeko unitatea. Egin klik beste unitate bat hautatzeko.</translation>
+    </message>
+</context>
 <context>
     <name>CoinControlDialog</name>
     <message>
@@ -789,16 +956,20 @@ Sinatzea 'legacy' motako helbideekin soilik da posible</translation>
     </message>
     <message>
         <source>Fee:</source>
-        <translation type="unfinished">Ordainketa:</translation>
+        <translation type="unfinished">Komisioa:</translation>
     </message>
     <message>
         <source>After Fee:</source>
-        <translation type="unfinished">Ordaindu ondoren:</translation>
+        <translation type="unfinished">Komisioaren ondoren:</translation>
     </message>
     <message>
         <source>Change:</source>
         <translation type="unfinished">Bueltak:</translation>
     </message>
+    <message>
+        <source>(un)select all</source>
+        <translation type="unfinished">Guztia hautatu/hautatu gabe</translation>
+    </message>
     <message>
         <source>Tree mode</source>
         <translation type="unfinished">Zuhaitz modua</translation>
@@ -833,7 +1004,7 @@ Sinatzea 'legacy' motako helbideekin soilik da posible</translation>
     </message>
     <message>
         <source>Copy amount</source>
-        <translation type="unfinished">zenbatekoaren kopia</translation>
+        <translation type="unfinished">Kopiatu zenbatekoa</translation>
     </message>
     <message>
         <source>&amp;Copy address</source>
@@ -843,6 +1014,22 @@ Sinatzea 'legacy' motako helbideekin soilik da posible</translation>
         <source>Copy &amp;label</source>
         <translation type="unfinished">Kopiatu &amp;Etiketa</translation>
     </message>
+    <message>
+        <source>Copy &amp;amount</source>
+        <translation type="unfinished">Kopiatu kopurua</translation>
+    </message>
+    <message>
+        <source>Copy transaction &amp;ID and output index</source>
+        <translation type="unfinished">Kopiatu transakzioaren &amp;IDa eta irteera-indizea</translation>
+    </message>
+    <message>
+        <source>L&amp;ock unspent</source>
+        <translation type="unfinished">Gastatu gabeak blokeatu</translation>
+    </message>
+    <message>
+        <source>&amp;Unlock unspent</source>
+        <translation type="unfinished">Gastatu gabe dagoena desblokeatu</translation>
+    </message>
     <message>
         <source>Copy quantity</source>
         <translation type="unfinished">Kopia kopurua</translation>
@@ -853,11 +1040,11 @@ Sinatzea 'legacy' motako helbideekin soilik da posible</translation>
     </message>
     <message>
         <source>Copy after fee</source>
-        <translation type="unfinished">Kopia kuotaren ondoren</translation>
+        <translation type="unfinished">Kopiatu komisioaren ondorengo zenbatekoa</translation>
     </message>
     <message>
         <source>Copy bytes</source>
-        <translation type="unfinished">Kopiatu byte-ak</translation>
+        <translation type="unfinished">Kopiatu byteak</translation>
     </message>
     <message>
         <source>Copy change</source>
@@ -867,9 +1054,17 @@ Sinatzea 'legacy' motako helbideekin soilik da posible</translation>
         <source>(%1 locked)</source>
         <translation type="unfinished">(%1 blokeatuta)</translation>
     </message>
+    <message>
+        <source>Can vary +/- %1 satoshi(s) per input.</source>
+        <translation type="unfinished">Sarrerako bakoitzeko %1 satoshi gehi/minus aldatu daiteke.</translation>
+    </message>
     <message>
         <source>(no label)</source>
-        <translation type="unfinished">(izendapenik ez)</translation>
+        <translation type="unfinished">(etiketarik gabe)</translation>
+    </message>
+    <message>
+        <source>change from %1 (%2)</source>
+        <translation type="unfinished">aldaketa hemendik%1 (%2)</translation>
     </message>
     <message>
         <source>(change)</source>
@@ -881,104 +1076,253 @@ Sinatzea 'legacy' motako helbideekin soilik da posible</translation>
     <message>
         <source>Create Wallet</source>
         <extracomment>Title of window indicating the progress of creation of a new wallet.</extracomment>
-        <translation type="unfinished">Diruzorroa sortu</translation>
+        <translation type="unfinished">Zorroa sortu</translation>
     </message>
     <message>
         <source>Creating Wallet &lt;b&gt;%1&lt;/b&gt;…</source>
         <extracomment>Descriptive text of the create wallet progress window which indicates to the user which wallet is currently being created.</extracomment>
-        <translation type="unfinished">Diru-zorroa sortzen&lt;b&gt;%1&lt;/b&gt;...</translation>
+        <translation type="unfinished">Zorroa sortzen&lt;b&gt;%1&lt;/b&gt;...</translation>
     </message>
     <message>
         <source>Create wallet failed</source>
-        <translation type="unfinished">Diruzorroa sortzen hutsegitea</translation>
+        <translation type="unfinished">Zorroa sortzen hutsegitea</translation>
     </message>
     <message>
         <source>Create wallet warning</source>
-        <translation type="unfinished">Diru-zorroa sortzearen buruzko oharra</translation>
+        <translation type="unfinished">Zorroa sortzearen buruzko oharra</translation>
     </message>
     <message>
         <source>Can't list signers</source>
         <translation type="unfinished">Ezin dira sinatzaileak zerrendatu</translation>
     </message>
-    </context>
+    <message>
+        <source>Too many external signers found</source>
+        <translation type="unfinished">Kanpoko sinatzaile gehiegi aurkitu dira</translation>
+    </message>
+</context>
 <context>
     <name>LoadWalletsActivity</name>
     <message>
         <source>Load Wallets</source>
         <extracomment>Title of progress window which is displayed when wallets are being loaded.</extracomment>
-        <translation type="unfinished">Kargatu diruzorroak</translation>
+        <translation type="unfinished">Zorroak kargatu</translation>
     </message>
     <message>
         <source>Loading wallets…</source>
         <extracomment>Descriptive text of the load wallets progress window which indicates to the user that wallets are currently being loaded.</extracomment>
-        <translation type="unfinished">Diruzorroak kargatzen...</translation>
+        <translation type="unfinished">Zorroak kargatzen...</translation>
+    </message>
+</context>
+<context>
+    <name>MigrateWalletActivity</name>
+    <message>
+        <source>Migrate wallet</source>
+        <translation type="unfinished">Zorroa migratu</translation>
+    </message>
+    <message>
+        <source>Are you sure you wish to migrate the wallet &lt;i&gt;%1&lt;/i&gt;?</source>
+        <translation type="unfinished">Zihur zaude zorroa  &lt;i&gt;%1&lt;/i&gt;migratu nahi duzula?</translation>
+    </message>
+    <message>
+        <source>Migrating the wallet will convert this wallet to one or more descriptor wallets. A new wallet backup will need to be made.
+If this wallet contains any watchonly scripts, a new wallet will be created which contains those watchonly scripts.
+If this wallet contains any solvable but not watched scripts, a different and new wallet will be created which contains those scripts.
+
+The migration process will create a backup of the wallet before migrating. This backup file will be named &lt;wallet name&gt;-&lt;timestamp&gt;.legacy.bak and can be found in the directory for this wallet. In the event of an incorrect migration, the backup can be restored with the "Restore Wallet" functionality.</source>
+        <translation type="unfinished">Zorroa migratzean, zorro hau deskribatzaile-zorro batean edo gehiagotan bihurtuko da. Zorroaren babeskopia berri bat egin beharko da.
+Zorro honek watch-only script-ak baditu, script horiek dituen zorro berri bat sortuko da.
+Zorro honek ebazgarriak baina ez zaindutakoak diren script-ak baditu, script horiek dituen beste zorro berri bat sortuko da.
+
+Migrazio-prozesuak zorroaren segurtasun-kopia bat sortuko du migratu aurretik. Segurtasun-kopia hori &lt;wallet name&gt;-&lt;timestamp&gt; .legacy.bak izendatuko da eta zorro honen direktorioan aurkituko da. Migrazioa okerra bada, segurtasun-kopia hori berreskuratu daiteke "Zorroa Berreskuratu" funtzionalitatearen bidez.</translation>
+    </message>
+    <message>
+        <source>Migrate Wallet</source>
+        <translation type="unfinished">Migra ezazu zorroa</translation>
+    </message>
+    <message>
+        <source>Migrating Wallet &lt;b&gt;%1&lt;/b&gt;…</source>
+        <translation type="unfinished">Zorroa migratzen &lt;b&gt;%1&lt;/b&gt; …</translation>
+    </message>
+    <message>
+        <source>The wallet '%1' was migrated successfully.</source>
+        <translation type="unfinished">'%1' zorroa arrakastaz migratu da.</translation>
+    </message>
+    <message>
+        <source>Watchonly scripts have been migrated to a new wallet named '%1'.</source>
+        <translation type="unfinished">Ikusmen-soil scriptak '%1' izeneko zorro berri batera migratu dira.</translation>
+    </message>
+    <message>
+        <source>Solvable but not watched scripts have been migrated to a new wallet named '%1'.</source>
+        <translation type="unfinished">Ebatz daitezkeen baina ez diren ikusi scriptak '%1' izeneko diru-zorro berri batera migratu dira.</translation>
+    </message>
+    <message>
+        <source>Restore and Migrate wallet</source>
+        <translation type="unfinished">Zorroa berreskuratu eta migratu</translation>
+    </message>
+    <message>
+        <source>Are you sure you wish to restore the wallet file &lt;i&gt;%1&lt;/i&gt; to &lt;i&gt;%2&lt;/i&gt; and migrate it?</source>
+        <translation type="unfinished">Ziur zaude &lt;i&gt;%1&lt;/i&gt; zorro fitxategia &lt;i&gt;%2&lt;/i&gt;ra berreskuratu eta migratu nahi duzula?</translation>
+    </message>
+    <message>
+        <source>Restoring the wallet will copy the backup file to the wallets directory and place it in the standard wallet directory layout. The original file will not be modified.
+
+Migrating the wallet will convert the restored wallet to one or more descriptor wallets. A new wallet backup will need to be made.
+If this wallet contains any watchonly scripts, a new wallet will be created which contains those watchonly scripts.
+If this wallet contains any solvable but not watched scripts, a different and new wallet will be created which contains those scripts.
+
+The migration process will create a backup of the wallet before migrating. This backup file will be named &lt;wallet name&gt;-&lt;timestamp&gt;.legacy.bak and can be found in the directory for this wallet. In the event of an incorrect migration, the backup can be restored with the "Restore Wallet" functionality.</source>
+        <translation type="unfinished">Zorroa berreskuratzeak segurtasun-kopiako fitxategia zorroen direktoriora kopiatuko du eta ohiko zorro-diren egituran kokatuko du. Jatorrizko fitxategia ez da aldatuko.
+
+Zorroa migratzeak berreskuratuta dagoen zorroa deskriptore-zorro batean edo gehiagotan bihurtuko du. Zorroaren segurtasun-kopia berria sortu beharko da.
+Zorro honek behaketa-soilik diren skripteren bat badu, skriptu horiek jasoko dituen zorro berri bat sortuko da.
+Zorro honek konpon daitezkeen baina behatzen ez diren skripteren bat badu, skriptu horiek jasoko dituen beste zorro berri eta desberdin bat sortuko da.
+
+Migrazio-prozesuak zorroaren segurtasun-kopia bat sortuko du migratu aurretik. Segurtasun-kopia hori &lt;wallet name&gt;-&lt;timestamp&gt;.legacy.bak izendatuko da, eta zorro horren direktorioan aurkituko da. Migrazio okerren bat gertatuz gero, segurtasun kopia “Zorroa Berreskuratu” funtzionalitatearekin lehenera daiteke.</translation>
+    </message>
+    <message>
+        <source>Restore Wallet</source>
+        <extracomment>Title of progress window which is displayed when wallets are being restored.</extracomment>
+        <translation type="unfinished">Diruzorroa berreskuratu</translation>
+    </message>
+    <message>
+        <source>Restoring Wallet &lt;b&gt;%1&lt;/b&gt;…</source>
+        <extracomment>Descriptive text of the restore wallets progress window which indicates to the user that wallets are currently being restored.</extracomment>
+        <translation type="unfinished">Diruzorroa berritzen  &lt;b&gt;%1&lt;/b&gt;…</translation>
+    </message>
+    <message>
+        <source>Migration failed</source>
+        <translation type="unfinished">Migrazioa huts egin da</translation>
+    </message>
+    <message>
+        <source>Migration Successful</source>
+        <translation type="unfinished">Migrazioa arrakastatsua izan da</translation>
     </message>
 </context>
 <context>
     <name>OpenWalletActivity</name>
     <message>
         <source>Open wallet failed</source>
-        <translation type="unfinished">Diruzorroa irekitzen hutsegitea</translation>
+        <translation type="unfinished">Zorroa irekitzen hutsegitea</translation>
     </message>
     <message>
         <source>Open wallet warning</source>
-        <translation type="unfinished">Diruzorroa irekitzen abisua</translation>
+        <translation type="unfinished">Zorroa irekitzen abisua</translation>
     </message>
     <message>
         <source>Open Wallet</source>
         <extracomment>Title of window indicating the progress of opening of a wallet.</extracomment>
-        <translation type="unfinished">Diruzorroa zabaldu</translation>
+        <translation type="unfinished">Zorroa zabaldu</translation>
     </message>
     <message>
         <source>Opening Wallet &lt;b&gt;%1&lt;/b&gt;…</source>
         <extracomment>Descriptive text of the open wallet progress window which indicates to the user which wallet is currently being opened.</extracomment>
-        <translation type="unfinished">&lt;b&gt;%1&lt;/b&gt; diruzorroa irekitzen ...</translation>
+        <translation type="unfinished">&lt;b&gt;%1&lt;/b&gt; zorroa irekitzen ...</translation>
+    </message>
+</context>
+<context>
+    <name>RestoreWalletActivity</name>
+    <message>
+        <source>Restore Wallet</source>
+        <extracomment>Title of progress window which is displayed when wallets are being restored.</extracomment>
+        <translation type="unfinished">Zorroa berreskuratu</translation>
+    </message>
+    <message>
+        <source>Restoring Wallet &lt;b&gt;%1&lt;/b&gt;…</source>
+        <extracomment>Descriptive text of the restore wallets progress window which indicates to the user that wallets are currently being restored.</extracomment>
+        <translation type="unfinished">Zorroa berritzen  &lt;b&gt;%1&lt;/b&gt;…</translation>
+    </message>
+    <message>
+        <source>Restore wallet failed</source>
+        <extracomment>Title of message box which is displayed when the wallet could not be restored.</extracomment>
+        <translation type="unfinished">Zorroa berreskuratzea huts egin da</translation>
+    </message>
+    <message>
+        <source>Restore wallet warning</source>
+        <extracomment>Title of message box which is displayed when the wallet is restored with some warning.</extracomment>
+        <translation type="unfinished">Zorroa berreskuratzeko abisua</translation>
+    </message>
+    <message>
+        <source>Restore wallet message</source>
+        <extracomment>Title of message box which is displayed when the wallet is successfully restored.</extracomment>
+        <translation type="unfinished">Zorroa berreskuratzeko mezua</translation>
     </message>
 </context>
 <context>
     <name>WalletController</name>
     <message>
         <source>Close wallet</source>
-        <translation type="unfinished">Diruzorroa itxi</translation>
+        <translation type="unfinished">Zorroa itxi</translation>
+    </message>
+    <message>
+        <source>Are you sure you wish to close the wallet &lt;i&gt;%1&lt;/i&gt;?</source>
+        <translation type="unfinished">Ziur al zaude zorroa &lt;i&gt;%1&lt;/i&gt; itxi nahi duzula?</translation>
+    </message>
+    <message>
+        <source>Closing the wallet for too long can result in having to resync the entire chain if pruning is enabled.</source>
+        <translation type="unfinished">Zorroa denbora luzez itxi gabe uzteak bloke-katea guztia berriro sinkronizatu beharra ekar dezake, moztea gaituta badago.</translation>
     </message>
     <message>
         <source>Close all wallets</source>
-        <translation type="unfinished">Diruzorro guztiak itxi</translation>
+        <translation type="unfinished">Zorro guztiak itxi</translation>
     </message>
     <message>
         <source>Are you sure you wish to close all wallets?</source>
-        <translation type="unfinished">Ziur diruzorro guztiak itxi nahi dituzula?</translation>
+        <translation type="unfinished">Ziur zaude zorro guztiak itxi nahi dituzula?</translation>
     </message>
 </context>
 <context>
     <name>CreateWalletDialog</name>
     <message>
         <source>Create Wallet</source>
-        <translation type="unfinished">Diruzorroa sortu</translation>
+        <translation type="unfinished">Zorroa sortu</translation>
+    </message>
+    <message>
+        <source>You are one step away from creating your new wallet!</source>
+        <translation type="unfinished">Zure zorro berri sortzeko pauso bakarra gelditzen da!</translation>
+    </message>
+    <message>
+        <source>Please provide a name and, if desired, enable any advanced options</source>
+        <translation type="unfinished">Mesedez, eman izen bat eta nahi izanez gero, gaitz ezazu aukerarik aurreratua.</translation>
     </message>
     <message>
         <source>Wallet Name</source>
-        <translation type="unfinished">Diruzorroaren izena</translation>
+        <translation type="unfinished">Zorroaren izena</translation>
     </message>
     <message>
         <source>Wallet</source>
-        <translation type="unfinished">Diru-zorroa</translation>
+        <translation type="unfinished">Zorroa</translation>
+    </message>
+    <message>
+        <source>Encrypt the wallet. The wallet will be encrypted with a passphrase of your choice.</source>
+        <translation type="unfinished">Zorroa enkriptatu. Zorroa zure aukeratutako pasahitzarekin enkriptatuko da.</translation>
     </message>
     <message>
         <source>Encrypt Wallet</source>
-        <translation type="unfinished">Diruzorroa enkriptatu</translation>
+        <translation type="unfinished">Zorroa enkriptatu</translation>
     </message>
     <message>
         <source>Advanced Options</source>
         <translation type="unfinished">Aukera aurreratuak</translation>
     </message>
+    <message>
+        <source>Disable private keys for this wallet. Wallets with private keys disabled will have no private keys and cannot have an HD seed or imported private keys. This is ideal for watch-only wallets.</source>
+        <translation type="unfinished">Zorro honentzako gako pribatua desgaitu. Gako pribaturik ez duten zorroek ez dute gako pribaturik izango eta ezin izango dute HD hazia edo inportatutako gako pribaturik izan. Hau egokia da watch-only zorroentzat.</translation>
+    </message>
     <message>
         <source>Disable Private Keys</source>
         <translation type="unfinished">Desgaitu gako pribatuak</translation>
     </message>
+    <message>
+        <source>Make a blank wallet. Blank wallets do not initially have private keys or scripts. Private keys and addresses can be imported using descriptors at a later time.</source>
+        <translation type="unfinished">Zorro huts bat sortu. Zorro hutsek ez dute hasieran giltza pribaturik edo skriprik izaten. Giltza pribatuak eta helbideak geroago inporta daitezke deskriptoreen bidez.</translation>
+    </message>
     <message>
         <source>Make Blank Wallet</source>
-        <translation type="unfinished">Egin diruzorro hutsa...</translation>
+        <translation type="unfinished">Egin zorro hutsa...</translation>
+    </message>
+    <message>
+        <source>Use an external signing device such as a hardware wallet. Configure the external signer script in wallet preferences first.</source>
+        <translation type="unfinished">Erabili kanpoko sinatze-gailu bat, adibidez, hardware-zorroa. Lehenik, konfiguratu kanpoko sinatzailearen script-a zorroaren lehentasunetan.</translation>
     </message>
     <message>
         <source>External signer</source>
@@ -988,7 +1332,12 @@ Sinatzea 'legacy' motako helbideekin soilik da posible</translation>
         <source>Create</source>
         <translation type="unfinished">Sortu</translation>
     </message>
-    </context>
+    <message>
+        <source>Compiled without external signing support (required for external signing)</source>
+        <extracomment>"External signing" means using devices such as hardware wallets.</extracomment>
+        <translation type="unfinished">Kanpoko sinatze-euskarririk gabe konpilatu da (kanpoko sinatzeetarako beharrezkoa).</translation>
+    </message>
+</context>
 <context>
     <name>EditAddressDialog</name>
     <message>
@@ -999,6 +1348,14 @@ Sinatzea 'legacy' motako helbideekin soilik da posible</translation>
         <source>&amp;Label</source>
         <translation type="unfinished">&amp;Etiketa</translation>
     </message>
+    <message>
+        <source>The label associated with this address list entry</source>
+        <translation type="unfinished">Helbide zerrenda honi dagozkion etiketak</translation>
+    </message>
+    <message>
+        <source>The address associated with this address list entry. This can only be modified for sending addresses.</source>
+        <translation type="unfinished">Helbide zerrenda sarrera honi lotutako helbidea. Hau bidaltzeko helbideetan bakarrik aldatu daiteke.</translation>
+    </message>
     <message>
         <source>&amp;Address</source>
         <translation type="unfinished">&amp;Helbidea</translation>
@@ -1015,9 +1372,21 @@ Sinatzea 'legacy' motako helbideekin soilik da posible</translation>
         <source>Edit sending address</source>
         <translation type="unfinished">Bidaltzeko helbidea editatu</translation>
     </message>
+    <message>
+        <source>The entered address "%1" is not a valid Bitcoin address.</source>
+        <translation type="unfinished">Sartutako "%1" helbidea ez da baliozko Bitcoin helbide bat.</translation>
+    </message>
+    <message>
+        <source>Address "%1" already exists as a receiving address with label "%2" and so cannot be added as a sending address.</source>
+        <translation type="unfinished">"%1" helbidea dagoeneko existitzen da helbide hartzaile gisa "%2" etiketa duela, eta ezin da gehiago helbide igorle gisa gehitu.</translation>
+    </message>
+    <message>
+        <source>The entered address "%1" is already in the address book with label "%2".</source>
+        <translation type="unfinished">Sartutako "%1" helbidea dagoeneko dago helbide-liburuan "%2" etiketa duela.</translation>
+    </message>
     <message>
         <source>Could not unlock wallet.</source>
-        <translation type="unfinished">Ezin da diruzorroa desblokeatu.</translation>
+        <translation type="unfinished">Ezin da zorroa desblokeatu.</translation>
     </message>
     <message>
         <source>New key generation failed.</source>
@@ -1034,6 +1403,10 @@ Sinatzea 'legacy' motako helbideekin soilik da posible</translation>
         <source>name</source>
         <translation type="unfinished">izena</translation>
     </message>
+    <message>
+        <source>Directory already exists. Add %1 if you intend to create a new directory here.</source>
+        <translation type="unfinished">Direktorioa dagoeneko existitzen da. Sortu %1hemen direktorio berri bat nahi baduzu.</translation>
+    </message>
     <message>
         <source>Path already exists, and is not a directory.</source>
         <translation type="unfinished">Bidea existitzen da, eta ez da direktorioa.</translation>
@@ -1064,7 +1437,11 @@ Sinatzea 'legacy' motako helbideekin soilik da posible</translation>
         <source>%1 is shutting down…</source>
         <translation type="unfinished">%1Itzaltzen ari da...</translation>
     </message>
-    </context>
+    <message>
+        <source>Do not shut down the computer until this window disappears.</source>
+        <translation type="unfinished">Leiho hau desagertu arte ez itzali ordenagailua.</translation>
+    </message>
+</context>
 <context>
     <name>Intro</name>
     <message>
@@ -1075,10 +1452,34 @@ Sinatzea 'legacy' motako helbideekin soilik da posible</translation>
         <source>Welcome to %1.</source>
         <translation type="unfinished">Ongietorri %1-ra</translation>
     </message>
+    <message>
+        <source>As this is the first time the program is launched, you can choose where %1 will store its data.</source>
+        <translation type="unfinished">Programa lehen aldiz abiarazten denez, datuak %1non gordeko diren hauta dezakezu.</translation>
+    </message>
+    <message>
+        <source>Limit block chain storage to</source>
+        <translation type="unfinished">Blokekatearen biltegiratzea honetara mugatu</translation>
+    </message>
+    <message>
+        <source>Reverting this setting requires re-downloading the entire blockchain. It is faster to download the full chain first and prune it later. Disables some advanced features.</source>
+        <translation type="unfinished">Ezarpen hau atzera botatzeak blockchain osoa berriro deskargatzea eskatzen du. Azkarragoa da kate osoa lehenik deskargatzea eta gero moztea. Ezaugarri aurreratu batzuk desgaitzen ditu.</translation>
+    </message>
     <message>
         <source> GB</source>
         <translation type="unfinished">GB</translation>
     </message>
+    <message>
+        <source>This initial synchronisation is very demanding, and may expose hardware problems with your computer that had previously gone unnoticed. Each time you run %1, it will continue downloading where it left off.</source>
+        <translation type="unfinished">Hasiera sinkronizazio hori oso eskatzailea da, eta ordenagailuan aurretik nabaritu gabeko arazo hardwareak agerian ditzake. Aldi bakoitzean exekutatzen duzunean %1, bertan utzi zuen lekutik deskargatzen jarraituko du.</translation>
+    </message>
+    <message>
+        <source>When you click OK, %1 will begin to download and process the full %4 block chain (%2 GB) starting with the earliest transactions in %3 when %4 initially launched.</source>
+        <translation type="unfinished">Ados sakatzen duzunean, %1-ek %4blockchain osoa ( %2GB) deskargatzen eta prozesatzen hasiko da, lehen aldiz abiarazi zenean %3-ko lehen %4 transakzioetatik hasita.</translation>
+    </message>
+    <message>
+        <source>If you have chosen to limit block chain storage (pruning), the historical data must still be downloaded and processed, but will be deleted afterward to keep your disk usage low.</source>
+        <translation type="unfinished">Bloke katearen biltegiratzea mugatzeko aukeratu baduzu (moztea), datu historikoak oraindik deskargatu eta prozesatu beharko dira, baina gero ezabatuko dira zure diskoaren erabilera baxua izateko.</translation>
+    </message>
     <message>
         <source>Use the default data directory</source>
         <translation type="unfinished">Erabili datu direktorio lehenetsia</translation>
@@ -1090,32 +1491,56 @@ Sinatzea 'legacy' motako helbideekin soilik da posible</translation>
     <message numerus="yes">
         <source>%n GB of space available</source>
         <translation type="unfinished">
-            <numerusform />
-            <numerusform />
+            <numerusform>%nGB leku erabilgarri.</numerusform>
+            <numerusform>%nGB leku erabilgarri.</numerusform>
         </translation>
     </message>
     <message numerus="yes">
         <source>(of %n GB needed)</source>
         <translation type="unfinished">
-            <numerusform />
-            <numerusform />
+            <numerusform>( behar diren %n GB-tik )</numerusform>
+            <numerusform>( behar diren %nGB-tik )</numerusform>
         </translation>
     </message>
     <message numerus="yes">
         <source>(%n GB needed for full chain)</source>
         <translation type="unfinished">
-            <numerusform />
-            <numerusform />
+            <numerusform>(kate osoarentzat behar diren %n GB)</numerusform>
+            <numerusform>(kate osoarentzat behar diren %n GB)</numerusform>
         </translation>
     </message>
+    <message>
+        <source>Choose data directory</source>
+        <translation type="unfinished">Datu karpeta hautatu</translation>
+    </message>
+    <message>
+        <source>At least %1 GB of data will be stored in this directory, and it will grow over time.</source>
+        <translation type="unfinished">Gutxienez %1 GB datu gordeko dira direktorio honetan, eta denborarekin handitzen joango da.</translation>
+    </message>
+    <message>
+        <source>Approximately %1 GB of data will be stored in this directory.</source>
+        <translation type="unfinished">Gutxi gorabehera %1GB datu gordeko dira direktorio honetan.</translation>
+    </message>
     <message numerus="yes">
         <source>(sufficient to restore backups %n day(s) old)</source>
         <extracomment>Explanatory text on the capability of the current prune target.</extracomment>
         <translation type="unfinished">
-            <numerusform />
-            <numerusform />
+            <numerusform>( duela%n egun batzuk egindako babeskopiak berreskuratzeko nahikoa)</numerusform>
+            <numerusform>( duela %n egun batzuk egindako babeskopiak berreskuratzeko nahikoa)</numerusform>
         </translation>
     </message>
+    <message>
+        <source>%1 will download and store a copy of the Bitcoin block chain.</source>
+        <translation type="unfinished">%1Bitcoin bloke-katearen kopia bat deskargatu eta gordeko du.</translation>
+    </message>
+    <message>
+        <source>The wallet will also be stored in this directory.</source>
+        <translation type="unfinished">Zorroa karpeta honetan ere gorde egingo da.</translation>
+    </message>
+    <message>
+        <source>Error: Specified data directory "%1" cannot be created.</source>
+        <translation type="unfinished">Errorea: ezin da sortu zehaztutako datu-direktorioa "%1".</translation>
+    </message>
     <message>
         <source>Error</source>
         <translation type="unfinished">Akatsa</translation>
@@ -1127,6 +1552,14 @@ Sinatzea 'legacy' motako helbideekin soilik da posible</translation>
         <source>Form</source>
         <translation type="unfinished">Inprimakia</translation>
     </message>
+    <message>
+        <source>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.</source>
+        <translation type="unfinished">Azken transakzioak baliteke oraindik ikusgai ez egotea, eta, hortaz, zure zorroaren saldoa ez da zuzena izan daiteke. Informazio hau eguneratua egongo da zure zorroa Bitcoin sarearekin sinkronizatzea amaitzen duenean, behean zehazten den bezala.</translation>
+    </message>
+    <message>
+        <source>Attempting to spend bitcoins that are affected by not-yet-displayed transactions will not be accepted by the network.</source>
+        <translation type="unfinished">Oraindik bistaratugabe dauden transakzioek eragindako bitcoin-ak gastatzen saiatzea ez du sareak onartuko.</translation>
+    </message>
     <message>
         <source>Number of blocks left</source>
         <translation type="unfinished">Gainerako blokeen kopurua.</translation>
@@ -1151,11 +1584,27 @@ Sinatzea 'legacy' motako helbideekin soilik da posible</translation>
         <source>Progress increase per hour</source>
         <translation type="unfinished">Aurrerapenaren igoera orduko</translation>
     </message>
+    <message>
+        <source>Estimated time left until synced</source>
+        <translation type="unfinished">Sinkronizazioa amaitzeko estimatutako denbora geratzen dena.</translation>
+    </message>
     <message>
         <source>Hide</source>
         <translation type="unfinished">Izkutatu</translation>
     </message>
-    </context>
+    <message>
+        <source>%1 is currently syncing.  It will download headers and blocks from peers and validate them until reaching the tip of the block chain.</source>
+        <translation type="unfinished">%1orain sinkronizatzen ari da. Kideen buruak eta blokeak deskargatuko ditu, eta balioztatuko ditu bloke-katearen punturik gorenera iritsi arte.</translation>
+    </message>
+    <message>
+        <source>Unknown. Syncing Headers (%1, %2%)…</source>
+        <translation type="unfinished">Ezezaguna. Buruak sinkronizatzen (%1, %2%)…</translation>
+    </message>
+    <message>
+        <source>Unknown. Pre-syncing Headers (%1, %2%)…</source>
+        <translation type="unfinished">Ezezaguna. Aurre-sinkronizazio goiburuak (%1, %2%)…</translation>
+    </message>
+</context>
 <context>
     <name>OpenURIDialog</name>
     <message>
@@ -1169,7 +1618,7 @@ Sinatzea 'legacy' motako helbideekin soilik da posible</translation>
     <message>
         <source>Paste address from clipboard</source>
         <extracomment>Tooltip text for button that allows you to paste an address that is in your clipboard.</extracomment>
-        <translation type="unfinished">Arbeletik helbidea itsatsi</translation>
+        <translation type="unfinished">Itsatsi helbidea arbeletik</translation>
     </message>
 </context>
 <context>
@@ -1183,45 +1632,173 @@ Sinatzea 'legacy' motako helbideekin soilik da posible</translation>
         <translation type="unfinished">&amp;Nagusia</translation>
     </message>
     <message>
-        <source>Size of &amp;database cache</source>
-        <translation type="unfinished">Databasearen cache tamaina</translation>
+        <source>Automatically start %1 after logging in to the system.</source>
+        <translation type="unfinished">Hasi automatikoki %1 saioa hasi ondoren.</translation>
     </message>
     <message>
-        <source>IP address of the proxy (e.g. IPv4: 127.0.0.1 / IPv6: ::1)</source>
-        <translation type="unfinished">Proxyaren IP helbidea  (IPv4: 127.0.0.1 / IPv6: ::1 adibidez )</translation>
+        <source>&amp;Start %1 on system login</source>
+        <translation type="unfinished">&amp;Abiarazi %1 sisteman saioa hastean.</translation>
     </message>
     <message>
-        <source>Open Configuration File</source>
-        <translation type="unfinished">Ireki konfigurazio fitxategia</translation>
+        <source>Enabling pruning significantly reduces the disk space required to store transactions. All blocks are still fully validated. Reverting this setting requires re-downloading the entire blockchain.</source>
+        <translation type="unfinished">Mozketa gaitzeak nabarmen murrizten du transakzioak gordetzeko behar den disko-lekua. Bloke guztiak oraindik ere erabat baliozkotzen dira. Ezarpen hau atzera botatzeak blockchain osoa berriro deskargatzea eskatzen du.</translation>
     </message>
     <message>
-        <source>Reset all client options to default.</source>
-        <translation type="unfinished">Bezeroaren aukera guztiak hasieratu.</translation>
+        <source>Maximum database cache size. Make sure you have enough RAM. A larger cache can contribute to faster sync, after which the benefit is less pronounced for most use cases. Lowering the cache size will reduce memory usage. Unused mempool memory is shared for this cache.</source>
+        <extracomment>Tooltip text for Options window setting that sets the size of the database cache. Explains the corresponding effects of increasing/decreasing this value.</extracomment>
+        <translation type="unfinished">Datu-basearen cachearen gehieneko tamaina. Ziurtatu RAM nahikoa duzula. Cache handiago batek sinkronizazio azkarragoari lagundu diezaioke; sinkronizazioa amaitutakoan, onura hori nabarmen txikiagoa da kasu gehienetan. Cachearen tamaina txikiagotzeak memoria-erabilera murriztuko du. Erabili gabeko mempool memoria cache honetarako partekatzen da.</translation>
     </message>
     <message>
-        <source>&amp;Reset Options</source>
-        <translation type="unfinished">&amp;Aukerak Hasieratu</translation>
+        <source>Size of &amp;database cache</source>
+        <translation type="unfinished">&amp;Datu-basearen cachearen tamaina</translation>
     </message>
     <message>
-        <source>&amp;Network</source>
-        <translation type="unfinished">&amp;Sarea</translation>
+        <source>Number of script &amp;verification threads</source>
+        <translation type="unfinished">Scripten egiaztapen harien kopurua</translation>
     </message>
     <message>
-        <source>Expert</source>
-        <translation type="unfinished">Aditu</translation>
+        <source>Full path to a %1 compatible script (e.g. C:\Downloads\hwi.exe or /Users/you/Downloads/hwi.py). Beware: malware can steal your coins!</source>
+        <translation type="unfinished">%1rekin bateragarria den script baten bide osoa (adib., C:\Downloads\hwi.exe edo /Users/you/Downloads/hwi.py). Kontuz: malware-ak zure txanponak lapur ditzake!</translation>
     </message>
     <message>
-        <source>Enable coin &amp;control features</source>
-        <translation type="unfinished">Diruaren &amp;kontrolaren ezaugarriak gaitu</translation>
+        <source>Automatically open the Bitcoin client port on the router. This only works when your router supports PCP or NAT-PMP and it is enabled. The external port could be random.</source>
+        <translation type="unfinished">Bitcoin bezeroaren portua automatikoki ireki router-ean. Honek bakarrik funtzionatzen du zure router-ak PCP edo NAT-PMP onartzen badu eta gaituta badago. Kanpoko portua ausazkoa izan daiteke.</translation>
     </message>
     <message>
-        <source>Accept connections from outside.</source>
-        <translation type="unfinished">Kanpoko konexioak onartu</translation>
+        <source>Map port using PCP or NA&amp;T-PMP</source>
+        <translation type="unfinished">Portua mapatu PCP edo NAT-PMP erabiliz</translation>
+    </message>
+    <message>
+        <source>IP address of the proxy (e.g. IPv4: 127.0.0.1 / IPv6: ::1)</source>
+        <translation type="unfinished">Proxyaren IP helbidea  (IPv4: 127.0.0.1 / IPv6: ::1 adibidez )</translation>
+    </message>
+    <message>
+        <source>Shows if the supplied default SOCKS5 proxy is used to reach peers via this network type.</source>
+        <translation type="unfinished">Sare mota honen bidez parekoengana iristeko emandako SOCKS5 proxy lehenetsia erabiltzen den ala ez erakusten du.</translation>
+    </message>
+    <message>
+        <source>Minimize instead of exit the application when the window is closed. When this option is enabled, the application will be closed only after selecting Exit in the menu.</source>
+        <translation type="unfinished">Leihoa itxitzean aplikazioa ixtearen ordez, minimizatu. Aukera hau gaituta dagoenean, aplikazioa soilik itxiko da menuko "Irten" aukera hautatzen denean.</translation>
+    </message>
+    <message>
+        <source>Font in the Overview tab: </source>
+        <translation type="unfinished">"Ikuspegi orokorra" fitxako letra-tipoa:</translation>
+    </message>
+    <message>
+        <source>Options set in this dialog are overridden by the command line:</source>
+        <translation type="unfinished">Elkarrizketa koadro honetan ezarritako aukerak komando-lerroak gainidazten ditu:</translation>
+    </message>
+    <message>
+        <source>Open the %1 configuration file from the working directory.</source>
+        <translation type="unfinished">Ireki %1 lan-direktorioko konfigurazio-fitxategia.</translation>
+    </message>
+    <message>
+        <source>Open Configuration File</source>
+        <translation type="unfinished">Ireki konfigurazio fitxategia</translation>
+    </message>
+    <message>
+        <source>Reset all client options to default.</source>
+        <translation type="unfinished">Bezeroaren aukera guztiak hasieratu.</translation>
+    </message>
+    <message>
+        <source>&amp;Reset Options</source>
+        <translation type="unfinished">&amp;Aukerak Hasieratu</translation>
+    </message>
+    <message>
+        <source>&amp;Network</source>
+        <translation type="unfinished">&amp;Sarea</translation>
+    </message>
+    <message>
+        <source>Prune &amp;block storage to</source>
+        <translation type="unfinished">&amp;Bloke biltegia moztu hona</translation>
+    </message>
+    <message>
+        <source>Reverting this setting requires re-downloading the entire blockchain.</source>
+        <translation type="unfinished">Ezarpen hau atzera botatzeak blockchain osoa berriro deskargatzea eskatzen du.</translation>
+    </message>
+    <message>
+        <source>Set the number of script verification threads. Negative values correspond to the number of cores you want to leave free to the system.</source>
+        <extracomment>Tooltip text for Options window setting that sets the number of script verification threads. Explains that negative values mean to leave these many cores free to the system.</extracomment>
+        <translation type="unfinished">Ezarri script-egiaztapenerako hari kopurua. Balio negatiboek sistemari libre utzi nahi dizkiozun nukleo kopurua adierazten dute.</translation>
+    </message>
+    <message>
+        <source>(0 = auto, &lt;0 = leave that many cores free)</source>
+        <translation type="unfinished">(0 = automatikoa, &lt;0 = horrenbeste nukleo libre utzi)</translation>
+    </message>
+    <message>
+        <source>This allows you or a third party tool to communicate with the node through command-line and JSON-RPC commands.</source>
+        <extracomment>Tooltip text for Options window setting that enables the RPC server.</extracomment>
+        <translation type="unfinished">Honek zuri edo hirugarrenen tresna bati uzten dio nodoarekin komunikatzeko komando-lerroaren eta JSON-RPC komandoen bidez.</translation>
+    </message>
+    <message>
+        <source>Enable R&amp;PC server</source>
+        <extracomment>An Options window setting to enable the RPC server.</extracomment>
+        <translation type="unfinished">R&amp;PC zerbitzaria gaitu</translation>
+    </message>
+    <message>
+        <source>W&amp;allet</source>
+        <translation type="unfinished">Zorroa</translation>
+    </message>
+    <message>
+        <source>Whether to set subtract fee from amount as default or not.</source>
+        <extracomment>Tooltip text for Options window setting that sets subtracting the fee from a sending amount as default.</extracomment>
+        <translation type="unfinished">Komisioa zenbatekotik kendu lehenetsita ezarri ala ez.</translation>
+    </message>
+    <message>
+        <source>Subtract &amp;fee from amount by default</source>
+        <extracomment>An Options window setting to set subtracting the fee from a sending amount as default.</extracomment>
+        <translation type="unfinished">Kendu &amp;komisioa zenbatekotik lehenetsita</translation>
+    </message>
+    <message>
+        <source>Expert</source>
+        <translation type="unfinished">Aditu</translation>
+    </message>
+    <message>
+        <source>Enable coin &amp;control features</source>
+        <translation type="unfinished">Diruaren &amp;kontrolaren ezaugarriak gaitu</translation>
+    </message>
+    <message>
+        <source>If you disable the spending of unconfirmed change, the change from a transaction cannot be used until that transaction has at least one confirmation. This also affects how your balance is computed.</source>
+        <translation type="unfinished">Berretsi gabeko itzulketaren gastua desgaitzen baduzu, transakzio baten itzulketa ezin izango da erabili transakzio horrek gutxienez berrespen bat izan arte. Honek zure saldoa nola kalkulatzen den ere eragiten du.</translation>
+    </message>
+    <message>
+        <source>&amp;Spend unconfirmed change</source>
+        <translation type="unfinished">&amp;Gastu berretsi gabeko itzulketa</translation>
+    </message>
+    <message>
+        <source>Enable &amp;PSBT controls</source>
+        <extracomment>An options window setting to enable PSBT controls.</extracomment>
+        <translation type="unfinished">Gaitu &amp;PSBT kontrolak</translation>
+    </message>
+    <message>
+        <source>Whether to show PSBT controls.</source>
+        <extracomment>Tooltip text for options window setting that enables PSBT controls.</extracomment>
+        <translation type="unfinished">PSBT kontrolak erakutsiko diren ala ez.</translation>
+    </message>
+    <message>
+        <source>External Signer (e.g. hardware wallet)</source>
+        <translation type="unfinished">Kanpoko sinatzailea (adibidez, hardware zorroa)</translation>
+    </message>
+    <message>
+        <source>&amp;External signer script path</source>
+        <translation type="unfinished">Kanpo sinatzailearen script bidea</translation>
+    </message>
+    <message>
+        <source>Accept connections from outside.</source>
+        <translation type="unfinished">Kanpoko konexioak onartu</translation>
     </message>
     <message>
         <source>Allow incomin&amp;g connections</source>
         <translation type="unfinished">Sarbide konexioak baimendu</translation>
     </message>
+    <message>
+        <source>Connect to the Bitcoin network through a SOCKS5 proxy.</source>
+        <translation type="unfinished">Bitcoin sarearekin konektatu SOCKS5 proxy baten bidez.</translation>
+    </message>
+    <message>
+        <source>&amp;Connect through SOCKS5 proxy (default proxy):</source>
+        <translation type="unfinished">Konektatu SOCKS5 proxy bidez (proxy lehenetsia):</translation>
+    </message>
     <message>
         <source>Proxy &amp;IP:</source>
         <translation type="unfinished">Proxyaren &amp;IP helbidea:</translation>
@@ -1234,22 +1811,74 @@ Sinatzea 'legacy' motako helbideekin soilik da posible</translation>
         <source>Port of the proxy (e.g. 9050)</source>
         <translation type="unfinished">Proxy portua (9050 adibidez)</translation>
     </message>
+    <message>
+        <source>Used for reaching peers via:</source>
+        <translation type="unfinished">Parekoengana iristeko erabiltzen da honen bidez:</translation>
+    </message>
     <message>
         <source>&amp;Window</source>
         <translation type="unfinished">&amp;Lehioa</translation>
     </message>
+    <message>
+        <source>Show the icon in the system tray.</source>
+        <translation type="unfinished">Erakutsi ikonoa sistemaren erretiluan.</translation>
+    </message>
+    <message>
+        <source>&amp;Show tray icon</source>
+        <translation type="unfinished">&amp;Erakutsi erretiluko ikonoa</translation>
+    </message>
+    <message>
+        <source>Show only a tray icon after minimizing the window.</source>
+        <translation type="unfinished">Leihoa minimizatu ondoren, erakutsi erretiluko ikonoa bakarrik.</translation>
+    </message>
+    <message>
+        <source>&amp;Minimize to the tray instead of the taskbar</source>
+        <translation type="unfinished">&amp;Minimizatu erretilura, ez ataz-barrara</translation>
+    </message>
+    <message>
+        <source>M&amp;inimize on close</source>
+        <translation type="unfinished">&amp;Itxitzean minimizatu</translation>
+    </message>
     <message>
         <source>&amp;Display</source>
         <translation type="unfinished">&amp;Pantaila</translation>
     </message>
     <message>
         <source>User Interface &amp;language:</source>
-        <translation type="unfinished">Erabiltzaile-interfazearen &amp;hizkuntza:</translation>
+        <translation type="unfinished">Erabiltzaile interfazearen &amp;hizkuntza:</translation>
+    </message>
+    <message>
+        <source>The user interface language can be set here. This setting will take effect after restarting %1.</source>
+        <translation type="unfinished">Erabiltzaile interfazearen hizkuntza hemen ezar daiteke. Ezarpen hau  %1 berrabiarazi ondoren izango da eraginkorra.</translation>
     </message>
     <message>
         <source>&amp;Unit to show amounts in:</source>
         <translation type="unfinished">Zenbatekoa azaltzeko &amp;unitatea:</translation>
     </message>
+    <message>
+        <source>Choose the default subdivision unit to show in the interface and when sending coins.</source>
+        <translation type="unfinished">Hautatu interfazean eta txanponak bidaltzerakoan erakutsiko den unitate azpi-banatu lehenetsia.</translation>
+    </message>
+    <message>
+        <source>Third-party URLs (e.g. a block explorer) that appear in the transactions tab as context menu items. %s in the URL is replaced by transaction hash. Multiple URLs are separated by vertical bar |.</source>
+        <translation type="unfinished">Hirugarrenen URLak (adibidez, blokeen arakatzailea), zeinak transakzioen fitxan agertzen diren testuinguru-menuaren elementu gisa. URLko %seremua transakzioen hash-ekin ordezkatzen da. URL anitzak barra bertikalez | bereizten dira.</translation>
+    </message>
+    <message>
+        <source>&amp;Third-party transaction URLs</source>
+        <translation type="unfinished">&amp;Hirugarrenen transakzio URLak</translation>
+    </message>
+    <message>
+        <source>Whether to show coin control features or not.</source>
+        <translation type="unfinished">Moneta kontrolerako ezaugarriak erakutsi ala ez.</translation>
+    </message>
+    <message>
+        <source>Connect to the Bitcoin network through a separate SOCKS5 proxy for Tor onion services.</source>
+        <translation type="unfinished">Bitcoin sarearekin konektatu Tor onion zerbitzuetarako bereizitako SOCKS5 proxy baten bidez.</translation>
+    </message>
+    <message>
+        <source>Use separate SOCKS&amp;5 proxy to reach peers via Tor onion services:</source>
+        <translation type="unfinished">Erabili bereizitako SOCKS&amp;5 proxy bat lagunak Tor onion zerbitzuen bidez konektatzeko:</translation>
+    </message>
     <message>
         <source>&amp;OK</source>
         <translation type="unfinished">&amp;Ados</translation>
@@ -1258,6 +1887,11 @@ Sinatzea 'legacy' motako helbideekin soilik da posible</translation>
         <source>&amp;Cancel</source>
         <translation type="unfinished">&amp;Ezeztatu</translation>
     </message>
+    <message>
+        <source>Compiled without external signing support (required for external signing)</source>
+        <extracomment>"External signing" means using devices such as hardware wallets.</extracomment>
+        <translation type="unfinished">Kanpoko sinatze euskarririk gabe konpilatu da (kanpoko sinatzeetarako beharrezkoa).</translation>
+    </message>
     <message>
         <source>default</source>
         <translation type="unfinished">lehenetsi</translation>
@@ -1276,41 +1910,91 @@ Sinatzea 'legacy' motako helbideekin soilik da posible</translation>
         <extracomment>Text explaining that the settings changed will not come into effect until the client is restarted.</extracomment>
         <translation type="unfinished">Bezeroa berrabiarazi behar da aldaketak aktibatzeko.</translation>
     </message>
+    <message>
+        <source>Current settings will be backed up at "%1".</source>
+        <extracomment>Text explaining to the user that the client's current settings will be backed up at a specific location. %1 is a stand-in argument for the backup location's path.</extracomment>
+        <translation type="unfinished">Uneko ezarpenak hemen gordeko dira babeskopia gisa: "%1".</translation>
+    </message>
+    <message>
+        <source>Client will be shut down. Do you want to proceed?</source>
+        <extracomment>Text asking the user to confirm if they would like to proceed with a client shutdown.</extracomment>
+        <translation type="unfinished">Bezeroa itzaliko da. Jarraitu nahi duzu?</translation>
+    </message>
     <message>
         <source>Configuration options</source>
         <extracomment>Window title text of pop-up box that allows opening up of configuration file.</extracomment>
         <translation type="unfinished">Konfiguraketa aukerak</translation>
     </message>
+    <message>
+        <source>The configuration file is used to specify advanced user options which override GUI settings. Additionally, any command-line options will override this configuration file.</source>
+        <extracomment>Explanatory text about the priority order of instructions considered by client. The order from high to low being: command-line, configuration file, GUI settings.</extracomment>
+        <translation type="unfinished">Konfigurazio fitxategia erabiltzaile aurreratuek erabil ditzaketen aukerak zehazteko erabiltzen da, eta aukera horiek interfaze grafikoaren ezarpenak gainidazten dituzte. Horrez gain, komando lerroko edozein aukera konfigurazio fitxategi honen gainetik izango da.</translation>
+    </message>
     <message>
         <source>Continue</source>
         <translation type="unfinished">Jarraitu</translation>
     </message>
+    <message>
+        <source>Cancel</source>
+        <translation type="unfinished">Ezeztatu</translation>
+    </message>
     <message>
         <source>Error</source>
-        <translation type="unfinished">Akatsa</translation>
+        <translation type="unfinished">Errorea</translation>
+    </message>
+    <message>
+        <source>The configuration file could not be opened.</source>
+        <translation type="unfinished">Konfigurazio fitxategia ezin izan da ireki.</translation>
     </message>
     <message>
         <source>This change would require a client restart.</source>
-        <translation type="unfinished">Aldaketa honek clienta berriro piztea eskatzen du</translation>
+        <translation type="unfinished">Aldaketa honek bezeroa berrabiaraztea eskatzen du.</translation>
+    </message>
+    <message>
+        <source>The supplied proxy address is invalid.</source>
+        <translation type="unfinished">Zehaztutako proxy helbidea baliogabea da.</translation>
+    </message>
+</context>
+<context>
+    <name>OptionsModel</name>
+    <message>
+        <source>Could not read setting "%1", %2.</source>
+        <translation type="unfinished">Ezin izan da "%1" ezarpena irakurri%2.</translation>
     </message>
-    </context>
+</context>
 <context>
     <name>OverviewPage</name>
     <message>
         <source>Form</source>
         <translation type="unfinished">Inprimakia</translation>
     </message>
+    <message>
+        <source>The displayed information may be out of date. Your wallet automatically synchronizes with the Bitcoin network after a connection is established, but this process has not completed yet.</source>
+        <translation type="unfinished">Erakutsitako informazioa zaharkituta egon daiteke. Zure zorroak automatikoki sinkronizatzen du Bitcoin sarearekin konexioa ezarri ondoren, baina prozesu hori oraindik ez da amaitu.</translation>
+    </message>
     <message>
         <source>Available:</source>
         <translation type="unfinished">Eskuragarri:</translation>
     </message>
+    <message>
+        <source>Your current spendable balance</source>
+        <translation type="unfinished">Zure une honetako erabilgarri dagoen saldoa.</translation>
+    </message>
     <message>
         <source>Pending:</source>
-        <translation type="unfinished">Zai:</translation>
+        <translation type="unfinished">Zain:</translation>
+    </message>
+    <message>
+        <source>Total of transactions that have yet to be confirmed, and do not yet count toward the spendable balance</source>
+        <translation type="unfinished">Oraindik berretsi ez diren eta gastagarri gisa zenbatzen ez diren transakzioen guztizkoa.</translation>
     </message>
     <message>
         <source>Immature:</source>
-        <translation type="unfinished">Ez dago eskuragarri:</translation>
+        <translation type="unfinished">Heldugabe:</translation>
+    </message>
+    <message>
+        <source>Mined balance that has not yet matured</source>
+        <translation type="unfinished">Meatzaritzaz lortutako, baina oraindik heldu ez den saldoa.</translation>
     </message>
     <message>
         <source>Balances</source>
@@ -1322,19 +2006,31 @@ Sinatzea 'legacy' motako helbideekin soilik da posible</translation>
     </message>
     <message>
         <source>Your current total balance</source>
-        <translation type="unfinished">Zure oraingo erabateko saldoa</translation>
+        <translation type="unfinished">Zure une honetako saldo osoa.</translation>
     </message>
     <message>
         <source>Recent transactions</source>
         <translation type="unfinished">Transakzio berriak</translation>
     </message>
-    </context>
+    <message>
+        <source>Privacy mode activated for the Overview tab. To unmask the values, uncheck Settings-&gt;Mask values.</source>
+        <translation type="unfinished">Pribatutasun modua aktibatuta Datuen ikuspegi orokorra fitxan. Balioak ikusteko, desmarkatu Ezarpenak -&gt; Balioak ezkutatu aukera.</translation>
+    </message>
+</context>
 <context>
     <name>PSBTOperationsDialog</name>
+    <message>
+        <source>PSBT Operations</source>
+        <translation type="unfinished">PSBT Operazioak</translation>
+    </message>
     <message>
         <source>Sign Tx</source>
         <translation type="unfinished">Sinatu Tx</translation>
     </message>
+    <message>
+        <source>Broadcast Tx</source>
+        <translation type="unfinished">Transakzioa igorri</translation>
+    </message>
     <message>
         <source>Copy to Clipboard</source>
         <translation type="unfinished">Kopiatu arbelera</translation>
@@ -1347,18 +2043,78 @@ Sinatzea 'legacy' motako helbideekin soilik da posible</translation>
         <source>Close</source>
         <translation type="unfinished">Itxi</translation>
     </message>
+    <message>
+        <source>Failed to load transaction: %1</source>
+        <translation type="unfinished">Transakzioa kargatzean errorea gertatu da: %1</translation>
+    </message>
+    <message>
+        <source>Failed to sign transaction: %1</source>
+        <translation type="unfinished">Transakzioa sinatzeak huts egin du:%1</translation>
+    </message>
+    <message>
+        <source>Cannot sign inputs while wallet is locked.</source>
+        <translation type="unfinished">Ezin dira sarrerak sinatu zorroa giltzatuta dagoen bitartean.</translation>
+    </message>
+    <message>
+        <source>Could not sign any more inputs.</source>
+        <translation type="unfinished">Ezin izan dira beste sarrera gehiago sinatu.</translation>
+    </message>
+    <message numerus="yes">
+        <source>Signed %n input(s), but more signatures are still required.</source>
+        <translation type="unfinished">
+            <numerusform />
+            <numerusform />
+        </translation>
+    </message>
+    <message>
+        <source>Signed transaction successfully. Transaction is ready to broadcast.</source>
+        <translation type="unfinished">Transakzioa arrakastaz sinatu da. Transakzioa zabaltzeko prest dago.</translation>
+    </message>
+    <message>
+        <source>Unknown error processing transaction.</source>
+        <translation type="unfinished">Errore ezezaguna gertatu da transakzioa prozesatzean.</translation>
+    </message>
+    <message>
+        <source>Transaction broadcast successfully! Transaction ID: %1</source>
+        <translation type="unfinished">Transakzioa arrakastaz zabaldu da! Transakzioaren IDa: %1</translation>
+    </message>
+    <message>
+        <source>Transaction broadcast failed: %1</source>
+        <translation type="unfinished">Transakzioaren zabalkundeak huts egin du: %1</translation>
+    </message>
+    <message>
+        <source>PSBT copied to clipboard.</source>
+        <translation type="unfinished">PSBT arbelera kopiatu da.</translation>
+    </message>
     <message>
         <source>Save Transaction Data</source>
         <translation type="unfinished">Gorde transakzioko data</translation>
     </message>
+    <message>
+        <source>Partially Signed Transaction (Binary)</source>
+        <extracomment>Expanded name of the binary PSBT file format. See: BIP 174.</extracomment>
+        <translation type="unfinished">Zati batean sinatutako transakzioa (bitarra)</translation>
+    </message>
     <message>
         <source>PSBT saved to disk.</source>
         <translation type="unfinished">PSBT diskoan gorde da.</translation>
     </message>
+    <message>
+        <source>Sends %1 to %2</source>
+        <translation type="unfinished">%1Bidaltzen dio%2</translation>
+    </message>
     <message>
         <source>own address</source>
         <translation type="unfinished">zure helbidea</translation>
     </message>
+    <message>
+        <source>Unable to calculate transaction fee or total transaction amount.</source>
+        <translation type="unfinished">Ezin da transakzioaren kuota edo transakzioaren zenbateko osoa kalkulatu.</translation>
+    </message>
+    <message>
+        <source>Pays transaction fee: </source>
+        <translation type="unfinished">Transakzioaren kuota ordaintzen du:</translation>
+    </message>
     <message>
         <source>Total Amount</source>
         <translation type="unfinished">Kopuru osoa</translation>
@@ -1367,6 +2123,37 @@ Sinatzea 'legacy' motako helbideekin soilik da posible</translation>
         <source>or</source>
         <translation type="unfinished">edo</translation>
     </message>
+    <message numerus="yes">
+        <source>Transaction has %n unsigned input(s).</source>
+        <translation type="unfinished">
+            <numerusform />
+            <numerusform />
+        </translation>
+    </message>
+    <message>
+        <source>Transaction is missing some information about inputs.</source>
+        <translation type="unfinished">Transakzioak sarrerei buruzko informazio batzuk falta ditu.</translation>
+    </message>
+    <message>
+        <source>Transaction still needs signature(s).</source>
+        <translation type="unfinished">Transakzioak oraindik sinadura(k) behar ditu.</translation>
+    </message>
+    <message>
+        <source>(But no wallet is loaded.)</source>
+        <translation type="unfinished">(Baina ez da zorroarik kargatu.)</translation>
+    </message>
+    <message>
+        <source>(But this wallet cannot sign transactions.)</source>
+        <translation type="unfinished">(Baina zorro honek ezin ditu transakzioak sinatu.)</translation>
+    </message>
+    <message>
+        <source>(But this wallet does not have the right keys.)</source>
+        <translation type="unfinished">(Baina zorro honek ez ditu gako egokiak.)</translation>
+    </message>
+    <message>
+        <source>Transaction is fully signed and ready for broadcast.</source>
+        <translation type="unfinished">Transakzioa erabat sinatuta dago eta zabaltzeko prest.</translation>
+    </message>
     <message>
         <source>Transaction status is unknown.</source>
         <translation type="unfinished">Transakzioaren egoera ezezaguna da.</translation>
@@ -1378,7 +2165,35 @@ Sinatzea 'legacy' motako helbideekin soilik da posible</translation>
         <source>Payment request error</source>
         <translation type="unfinished">Ordainketa eskaera akatsa</translation>
     </message>
-    </context>
+    <message>
+        <source>Cannot start bitcoin: click-to-pay handler</source>
+        <translation type="unfinished">Ezin da Bitcoin abiarazi: klik-ordaintzeko kudeatzailea.</translation>
+    </message>
+    <message>
+        <source>URI handling</source>
+        <translation type="unfinished">URI kudeaketa</translation>
+    </message>
+    <message>
+        <source>'bitcoin://' is not a valid URI. Use 'bitcoin:' instead.</source>
+        <translation type="unfinished">'bitcoin://' ez da URI balioduna. Erabili 'bitcoin:' horren ordez.</translation>
+    </message>
+    <message>
+        <source>Cannot process payment request because BIP70 is not supported.
+Due to widespread security flaws in BIP70 it's strongly recommended that any merchant instructions to switch wallets be ignored.
+If you are receiving this error you should request the merchant provide a BIP21 compatible URI.</source>
+        <translation type="unfinished">Ezin da ordainketa eskaera prozesatu BIP70 onartzen ez delako.
+BIP70en segurtasun-gabezia zabalengatik, irmoki gomendatzen da merkatariek diru-zorroa aldatzeko emandako jarraibideak ez ikustea.
+Errore hau jasotzen baduzu, merkatariei BIP21-arekin bateragarria den URI bat emateko eskatu beharko zenieke</translation>
+    </message>
+    <message>
+        <source>URI cannot be parsed! This can be caused by an invalid Bitcoin address or malformed URI parameters.</source>
+        <translation type="unfinished">URIa ezin da analizatu! Hau Bitcoin helbide baliogabe batek edo gaizki osatutako URI parametroek eragin dezakete.</translation>
+    </message>
+    <message>
+        <source>Payment request file handling</source>
+        <translation type="unfinished">Ordainketa eskaera fitxategiaren kudeaketa.</translation>
+    </message>
+</context>
 <context>
     <name>PeerTableModel</name>
     <message>
@@ -1391,6 +2206,16 @@ Sinatzea 'legacy' motako helbideekin soilik da posible</translation>
         <extracomment>Title of Peers Table column which contains a unique number used to identify a connection.</extracomment>
         <translation type="unfinished">Kidea</translation>
     </message>
+    <message>
+        <source>Age</source>
+        <extracomment>Title of Peers Table column which indicates the duration (length of time) since the peer connection started.</extracomment>
+        <translation type="unfinished">Adina</translation>
+    </message>
+    <message>
+        <source>Direction</source>
+        <extracomment>Title of Peers Table column which indicates the direction the peer connection was initiated from.</extracomment>
+        <translation type="unfinished">Norabidea</translation>
+    </message>
     <message>
         <source>Sent</source>
         <extracomment>Title of Peers Table column which indicates the total amount of network information we have sent to the peer.</extracomment>
@@ -1416,7 +2241,17 @@ Sinatzea 'legacy' motako helbideekin soilik da posible</translation>
         <extracomment>Title of Peers Table column which states the network the peer connected through.</extracomment>
         <translation type="unfinished">Sarea</translation>
     </message>
-    </context>
+    <message>
+        <source>Inbound</source>
+        <extracomment>An Inbound Connection from a Peer.</extracomment>
+        <translation type="unfinished">Sarrerakoa</translation>
+    </message>
+    <message>
+        <source>Outbound</source>
+        <extracomment>An Outbound Connection to a Peer.</extracomment>
+        <translation type="unfinished">Irteerakoa</translation>
+    </message>
+</context>
 <context>
     <name>QRImageWidget</name>
     <message>
@@ -1427,6 +2262,18 @@ Sinatzea 'legacy' motako helbideekin soilik da posible</translation>
         <source>&amp;Copy Image</source>
         <translation type="unfinished">&amp;kopiatu irudia</translation>
     </message>
+    <message>
+        <source>Resulting URI too long, try to reduce the text for label / message.</source>
+        <translation type="unfinished">Emaitza gisa lortutako URIa luzeegia da; saiatu etiketa / mezuko testua laburtzen.</translation>
+    </message>
+    <message>
+        <source>Error encoding URI into QR Code.</source>
+        <translation type="unfinished">Errorea URIa QR kodean kodetzean.</translation>
+    </message>
+    <message>
+        <source>QR code support not available.</source>
+        <translation type="unfinished">QR kodearen euskarria ez dago eskuragarri.</translation>
+    </message>
     <message>
         <source>Save QR Code</source>
         <translation type="unfinished">Gorde QR kodea</translation>
@@ -1455,10 +2302,18 @@ Sinatzea 'legacy' motako helbideekin soilik da posible</translation>
         <source>Datadir</source>
         <translation type="unfinished">Datu direktorioa</translation>
     </message>
+    <message>
+        <source>To specify a non-default location of the data directory use the '%1' option.</source>
+        <translation type="unfinished">Datu-direktorioaren kokapen lehenetsia ez den bat zehazteko, erabili '%1' aukera.</translation>
+    </message>
     <message>
         <source>Blocksdir</source>
         <translation type="unfinished">Blokeen direktorioa</translation>
     </message>
+    <message>
+        <source>To specify a non-default location of the blocks directory use the '%1' option.</source>
+        <translation type="unfinished">Bloke-direktorioaren kokapen lehenetsia ez den bat zehazteko, erabili '%1' aukera.</translation>
+    </message>
     <message>
         <source>Startup time</source>
         <translation type="unfinished">Abiatzeko ordua</translation>
@@ -1475,9 +2330,33 @@ Sinatzea 'legacy' motako helbideekin soilik da posible</translation>
         <source>Number of connections</source>
         <translation type="unfinished">Konexio kopurua</translation>
     </message>
+    <message>
+        <source>Local Addresses</source>
+        <translation type="unfinished">Helbide Lokalak</translation>
+    </message>
+    <message>
+        <source>Network addresses that your Bitcoin node is currently using to communicate with other nodes.</source>
+        <translation type="unfinished">Zure Bitcoin nodoak beste nodoekin komunikatzeko une honetan erabiltzen dituen sare-helbideak.</translation>
+    </message>
+    <message>
+        <source>Block chain</source>
+        <translation type="unfinished">Bloke-katea.</translation>
+    </message>
+    <message>
+        <source>Memory Pool</source>
+        <translation type="unfinished">Memoria Pool-a</translation>
+    </message>
+    <message>
+        <source>Current number of transactions</source>
+        <translation type="unfinished">Uneko transakzio kopurua</translation>
+    </message>
+    <message>
+        <source>Memory usage</source>
+        <translation type="unfinished">Memoria erabilera</translation>
+    </message>
     <message>
         <source>Wallet: </source>
-        <translation type="unfinished">Diruzorroa:</translation>
+        <translation type="unfinished">Zorroa:</translation>
     </message>
     <message>
         <source>(none)</source>
@@ -1497,56 +2376,379 @@ Sinatzea 'legacy' motako helbideekin soilik da posible</translation>
     </message>
     <message>
         <source>&amp;Peers</source>
-        <translation type="unfinished">&amp;Kideak</translation>
+        <translation type="unfinished">&amp;Pareak</translation>
     </message>
     <message>
         <source>Banned peers</source>
-        <translation type="unfinished">Debekatutako kideak</translation>
+        <translation type="unfinished">Debekatutako pareak</translation>
     </message>
     <message>
-        <source>Version</source>
-        <translation type="unfinished">Bertsioa</translation>
+        <source>Select a peer to view detailed information.</source>
+        <translation type="unfinished">Hautatu pare bat xehetasunak ikusteko.</translation>
     </message>
     <message>
-        <source>User Agent</source>
-        <translation type="unfinished">Erabiltzaile agentea</translation>
+        <source>Hide Peers Detail</source>
+        <translation type="unfinished">Ezkutatu pareen xehetasunak</translation>
     </message>
     <message>
-        <source>Node window</source>
-        <translation type="unfinished">Adabegiaren leihoa</translation>
+        <source>The transport layer version: %1</source>
+        <translation type="unfinished">Garraio geruzako bertsioa:%1</translation>
     </message>
     <message>
-        <source>Permissions</source>
-        <translation type="unfinished">Baimenak</translation>
+        <source>Transport</source>
+        <translation type="unfinished">Garraioa</translation>
     </message>
     <message>
-        <source>Services</source>
-        <translation type="unfinished">Zerbitzuak</translation>
+        <source>Session ID</source>
+        <translation type="unfinished">Saioaren IDa</translation>
     </message>
     <message>
-        <source>Last block time</source>
-        <translation type="unfinished">Azken blokearen unea</translation>
+        <source>Version</source>
+        <translation type="unfinished">Bertsioa</translation>
     </message>
     <message>
-        <source>Clear console</source>
-        <translation type="unfinished">Garbitu kontsola</translation>
+        <source>Whether we relay transactions to this peer.</source>
+        <translation type="unfinished">Pare honi transakzioak igortzen dizkiogun ala ez.</translation>
     </message>
     <message>
-        <source>&amp;Copy address</source>
-        <extracomment>Context menu action to copy the address of a peer.</extracomment>
-        <translation type="unfinished">&amp;Helbidea kopiatu</translation>
+        <source>Transaction Relay</source>
+        <translation type="unfinished">Transakzioen igorpena</translation>
     </message>
     <message>
-        <source>&amp;Disconnect</source>
-        <translation type="unfinished">&amp;Deskonektatu</translation>
+        <source>Synced Headers</source>
+        <translation type="unfinished">Sinkronizatutako Goiburuak</translation>
     </message>
     <message>
-        <source>Executing…</source>
-        <extracomment>A console message indicating an entered command is currently being executed.</extracomment>
-        <translation type="unfinished">Exekutatzen...</translation>
+        <source>Synced Blocks</source>
+        <translation type="unfinished">Sinkronizatutako Blokeak</translation>
     </message>
     <message>
-        <source>Yes</source>
+        <source>Last Transaction</source>
+        <translation type="unfinished">Azken Transakzioa</translation>
+    </message>
+    <message>
+        <source>The mapped Autonomous System used for diversifying peer selection.</source>
+        <translation type="unfinished">Pareen hautaketa dibertsifikatzeko erabiltzen den sistema autonomo mapatua.</translation>
+    </message>
+    <message>
+        <source>Mapped AS</source>
+        <translation type="unfinished">Mapaturiko ASa</translation>
+    </message>
+    <message>
+        <source>Whether we relay addresses to this peer.</source>
+        <extracomment>Tooltip text for the Address Relay field in the peer details area, which displays whether we relay addresses to this peer (Yes/No).</extracomment>
+        <translation type="unfinished">Pare honi helbideak igortzen dizkiogun ala ez.</translation>
+    </message>
+    <message>
+        <source>Address Relay</source>
+        <extracomment>Text title for the Address Relay field in the peer details area, which displays whether we relay addresses to this peer (Yes/No).</extracomment>
+        <translation type="unfinished">Helbideen igorpena.</translation>
+    </message>
+    <message>
+        <source>The total number of addresses received from this peer that were processed (excludes addresses that were dropped due to rate-limiting).</source>
+        <extracomment>Tooltip text for the Addresses Processed field in the peer details area, which displays the total number of addresses received from this peer that were processed (excludes addresses that were dropped due to rate-limiting).</extracomment>
+        <translation type="unfinished">Pare honetatik jasotako eta prozesatutako helbide guztien kopurua (tasa-mugak direla eta baztertutako helbideak ez dira barne hartzen).</translation>
+    </message>
+    <message>
+        <source>The total number of addresses received from this peer that were dropped (not processed) due to rate-limiting.</source>
+        <extracomment>Tooltip text for the Addresses Rate-Limited field in the peer details area, which displays the total number of addresses received from this peer that were dropped (not processed) due to rate-limiting.</extracomment>
+        <translation type="unfinished">Pare honetatik jasotako eta tasa-mugatzeagatik baztertu diren (ez prozesatutako) helbide guztien kopurua.</translation>
+    </message>
+    <message>
+        <source>Addresses Processed</source>
+        <extracomment>Text title for the Addresses Processed field in the peer details area, which displays the total number of addresses received from this peer that were processed (excludes addresses that were dropped due to rate-limiting).</extracomment>
+        <translation type="unfinished">Prozesatutako Helbideak</translation>
+    </message>
+    <message>
+        <source>Addresses Rate-Limited</source>
+        <extracomment>Text title for the Addresses Rate-Limited field in the peer details area, which displays the total number of addresses received from this peer that were dropped (not processed) due to rate-limiting.</extracomment>
+        <translation type="unfinished">Abiadura Mugatutako Helbideak</translation>
+    </message>
+    <message>
+        <source>User Agent</source>
+        <translation type="unfinished">Erabiltzaile agentea</translation>
+    </message>
+    <message>
+        <source>Node window</source>
+        <translation type="unfinished">Adabegiaren leihoa</translation>
+    </message>
+    <message>
+        <source>Current block height</source>
+        <translation type="unfinished">Uneko blokearen altuera</translation>
+    </message>
+    <message>
+        <source>Open the %1 debug log file from the current data directory. This can take a few seconds for large log files.</source>
+        <translation type="unfinished">Ireki %1 arazketa-erregistroaren fitxategia uneko datu-direktorioan. Erregistro-fitxategia handia bada, segundo batzuk behar izan ditzake.</translation>
+    </message>
+    <message>
+        <source>Decrease font size</source>
+        <translation type="unfinished">Letra tamaina txikiagotu</translation>
+    </message>
+    <message>
+        <source>Increase font size</source>
+        <translation type="unfinished">Letra tamaina handiagotu</translation>
+    </message>
+    <message>
+        <source>Permissions</source>
+        <translation type="unfinished">Baimenak</translation>
+    </message>
+    <message>
+        <source>The direction and type of peer connection: %1</source>
+        <translation type="unfinished">Pare-konexioaren noranzkoa eta mota: %1</translation>
+    </message>
+    <message>
+        <source>Direction/Type</source>
+        <translation type="unfinished">Norabidea/Mota</translation>
+    </message>
+    <message>
+        <source>The BIP324 session ID string in hex.</source>
+        <translation type="unfinished">BIP324 saioaren ID katea hamaseitarrean.</translation>
+    </message>
+    <message>
+        <source>The network protocol this peer is connected through: IPv4, IPv6, Onion, I2P, or CJDNS.</source>
+        <translation type="unfinished">Sare-protokoloa, lagun hau honen bidez konektatuta dagoena: IPv4, IPv6, Onion, I2P edo CJDNS.</translation>
+    </message>
+    <message>
+        <source>Services</source>
+        <translation type="unfinished">Zerbitzuak</translation>
+    </message>
+    <message>
+        <source>High bandwidth BIP152 compact block relay: %1</source>
+        <translation type="unfinished">Banda zabal handiko BIP152 bloke trinkoaren errepikapena:%1</translation>
+    </message>
+    <message>
+        <source>High Bandwidth</source>
+        <translation type="unfinished">Banda Zabala</translation>
+    </message>
+    <message>
+        <source>Connection Time</source>
+        <translation type="unfinished">Konexio denbora</translation>
+    </message>
+    <message>
+        <source>Elapsed time since a novel block passing initial validity checks was received from this peer.</source>
+        <translation type="unfinished">Pare honetatik baliozkotasun-hasierako egiaztapenak gainditu dituen bloke berritzaile bat jaso zenetik igarotako denbora.</translation>
+    </message>
+    <message>
+        <source>Last Block</source>
+        <translation type="unfinished">Azken Blokea</translation>
+    </message>
+    <message>
+        <source>Elapsed time since a novel transaction accepted into our mempool was received from this peer.</source>
+        <extracomment>Tooltip text for the Last Transaction field in the peer details area.</extracomment>
+        <translation type="unfinished">Pare honetatik gure memoria-igerilekuan onartu den transakzio berritzaile bat jaso zenetik igarotako denbora.</translation>
+    </message>
+    <message>
+        <source>Last Send</source>
+        <translation type="unfinished">Azken Bidalketa</translation>
+    </message>
+    <message>
+        <source>Last Receive</source>
+        <translation type="unfinished">Azken Jasoketa</translation>
+    </message>
+    <message>
+        <source>Ping Time</source>
+        <translation type="unfinished">Pingaren Denbora</translation>
+    </message>
+    <message>
+        <source>The duration of a currently outstanding ping.</source>
+        <translation type="unfinished">Uneko ping batzuen iraupena.</translation>
+    </message>
+    <message>
+        <source>Ping Wait</source>
+        <translation type="unfinished">Pingaren Itxaronaldia</translation>
+    </message>
+    <message>
+        <source>Min Ping</source>
+        <translation type="unfinished">Gutxieneko Ping-a</translation>
+    </message>
+    <message>
+        <source>Time Offset</source>
+        <translation type="unfinished">Denbora desplazamendua</translation>
+    </message>
+    <message>
+        <source>Last block time</source>
+        <translation type="unfinished">Azken blokearen unea</translation>
+    </message>
+    <message>
+        <source>&amp;Open</source>
+        <translation type="unfinished">&amp;Ireki</translation>
+    </message>
+    <message>
+        <source>&amp;Console</source>
+        <translation type="unfinished">&amp;Kontsola</translation>
+    </message>
+    <message>
+        <source>&amp;Network Traffic</source>
+        <translation type="unfinished">&amp;Sareko Trafikoa</translation>
+    </message>
+    <message>
+        <source>Totals</source>
+        <translation type="unfinished">Guztira</translation>
+    </message>
+    <message>
+        <source>Debug log file</source>
+        <translation type="unfinished">Arazketa-erregistroaren fitxategia</translation>
+    </message>
+    <message>
+        <source>Clear console</source>
+        <translation type="unfinished">Garbitu kontsola</translation>
+    </message>
+    <message>
+        <source>In:</source>
+        <translation type="unfinished">Sarrera:</translation>
+    </message>
+    <message>
+        <source>Out:</source>
+        <translation type="unfinished">Irteera:</translation>
+    </message>
+    <message>
+        <source>Inbound: initiated by peer</source>
+        <extracomment>Explanatory text for an inbound peer connection.</extracomment>
+        <translation type="unfinished">Sarrerakoa: pareak hasi du.</translation>
+    </message>
+    <message>
+        <source>Outbound Full Relay: default</source>
+        <extracomment>Explanatory text for an outbound peer connection that relays all network information. This is the default behavior for outbound connections.</extracomment>
+        <translation type="unfinished">Irteerakoa Igorpen Osoarekin: lehenetsia.</translation>
+    </message>
+    <message>
+        <source>Outbound Block Relay: does not relay transactions or addresses</source>
+        <extracomment>Explanatory text for an outbound peer connection that relays network information about blocks and not transactions or addresses.</extracomment>
+        <translation type="unfinished">Irteerako Bloke-Igorpena: ez ditu transakzioak ezta helbideak ere igortzen</translation>
+    </message>
+    <message>
+        <source>Outbound Manual: added using RPC %1 or %2/%3 configuration options</source>
+        <extracomment>Explanatory text for an outbound peer connection that was established manually through one of several methods. The numbered arguments are stand-ins for the methods available to establish manual connections.</extracomment>
+        <translation type="unfinished">Irteerako Eskuzkoa: RPC %1bidez gehitua edo%2 / %3konfigurazio aukerak</translation>
+    </message>
+    <message>
+        <source>Outbound Feeler: short-lived, for testing addresses</source>
+        <extracomment>Explanatory text for a short-lived outbound peer connection that is used to test the aliveness of known addresses.</extracomment>
+        <translation type="unfinished">Irteerako Probatzailea: iraupen laburrekoa, helbideak probatzeko</translation>
+    </message>
+    <message>
+        <source>Outbound Address Fetch: short-lived, for soliciting addresses</source>
+        <extracomment>Explanatory text for a short-lived outbound peer connection that is used to request addresses from a peer.</extracomment>
+        <translation type="unfinished">Irteerako Helbideen Eskuraketa: iraupen laburrekoa, helbideak eskuratzeko</translation>
+    </message>
+    <message>
+        <source>Private broadcast: short-lived, for broadcasting privacy-sensitive transactions</source>
+        <extracomment>Explanatory text for a short-lived outbound peer connection that is used to broadcast privacy-sensitive data (like our transactions).</extracomment>
+        <translation type="unfinished">Emisio pribatua: iraupen laburrekoa, pribatutasunarekiko sentikorrak diren transakzioak zabaltzeko.</translation>
+    </message>
+    <message>
+        <source>detecting: peer could be v1 or v2</source>
+        <extracomment>Explanatory text for "detecting" transport type.</extracomment>
+        <translation type="unfinished">detektatzen: parea v1 edo v2 izan daiteke.</translation>
+    </message>
+    <message>
+        <source>v1: unencrypted, plaintext transport protocol</source>
+        <extracomment>Explanatory text for v1 transport type.</extracomment>
+        <translation type="unfinished">v1: zifratu gabea, testu lauzko garraio-protokoloa.</translation>
+    </message>
+    <message>
+        <source>v2: BIP324 encrypted transport protocol</source>
+        <extracomment>Explanatory text for v2 transport type.</extracomment>
+        <translation type="unfinished">v2: BIP324 bidez zifratutako garraio-protokoloa.</translation>
+    </message>
+    <message>
+        <source>we selected the peer for high bandwidth relay</source>
+        <translation type="unfinished">Banda zabal handiko igorpenerako hautatu dugu pare hau</translation>
+    </message>
+    <message>
+        <source>the peer selected us for high bandwidth relay</source>
+        <translation type="unfinished">Pareak gu hautatu gaitu banda zabal handiko igorpenerako</translation>
+    </message>
+    <message>
+        <source>no high bandwidth relay selected</source>
+        <translation type="unfinished">Ez da banda zabal handiko igorle hautatu</translation>
+    </message>
+    <message>
+        <source>&amp;Copy address</source>
+        <extracomment>Context menu action to copy the address of a peer.</extracomment>
+        <translation type="unfinished">&amp;Helbidea kopiatu</translation>
+    </message>
+    <message>
+        <source>&amp;Disconnect</source>
+        <translation type="unfinished">&amp;Deskonektatu</translation>
+    </message>
+    <message>
+        <source>1 &amp;hour</source>
+        <translation type="unfinished">1 &amp;ordu</translation>
+    </message>
+    <message>
+        <source>1 d&amp;ay</source>
+        <translation type="unfinished">1 &amp;egun</translation>
+    </message>
+    <message>
+        <source>1 &amp;week</source>
+        <translation type="unfinished">1 &amp;aste</translation>
+    </message>
+    <message>
+        <source>1 &amp;year</source>
+        <translation type="unfinished">1 &amp;urte</translation>
+    </message>
+    <message>
+        <source>&amp;Copy IP/Netmask</source>
+        <extracomment>Context menu action to copy the IP/Netmask of a banned peer. IP/Netmask is the combination of a peer's IP address and its Netmask. For IP address, see: https://en.wikipedia.org/wiki/IP_address.</extracomment>
+        <translation type="unfinished">Kopiatu IP/Sare-maskara</translation>
+    </message>
+    <message>
+        <source>&amp;Unban</source>
+        <translation type="unfinished">&amp;Desblokeatu</translation>
+    </message>
+    <message>
+        <source>Network activity disabled</source>
+        <translation type="unfinished">Sareko jarduera desgaituta</translation>
+    </message>
+    <message>
+        <source>None</source>
+        <translation type="unfinished">Bat ere ez</translation>
+    </message>
+    <message>
+        <source>Executing command without any wallet</source>
+        <translation type="unfinished">Komandoa zorrorik gabe exekutatzen</translation>
+    </message>
+    <message>
+        <source>Node window - [%1]</source>
+        <translation type="unfinished">Nodo leihoa - [%1]</translation>
+    </message>
+    <message>
+        <source>Executing command using "%1" wallet</source>
+        <translation type="unfinished">"%1" zorroa erabiliz komandoa exekutatzen.</translation>
+    </message>
+    <message>
+        <source>Welcome to the %1 RPC console.
+Use up and down arrows to navigate history, and %2 to clear screen.
+Use %3 and %4 to increase or decrease the font size.
+Type %5 for an overview of available commands.
+For more information on using this console, type %6.
+
+%7WARNING: 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.%8</source>
+        <extracomment>RPC console welcome message. Placeholders %7 and %8 are style tags for the warning content, and they are not space separated from the rest of the text intentionally.</extracomment>
+        <translation type="unfinished">Ongi etorri %1RPC kontsolara.
+Erabili gezi-gora eta gezi-behera historia nabigatzeko, eta %2pantaila garbitzeko.
+Erabili %3eta%4 letra-tamaina handitzeko edo txikitzeko.
+Idatzi %5eskuragarri dauden %6komandoen ikuspegi orokorra ikusteko.
+Kontsola hau erabiltzeko informazio gehiago nahi izanez gero, idatzi .
+
+%7ABISUA: Iruzurgileak jardunean ibili dira, erabiltzaileei hemen komandoak idazteko esanez eta haien diru-zorroko edukia lapurtuz. Ez erabili kontsola hau %8komando baten ondorioak guztiz ulertu gabe.</translation>
+    </message>
+    <message>
+        <source>Executing…</source>
+        <extracomment>A console message indicating an entered command is currently being executed.</extracomment>
+        <translation type="unfinished">Exekutatzen...</translation>
+    </message>
+    <message>
+        <source>(peer: %1)</source>
+        <translation type="unfinished">(parea: %1)</translation>
+    </message>
+    <message>
+        <source>via %1</source>
+        <translation type="unfinished">%1bidez</translation>
+    </message>
+    <message>
+        <source>Yes</source>
         <translation type="unfinished">Bai</translation>
     </message>
     <message>
@@ -1561,6 +2763,10 @@ Sinatzea 'legacy' motako helbideekin soilik da posible</translation>
         <source>From</source>
         <translation type="unfinished">Tik</translation>
     </message>
+    <message>
+        <source>Ban for</source>
+        <translation type="unfinished">Blokeo honentzat:</translation>
+    </message>
     <message>
         <source>Never</source>
         <translation type="unfinished">Inoiz ez</translation>
@@ -1584,18 +2790,58 @@ Sinatzea 'legacy' motako helbideekin soilik da posible</translation>
         <source>&amp;Message:</source>
         <translation type="unfinished">&amp;Mezua:</translation>
     </message>
+    <message>
+        <source>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.</source>
+        <translation type="unfinished">Ordainketa eskaerari erants dakiokeen mezu aukerakoa, eskaera irekitzen denean bistaratuko dena. Oharra: mezua ez da Bitcoin sarean zehar bidaliko ordainketarekin batera.</translation>
+    </message>
+    <message>
+        <source>An optional label to associate with the new receiving address.</source>
+        <translation type="unfinished">Etiketa aukerakoa, jaso beharreko helbide berriarekin lotzeko.</translation>
+    </message>
+    <message>
+        <source>Use this form to request payments. All fields are &lt;b&gt;optional&lt;/b&gt;.</source>
+        <translation type="unfinished">Erabili formulario hau ordainketak eskatzeko. Eremu guztiak &lt;b&gt;aukerakoak&lt;/b&gt; dira.</translation>
+    </message>
+    <message>
+        <source>An optional amount to request. Leave this empty or zero to not request a specific amount.</source>
+        <translation type="unfinished">Eskatu beharreko zenbateko aukerakoa. Utzi hutsik edo zeroan, zenbateko zehatzik ez eskatzeko.</translation>
+    </message>
+    <message>
+        <source>An optional label to associate with the new receiving address (used by you to identify an invoice).  It is also attached to the payment request.</source>
+        <translation type="unfinished">Etiketa aukerakoa, jaso beharreko helbide berriarekin lotzeko (zure faktura identifikatzeko erabilia). Ordainketa eskaerari ere erantsita egongo da.</translation>
+    </message>
+    <message>
+        <source>An optional message that is attached to the payment request and may be displayed to the sender.</source>
+        <translation type="unfinished">Ordainketa-eskaerari erantsitako mezu aukerakoa, eta igorleari bistara dakiokeena.</translation>
+    </message>
+    <message>
+        <source>&amp;Create new receiving address</source>
+        <translation type="unfinished">&amp;Sortu jasotzeko helbide berria</translation>
+    </message>
     <message>
         <source>Clear all fields of the form.</source>
-        <translation type="unfinished">Garbitu formularioko eremu guztiak.</translation>
+        <translation type="unfinished">Garbitu formularioaren eremu guztiak.</translation>
     </message>
     <message>
         <source>Clear</source>
         <translation type="unfinished">Garbitu</translation>
     </message>
+    <message>
+        <source>Requested payments history</source>
+        <translation type="unfinished">Eskatutako ordainketen historia</translation>
+    </message>
+    <message>
+        <source>Show the selected request (does the same as double clicking an entry)</source>
+        <translation type="unfinished">Erakutsi hautatutako eskaera (sarrera batean klik bikoitza egiteak egiten duen gauza bera).</translation>
+    </message>
     <message>
         <source>Show</source>
         <translation type="unfinished">Erakutsi</translation>
     </message>
+    <message>
+        <source>Remove the selected entries from the list</source>
+        <translation type="unfinished">Kendu hautatutako sarrerak zerrendatik</translation>
+    </message>
     <message>
         <source>Remove</source>
         <translation type="unfinished">Ezabatu</translation>
@@ -1612,13 +2858,45 @@ Sinatzea 'legacy' motako helbideekin soilik da posible</translation>
         <source>Copy &amp;label</source>
         <translation type="unfinished">Kopiatu &amp;Etiketa</translation>
     </message>
+    <message>
+        <source>Copy &amp;message</source>
+        <translation type="unfinished">Kopiatu &amp;mezua</translation>
+    </message>
+    <message>
+        <source>Copy &amp;amount</source>
+        <translation type="unfinished">Kopiatu kopurua</translation>
+    </message>
+    <message>
+        <source>Not recommended due to higher fees and less protection against typos.</source>
+        <translation type="unfinished">Ez da gomendagarria kuota handiagoengatik eta akats tipografikoen aurkako babes txikiagoagatik.</translation>
+    </message>
+    <message>
+        <source>Generates an address compatible with older wallets.</source>
+        <translation type="unfinished">Zorro zaharrekin bateragarria den helbide bat sortzen du.</translation>
+    </message>
+    <message>
+        <source>Generates a native segwit address (BIP-173). Some old wallets don't support it.</source>
+        <translation type="unfinished">Segwit jatorrizko helbidea sortzen du (BIP-173). Zorro zahar batzuek ez dute onartzen.</translation>
+    </message>
+    <message>
+        <source>Bech32m (BIP-350) is an upgrade to Bech32, wallet support is still limited.</source>
+        <translation type="unfinished">Bech32m (BIP-350) Bech32ren bertsio hobetu bat da; hala ere, zorroen euskarria oraindik mugatua da.</translation>
+    </message>
     <message>
         <source>Could not unlock wallet.</source>
-        <translation type="unfinished">Ezin da diruzorroa desblokeatu.</translation>
+        <translation type="unfinished">Ezin izan da zorroa desblokeatu.</translation>
+    </message>
+    <message>
+        <source>Could not generate new %1 address</source>
+        <translation type="unfinished">Ezin izan da %1 helbide berria sortu.</translation>
     </message>
-    </context>
+</context>
 <context>
     <name>ReceiveRequestDialog</name>
+    <message>
+        <source>Request payment to …</source>
+        <translation type="unfinished">Eskatu ordainketa hona: …</translation>
+    </message>
     <message>
         <source>Address:</source>
         <translation type="unfinished">Helbidea:</translation>
@@ -1637,7 +2915,7 @@ Sinatzea 'legacy' motako helbideekin soilik da posible</translation>
     </message>
     <message>
         <source>Wallet:</source>
-        <translation type="unfinished">Diruzorroa:</translation>
+        <translation type="unfinished">Zorroa:</translation>
     </message>
     <message>
         <source>Copy &amp;URI</source>
@@ -1645,21 +2923,29 @@ Sinatzea 'legacy' motako helbideekin soilik da posible</translation>
     </message>
     <message>
         <source>Copy &amp;Address</source>
-        <translation type="unfinished">&amp;Helbidea kopiatu</translation>
+        <translation type="unfinished">Kopiatu &amp;Helbidea</translation>
     </message>
     <message>
         <source>&amp;Verify</source>
         <translation type="unfinished">&amp;Egiaztatu</translation>
     </message>
+    <message>
+        <source>Verify this address on e.g. a hardware wallet screen</source>
+        <translation type="unfinished">Egiaztatu helbide hau, adibidez, hardware-zorro baten pantailan.</translation>
+    </message>
     <message>
         <source>&amp;Save Image…</source>
-        <translation type="unfinished">&amp;Gorde irudia...</translation>
+        <translation type="unfinished">&amp;Gorde irudia…</translation>
     </message>
     <message>
         <source>Payment information</source>
-        <translation type="unfinished">Ordainketaren informazioa</translation>
+        <translation type="unfinished">Ordainketa informazioa.</translation>
+    </message>
+    <message>
+        <source>Request payment to %1</source>
+        <translation type="unfinished">Eskatu ordainketa %1(r)i</translation>
     </message>
-    </context>
+</context>
 <context>
     <name>RecentRequestsTableModel</name>
     <message>
@@ -1668,7 +2954,7 @@ Sinatzea 'legacy' motako helbideekin soilik da posible</translation>
     </message>
     <message>
         <source>Label</source>
-        <translation type="unfinished">Izendapen</translation>
+        <translation type="unfinished">Etiketa</translation>
     </message>
     <message>
         <source>Message</source>
@@ -1676,26 +2962,38 @@ Sinatzea 'legacy' motako helbideekin soilik da posible</translation>
     </message>
     <message>
         <source>(no label)</source>
-        <translation type="unfinished">(izendapenik ez)</translation>
+        <translation type="unfinished">(etiketarik ez)</translation>
     </message>
     <message>
         <source>(no message)</source>
         <translation type="unfinished">(mezurik ez)</translation>
     </message>
+    <message>
+        <source>(no amount requested)</source>
+        <translation type="unfinished">(ez da kopururik eskatu)</translation>
+    </message>
     <message>
         <source>Requested</source>
-        <translation type="unfinished">Eskatua</translation>
+        <translation type="unfinished">Eskatutakoa</translation>
     </message>
 </context>
 <context>
     <name>SendCoinsDialog</name>
     <message>
         <source>Send Coins</source>
-        <translation type="unfinished">Txanponak bidali</translation>
+        <translation type="unfinished">Bidali txanponak</translation>
+    </message>
+    <message>
+        <source>Coin Control Features</source>
+        <translation type="unfinished">Txanponaren Kontrolerako Ezaugarriak</translation>
     </message>
     <message>
         <source>automatically selected</source>
-        <translation type="unfinished">automatikoki aukeratua</translation>
+        <translation type="unfinished">automatikoki hautatua</translation>
+    </message>
+    <message>
+        <source>Insufficient funds!</source>
+        <translation type="unfinished">Funtsik ez da nahikoa!</translation>
     </message>
     <message>
         <source>Quantity:</source>
@@ -1711,20 +3009,36 @@ Sinatzea 'legacy' motako helbideekin soilik da posible</translation>
     </message>
     <message>
         <source>Fee:</source>
-        <translation type="unfinished">Ordainketa:</translation>
+        <translation type="unfinished">Komisioa:</translation>
     </message>
     <message>
         <source>After Fee:</source>
-        <translation type="unfinished">Ordaindu ondoren:</translation>
+        <translation type="unfinished">Komisioaren ondoren:</translation>
     </message>
     <message>
         <source>Change:</source>
         <translation type="unfinished">Bueltak:</translation>
     </message>
+    <message>
+        <source>If this is activated, but the change address is empty or invalid, change will be sent to a newly generated address.</source>
+        <translation type="unfinished">Hau aktibatuta badago, baina aldaketa-helbidea hutsik edo baliogabea bada, aldaketa helbide berri sortu batera bidaliko da.</translation>
+    </message>
+    <message>
+        <source>Custom change address</source>
+        <translation type="unfinished">Aldaketa helbide pertsonalizatua</translation>
+    </message>
     <message>
         <source>Transaction Fee:</source>
         <translation type="unfinished">Transakzio kuota:</translation>
     </message>
+    <message>
+        <source>Using the fallbackfee can result in sending a transaction that will take several hours or days (or never) to confirm. Consider choosing your fee manually or wait until you have validated the complete chain.</source>
+        <translation type="unfinished">Fallbackfee erabiltzeak hainbat ordu edo egun (edo inoiz ez) behar dituen transakzio bat bidaltzea ekar dezake. Kontuan hartu zure kuota eskuz hautatzea edo kate osoa balidatu arte itxarotea.</translation>
+    </message>
+    <message>
+        <source>Warning: Fee estimation is currently not possible.</source>
+        <translation type="unfinished">Abisua: Une honetan ezinezkoa da komisioaren estimazioa egitea.</translation>
+    </message>
     <message>
         <source>per kilobyte</source>
         <translation type="unfinished">Kilobyteko</translation>
@@ -1739,27 +3053,75 @@ Sinatzea 'legacy' motako helbideekin soilik da posible</translation>
     </message>
     <message>
         <source>Custom:</source>
-        <translation type="unfinished">Neurrira:</translation>
+        <translation type="unfinished">Pertsonalizatua:</translation>
     </message>
     <message>
         <source>Send to multiple recipients at once</source>
-        <translation type="unfinished">Hainbat jasotzaileri batera bidali</translation>
+        <translation type="unfinished">Bidali hartzaile anitzei aldi berean</translation>
+    </message>
+    <message>
+        <source>Add &amp;Recipient</source>
+        <translation type="unfinished">Gehitu &amp;Hartzailea</translation>
     </message>
     <message>
         <source>Clear all fields of the form.</source>
-        <translation type="unfinished">Garbitu formularioko eremu guztiak.</translation>
+        <translation type="unfinished">Garbitu formularioaren eremu guztiak.</translation>
+    </message>
+    <message>
+        <source>Inputs…</source>
+        <translation type="unfinished">Sarrerak…</translation>
     </message>
     <message>
         <source>Choose…</source>
         <translation type="unfinished">Aukeratu...</translation>
     </message>
+    <message>
+        <source>Hide transaction fee settings</source>
+        <translation type="unfinished">Ezkutatu transakzio komisioaren ezarpenak</translation>
+    </message>
+    <message>
+        <source>Specify a custom fee per kB (1,000 bytes) of the transaction's virtual size.
+
+Note:  Since the fee is calculated on a per-byte basis, a fee rate of "100 satoshis per kvB" for a transaction size of 500 virtual bytes (half of 1 kvB) would ultimately yield a fee of only 50 satoshis.</source>
+        <translation type="unfinished">Zehaztu transakzioaren tamaina birtualeko kilobyteko (1.000 byte) komisio pertsonalizatua.
+
+Oharra: Komisioa byte bakoitzeko kalkulatzen denez, "100 satoshi kvB bakoitzeko" komisio-tasa batek, 500 byte birtualeko (1 kvB-ren erdia) transakzio baten kasuan, azken batean 50 satoshiko komisioa emango luke.</translation>
+    </message>
+    <message>
+        <source>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.</source>
+        <translation type="unfinished">Transakzio-bolumena bloketan dagoen espazioa baino txikiagoa denean, meatzaileek zein nodo errepikatzaileek gutxieneko komisio bat ezar dezakete. Komisio horretara mugatzea egokia izan daiteke, baina kontuan izan: Bitcoin transakzioen eskaera sarearen gaitasuna baino handiagoa denean, gutxieneko komisioa duten transakzioak inoiz ez baieztatzeko arriskua dago.</translation>
+    </message>
+    <message>
+        <source>A too low fee might result in a never confirming transaction (read the tooltip)</source>
+        <translation type="unfinished">Kuota oso baxua izateak transakzioa inoiz ez baieztatzea ekar dezake (ikus azalpen-oharra).</translation>
+    </message>
+    <message>
+        <source>(Smart fee not initialized yet. This usually takes a few blocks…)</source>
+        <translation type="unfinished">(Adimendun komisioa oraindik ez da hasieratu. Normalean hau lortzeko zenbait bloke behar izaten dira…)</translation>
+    </message>
+    <message>
+        <source>Confirmation time target:</source>
+        <translation type="unfinished">Baieztapen denbora helburua:</translation>
+    </message>
+    <message>
+        <source>Enable Replace-By-Fee</source>
+        <translation type="unfinished">Gaitu Replace-By-Fee</translation>
+    </message>
+    <message>
+        <source>With Replace-By-Fee (BIP-125) you can increase a transaction's fee after it is sent. Without this, a higher fee may be recommended to compensate for increased transaction delay risk.</source>
+        <translation type="unfinished">Replace-By-Fee (BIP-125) erabilita, bidalitako transakzio baten kuota handitu daiteke. Hori gabe, gomendagarria izan daiteke kuota handiago bat ezartzea, transakzioaren atzerapen-arrisku handiagoa konpentsatzeko.</translation>
+    </message>
+    <message>
+        <source>Clear &amp;All</source>
+        <translation type="unfinished">Garbitu &amp;Denak</translation>
+    </message>
     <message>
         <source>Balance:</source>
         <translation type="unfinished">Saldoa:</translation>
     </message>
     <message>
         <source>Confirm the send action</source>
-        <translation type="unfinished">Bidalketa berretsi</translation>
+        <translation type="unfinished">Berretsi bidalketa ekintza</translation>
     </message>
     <message>
         <source>S&amp;end</source>
@@ -1767,11 +3129,11 @@ Sinatzea 'legacy' motako helbideekin soilik da posible</translation>
     </message>
     <message>
         <source>Copy quantity</source>
-        <translation type="unfinished">Kopia kopurua</translation>
+        <translation type="unfinished">Kopiatu kantitatea</translation>
     </message>
     <message>
         <source>Copy amount</source>
-        <translation type="unfinished">zenbatekoaren kopia</translation>
+        <translation type="unfinished">Kopiatu zenbatekoa</translation>
     </message>
     <message>
         <source>Copy fee</source>
@@ -1779,16 +3141,20 @@ Sinatzea 'legacy' motako helbideekin soilik da posible</translation>
     </message>
     <message>
         <source>Copy after fee</source>
-        <translation type="unfinished">Kopia kuotaren ondoren</translation>
+        <translation type="unfinished">Kopiatu komisioaren ondorengo zenbatekoa</translation>
     </message>
     <message>
         <source>Copy bytes</source>
-        <translation type="unfinished">Kopiatu byte-ak</translation>
+        <translation type="unfinished">Kopiatu byteak</translation>
     </message>
     <message>
         <source>Copy change</source>
         <translation type="unfinished">Kopiatu aldaketa</translation>
     </message>
+    <message>
+        <source>%1 (%2 blocks)</source>
+        <translation type="unfinished">%1(%2 bloke)</translation>
+    </message>
     <message>
         <source>Sign on device</source>
         <extracomment>"device" usually means a hardware wallet.</extracomment>
@@ -1796,11 +3162,36 @@ Sinatzea 'legacy' motako helbideekin soilik da posible</translation>
     </message>
     <message>
         <source>Connect your hardware wallet first.</source>
-        <translation type="unfinished">Konektatu zure hardware diruzorroa lehenago.</translation>
+        <translation type="unfinished">Konektatu zure hardware zorroa lehenik.</translation>
     </message>
     <message>
-        <source>Sign failed</source>
-        <translation type="unfinished">Sinadurak hutsegitea</translation>
+        <source>Set external signer script path in Options -&gt; Wallet</source>
+        <extracomment>"External signer" means using devices such as hardware wallets.</extracomment>
+        <translation type="unfinished">Ezarri kanpozko sinatzailearen scriptaren bidea Aukerak -&gt; Zorro atalean</translation>
+    </message>
+    <message>
+        <source>Cr&amp;eate Unsigned</source>
+        <translation type="unfinished">Sortu sinatu gabea</translation>
+    </message>
+    <message>
+        <source>Creates a Partially Signed Bitcoin Transaction (PSBT) for use with e.g. an offline %1 wallet, or a PSBT-compatible hardware wallet.</source>
+        <translation type="unfinished">Partzialki Sinatutako Bitcoin Transakzio (PSBT) bat sortzen du, adibidez, lineaz kanpoko %1 zorro batekin edo PSBT bateragarria den hardware-zorro batekin erabiltzeko.</translation>
+    </message>
+    <message>
+        <source>%1 to '%2'</source>
+        <translation type="unfinished">%1'%2'-ra</translation>
+    </message>
+    <message>
+        <source>%1 to %2</source>
+        <translation type="unfinished">%1 %2ra</translation>
+    </message>
+    <message>
+        <source>To review recipient list click "Show Details…"</source>
+        <translation type="unfinished">Hartzaileen zerrenda ikusteko, egin klik "Xehetasunak erakutsi…" botoian.</translation>
+    </message>
+    <message>
+        <source>Sign failed</source>
+        <translation type="unfinished">Sinatzea huts egin du</translation>
     </message>
     <message>
         <source>External signer not found</source>
@@ -1816,6 +3207,11 @@ Sinatzea 'legacy' motako helbideekin soilik da posible</translation>
         <source>Save Transaction Data</source>
         <translation type="unfinished">Gorde transakzioko data</translation>
     </message>
+    <message>
+        <source>Partially Signed Transaction (Binary)</source>
+        <extracomment>Expanded name of the binary PSBT file format. See: BIP 174.</extracomment>
+        <translation type="unfinished">Zati batean sinatutako transakzioa (bitarra)</translation>
+    </message>
     <message>
         <source>PSBT saved</source>
         <extracomment>Popup message when a PSBT has been saved to a file</extracomment>
@@ -1829,28 +3225,121 @@ Sinatzea 'legacy' motako helbideekin soilik da posible</translation>
         <source>or</source>
         <translation type="unfinished">edo</translation>
     </message>
+    <message>
+        <source>You can increase the fee later (signals Replace-By-Fee, BIP-125).</source>
+        <translation type="unfinished">Komisioa geroago handitu dezakezu (Replace-By-Fee seinaleztapena, BIP-125).</translation>
+    </message>
+    <message>
+        <source>Please, review your transaction proposal. This will produce a Partially Signed Bitcoin Transaction (PSBT) which you can save or copy and then sign with e.g. an offline %1 wallet, or a PSBT-compatible hardware wallet.</source>
+        <extracomment>Text to inform a user attempting to create a transaction of their current options. At this stage, a user can only create a PSBT. This string is displayed when private keys are disabled and an external signer is not available.</extracomment>
+        <translation type="unfinished">Mesedez, berrikusi zure transakzio-proposamena. Honek Zati Batez Sinatutako Bitcoin Transakzio bat (PSBT) sortuko du, eta hori gorde edo kopiatu dezakezu, ondoren sinatzeko, adibidez, lineaz kanpoko %1 zorro batekin edo PSBT bateragarria den hardware zorro batekin.</translation>
+    </message>
+    <message>
+        <source>%1 from wallet '%2'</source>
+        <translation type="unfinished">%1'%2' zorrotik</translation>
+    </message>
+    <message>
+        <source>Do you want to create this transaction?</source>
+        <extracomment>Message displayed when attempting to create a transaction. Cautionary text to prompt the user to verify that the displayed transaction details represent the transaction the user intends to create.</extracomment>
+        <translation type="unfinished">Transakzio hau sortu nahi duzu?</translation>
+    </message>
+    <message>
+        <source>Please, review your transaction. You can create and send this transaction or create a Partially Signed Bitcoin Transaction (PSBT), which you can save or copy and then sign with, e.g., an offline %1 wallet, or a PSBT-compatible hardware wallet.</source>
+        <extracomment>Text to inform a user attempting to create a transaction of their current options. At this stage, a user can send their transaction or create a PSBT. This string is displayed when both private keys and PSBT controls are enabled.</extracomment>
+        <translation type="unfinished">Euskara Jasoa dijo:
+Mesedez, berrikusi zure transakzioa. Transakzio hau sor eta bidali dezakezu, edo bestela, Partzialki Sinatutako Bitcoin Transakzio (PSBT) bat sor dezakezu; hori gorde edo kopiatu, eta ondoren, adibidez, lineaz kanpoko %1 zorro batekin edo PSBT bateragarria den hardware-zorro batekin sinatu.</translation>
+    </message>
+    <message>
+        <source>Please, review your transaction.</source>
+        <extracomment>Text to prompt a user to review the details of the transaction they are attempting to send.</extracomment>
+        <translation type="unfinished">Mesedez, berrikusi zure transakzioa.</translation>
+    </message>
+    <message>
+        <source>Transaction fee</source>
+        <translation type="unfinished">Transakzioaren komisioa</translation>
+    </message>
+    <message>
+        <source>%1 kvB</source>
+        <comment>PSBT transaction creation</comment>
+        <extracomment>When reviewing a newly created PSBT (via Send flow), the transaction fee is shown, with "virtual size" of the transaction displayed for context</extracomment>
+        <translation type="unfinished">%1kvB</translation>
+    </message>
+    <message>
+        <source>Not signalling Replace-By-Fee, BIP-125.</source>
+        <translation type="unfinished">Ez da Replace-By-Fee (RBF) seinalatzen, BIP-125.</translation>
+    </message>
     <message>
         <source>Total Amount</source>
         <translation type="unfinished">Kopuru osoa</translation>
     </message>
+    <message>
+        <source>Unsigned Transaction</source>
+        <comment>PSBT copied</comment>
+        <extracomment>Caption of "PSBT has been copied" messagebox</extracomment>
+        <translation type="unfinished">Sinatu gabeko transakzioa</translation>
+    </message>
+    <message>
+        <source>The PSBT has been copied to the clipboard. You can also save it.</source>
+        <translation type="unfinished">PSBT arbelean kopiatu da. Gorde ere egin dezakezu.</translation>
+    </message>
+    <message>
+        <source>PSBT saved to disk</source>
+        <translation type="unfinished">PSBT diskoan gordeta</translation>
+    </message>
     <message>
         <source>Confirm send coins</source>
-        <translation type="unfinished">Txanponen bidalketa berretsi</translation>
+        <translation type="unfinished">Berretsi txanponak bidaltzea</translation>
+    </message>
+    <message>
+        <source>The recipient address is not valid. Please recheck.</source>
+        <translation type="unfinished">Hartzailearen helbidea ez da baliozkoa. Mesedez, egiaztatu berriro.</translation>
     </message>
     <message>
         <source>The amount to pay must be larger than 0.</source>
         <translation type="unfinished">Ordaintzeko kopurua, 0 baino handiagoa izan behar du.</translation>
     </message>
+    <message>
+        <source>The amount exceeds your balance.</source>
+        <translation type="unfinished">Zenbatekoa zure saldoa gainditzen du.</translation>
+    </message>
+    <message>
+        <source>Duplicate address found: addresses should only be used once each.</source>
+        <translation type="unfinished">Helbide bikoiztua aurkitu da: helbide bakoitza behin bakarrik erabili beharko litzateke.</translation>
+    </message>
+    <message>
+        <source>Transaction creation failed!</source>
+        <translation type="unfinished">Transakzioa sortzeak huts egin du!</translation>
+    </message>
+    <message>
+        <source>A fee higher than %1 is considered an absurdly high fee.</source>
+        <translation type="unfinished">%1baino handiagoa den komisio bat neurriz kanpoko altutzat hartzen da.</translation>
+    </message>
     <message numerus="yes">
         <source>Estimated to begin confirmation within %n block(s).</source>
         <translation type="unfinished">
-            <numerusform />
-            <numerusform />
+            <numerusform>%nbloke barruan baieztapena hasten dela aurreikusten da.</numerusform>
+            <numerusform>Baliteke %n bloke barru baieztatzen hastea.</numerusform>
         </translation>
     </message>
+    <message>
+        <source>Warning: Invalid Bitcoin address</source>
+        <translation type="unfinished">Abisua: Bitcoin helbide baliogabea</translation>
+    </message>
+    <message>
+        <source>Warning: Unknown change address</source>
+        <translation type="unfinished">Abisua: Itzulkinaren helbide ezezaguna</translation>
+    </message>
+    <message>
+        <source>Confirm custom change address</source>
+        <translation type="unfinished">Berretsi itzulkinaren helbide pertsonalizatua</translation>
+    </message>
+    <message>
+        <source>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?</source>
+        <translation type="unfinished">Hautatutako itzulkinaren helbidea ez dagokio zorro honi. Zure zorroko funts guztiak edo zati bat helbide horretara bidal daitezke. Ziur zaude?</translation>
+    </message>
     <message>
         <source>(no label)</source>
-        <translation type="unfinished">(izendapenik ez)</translation>
+        <translation type="unfinished">(etiketarik ez)</translation>
     </message>
 </context>
 <context>
@@ -1871,17 +3360,76 @@ Sinatzea 'legacy' motako helbideekin soilik da posible</translation>
         <source>Choose previously used address</source>
         <translation type="unfinished">Aukeratu lehenago aukeraturiko helbidea</translation>
     </message>
+    <message>
+        <source>The Bitcoin address to send the payment to</source>
+        <translation type="unfinished">Ordaina bidaltzeko Bitcoin helbidea</translation>
+    </message>
     <message>
         <source>Paste address from clipboard</source>
         <translation type="unfinished">Arbeletik helbidea itsatsi</translation>
     </message>
+    <message>
+        <source>Remove this entry</source>
+        <translation type="unfinished">Ezabatu sarrera hau</translation>
+    </message>
+    <message>
+        <source>The amount to send in the selected unit</source>
+        <translation type="unfinished">Hautatutako unitatean bidali beharreko zenbatekoa</translation>
+    </message>
+    <message>
+        <source>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.</source>
+        <translation type="unfinished">Komisioa bidaltzen ari zaren zenbatekotik kenduko da. Hartzaileak zenbateko eremuan sartzen duzun baino bitcoin gutxiago jasoko ditu. Hartzaile bat baino gehiago hautatzen badira, komisioa berdin banatuko da.</translation>
+    </message>
+    <message>
+        <source>S&amp;ubtract fee from amount</source>
+        <translation type="unfinished">Kendu komisioa zenbatekotik</translation>
+    </message>
+    <message>
+        <source>Use available balance</source>
+        <translation type="unfinished">Erabili eskuragarri dagoen saldoa</translation>
+    </message>
     <message>
         <source>Message:</source>
         <translation type="unfinished">Mezua:</translation>
     </message>
-    </context>
+    <message>
+        <source>Enter a label for this address to add it to the list of used addresses</source>
+        <translation type="unfinished">Sartu helbide honetarako etiketa bat erabilitako helbideen zerrendara gehitzeko</translation>
+    </message>
+    <message>
+        <source>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.</source>
+        <translation type="unfinished">Bitcoin: URIari erantsitako mezua, transakzioarekin batera gordeko dena zure kontsultarako. Oharra: Mezu hau ez da Bitcoin sarean zehar bidaliko.</translation>
+    </message>
+</context>
+<context>
+    <name>SendConfirmationDialog</name>
+    <message>
+        <source>Send</source>
+        <translation type="unfinished">Bidali</translation>
+    </message>
+    <message>
+        <source>Create Unsigned</source>
+        <translation type="unfinished">Sortu sinatu gabea</translation>
+    </message>
+</context>
 <context>
     <name>SignVerifyMessageDialog</name>
+    <message>
+        <source>Signatures - Sign / Verify a Message</source>
+        <translation type="unfinished">Sinadurak - Mezu bat Sinatu / Egiaztatu</translation>
+    </message>
+    <message>
+        <source>&amp;Sign Message</source>
+        <translation type="unfinished">&amp;Sinatu Mezua</translation>
+    </message>
+    <message>
+        <source>You can sign messages/agreements with your legacy (P2PKH) 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.</source>
+        <translation type="unfinished">Mezuak edo akordioak sinatu ditzakezu zure jatorrizko (P2PKH) helbideekin, helbide horietara bidalitako bitcoinak jasotzeko gaitasuna duzula frogatzeko. Kontuz ibili mezu lauso edo ausazkoak sinatzean, phishing erasoei esker zure identitatea lapurtu nahi dizuten iruzurrezko eskaerak izan baitaitezke. Sinatu soilik xehetasun osoak dituzten eta ados zauden adierazpenak.</translation>
+    </message>
+    <message>
+        <source>The Bitcoin address to sign the message with</source>
+        <translation type="unfinished">Mezua sinatzeko erabiliko den Bitcoin helbidea</translation>
+    </message>
     <message>
         <source>Choose previously used address</source>
         <translation type="unfinished">Aukeratu lehenago aukeraturiko helbidea</translation>
@@ -1898,18 +3446,86 @@ Sinatzea 'legacy' motako helbideekin soilik da posible</translation>
         <source>Signature</source>
         <translation type="unfinished">Sinadura</translation>
     </message>
+    <message>
+        <source>Copy the current signature to the clipboard</source>
+        <translation type="unfinished">Kopiatu uneko sinadura arbelean</translation>
+    </message>
+    <message>
+        <source>Sign the message to prove you own this Bitcoin address</source>
+        <translation type="unfinished">Sinatu mezua Bitcoin helbide horren jabe zarela frogatzeko</translation>
+    </message>
     <message>
         <source>Sign &amp;Message</source>
         <translation type="unfinished">Sinatu &amp;Mezua</translation>
     </message>
+    <message>
+        <source>Reset all sign message fields</source>
+        <translation type="unfinished">Berrezarri sinatzeko mezuaren eremu guztiak</translation>
+    </message>
+    <message>
+        <source>Clear &amp;All</source>
+        <translation type="unfinished">Garbitu &amp;Denak</translation>
+    </message>
     <message>
         <source>&amp;Verify Message</source>
         <translation type="unfinished">&amp;Egiaztatu mezua</translation>
     </message>
+    <message>
+        <source>Enter the receiver's address, message (ensure you copy line breaks, spaces, tabs, etc. exactly) and signature below to verify the message. Be careful not to read more into the signature than what is in the signed message itself, to avoid being tricked by a man-in-the-middle attack. Note that this only proves the signing party receives with the address, it cannot prove sendership of any transaction!</source>
+        <translation type="unfinished">Sartu hartzailearen helbidea, mezua (ziurtatu lerro-jauziak, zuriuneak, tabulazioak eta abar zehatz-mehatz kopiatzen dituzula) eta sinadura behean, mezua egiaztatzeko. Kontuz ibili sinadurari sinatutako mezuan agertzen ez diren esanahi gehigarririk ematen ez diogula, erdiko gizonaren (man-in-the-middle) eraso baten biktima ez izateko. Kontuan izan honek soilik frogatzen duela sinatzaileak helbide horrekin jasotzen duela; ez du transakziorik bidali duenik frogatzen!</translation>
+    </message>
+    <message>
+        <source>The Bitcoin address the message was signed with</source>
+        <translation type="unfinished">Mezua sinatzeko erabili zen Bitcoin helbidea</translation>
+    </message>
+    <message>
+        <source>The signed message to verify</source>
+        <translation type="unfinished">Egiaztatu beharreko sinatutako mezua</translation>
+    </message>
+    <message>
+        <source>The signature given when the message was signed</source>
+        <translation type="unfinished">Mezua sinatzean emandako sinadura</translation>
+    </message>
+    <message>
+        <source>Verify the message to ensure it was signed with the specified Bitcoin address</source>
+        <translation type="unfinished">Egiaztatu mezua, zehaztutako Bitcoin helbidearekin sinatua izan zela bermatzeko</translation>
+    </message>
+    <message>
+        <source>Verify &amp;Message</source>
+        <translation type="unfinished">&amp;Egiaztatu Mezua</translation>
+    </message>
+    <message>
+        <source>Reset all verify message fields</source>
+        <translation type="unfinished">Berrezarri mezuaren egiaztapeneko eremu guztiak</translation>
+    </message>
+    <message>
+        <source>Click "Sign Message" to generate signature</source>
+        <translation type="unfinished">Egin klik "Sinatu mezua" botoian sinadura sortzeko</translation>
+    </message>
+    <message>
+        <source>The entered address is invalid.</source>
+        <translation type="unfinished">Sartutako helbidea ez da baliozkoa.</translation>
+    </message>
+    <message>
+        <source>Please check the address and try again.</source>
+        <translation type="unfinished">Mesedez, egiaztatu helbidea eta saiatu berriro.</translation>
+    </message>
+    <message>
+        <source>The entered address does not refer to a legacy (P2PKH) key. Message signing for SegWit and other non-P2PKH address types is not supported in this version of %1. Please check the address and try again.</source>
+        <translation type="unfinished">Sartutako helbidea ez dagokio jatorrizko (P2PKH) gako bati. Mezuen sinadura SegWit eta beste P2PKH ez diren helbide mota batzuetarako ez dago onartuta %1 bertsio honetan. Mesedez, egiaztatu helbidea eta saiatu berriro.</translation>
+    </message>
+    <message>
+        <source>Wallet unlock was cancelled.</source>
+        <translation type="unfinished">Zorroaren desblokeoa bertan behera utzi da.</translation>
+    </message>
     <message>
         <source>No error</source>
         <translation type="unfinished">Ez dago errorerik</translation>
     </message>
+    <message>
+        <source>Private key for the entered address is not available.</source>
+        <translation type="unfinished">Sartutako helbidearen gako pribatua ez dago eskuragarri.</translation>
+    </message>
     <message>
         <source>Message signing failed.</source>
         <translation type="unfinished">Errorea mezua sinatzean</translation>
@@ -1918,10 +3534,18 @@ Sinatzea 'legacy' motako helbideekin soilik da posible</translation>
         <source>Message signed.</source>
         <translation type="unfinished">Mezua sinatuta.</translation>
     </message>
+    <message>
+        <source>The signature could not be decoded.</source>
+        <translation type="unfinished">Sinadura dekodetu ezin da.</translation>
+    </message>
     <message>
         <source>Please check the signature and try again.</source>
         <translation type="unfinished">Mesedez, begiratu sinadura eta saiatu berriro.</translation>
     </message>
+    <message>
+        <source>The signature did not match the message digest.</source>
+        <translation type="unfinished">Sinadura ez dator bat mezuaren laburpenarekin.</translation>
+    </message>
     <message>
         <source>Message verification failed.</source>
         <translation type="unfinished">Mezuen egiaztatzeak huts egin du</translation>
@@ -1931,8 +3555,34 @@ Sinatzea 'legacy' motako helbideekin soilik da posible</translation>
         <translation type="unfinished">Mezua egiaztatua.</translation>
     </message>
 </context>
+<context>
+    <name>SplashScreen</name>
+    <message>
+        <source>(press q to shutdown and continue later)</source>
+        <translation type="unfinished">(sakatu q itzaltzeko eta geroago jarraitzeko)</translation>
+    </message>
+    <message>
+        <source>press q to shutdown</source>
+        <translation type="unfinished">Itxi egiteko, sakatu q</translation>
+    </message>
+</context>
 <context>
     <name>TransactionDesc</name>
+    <message>
+        <source>conflicted with a transaction with %1 confirmations</source>
+        <extracomment>Text explaining the current status of a transaction, shown in the status field of the details window for this transaction. This status represents an unconfirmed transaction that conflicts with a confirmed transaction.</extracomment>
+        <translation type="unfinished">%1 baieztapen dituen transakzio batekin gatazkan dago.</translation>
+    </message>
+    <message>
+        <source>0/unconfirmed, in memory pool</source>
+        <extracomment>Text explaining the current status of a transaction, shown in the status field of the details window for this transaction. This status represents an unconfirmed transaction that is in the memory pool.</extracomment>
+        <translation type="unfinished">0/berretsi gabe, memoriako pool-ean dago</translation>
+    </message>
+    <message>
+        <source>0/unconfirmed, not in memory pool</source>
+        <extracomment>Text explaining the current status of a transaction, shown in the status field of the details window for this transaction. This status represents an unconfirmed transaction that is not in the memory pool.</extracomment>
+        <translation type="unfinished">0/berretsi gabe, memoriako pool-ean ez dago.</translation>
+    </message>
     <message>
         <source>abandoned</source>
         <extracomment>Text explaining the current status of a transaction, shown in the status field of the details window for this transaction. This status represents an abandoned transaction.</extracomment>
@@ -1991,13 +3641,13 @@ Sinatzea 'legacy' motako helbideekin soilik da posible</translation>
     <message numerus="yes">
         <source>matures in %n more block(s)</source>
         <translation type="unfinished">
-            <numerusform />
-            <numerusform />
+            <numerusform>%nbeste bloke batzuetan heltzen da.</numerusform>
+            <numerusform>%nbeste bloke batzuetan heltzen da.</numerusform>
         </translation>
     </message>
     <message>
         <source>not accepted</source>
-        <translation type="unfinished">Onartu gabe</translation>
+        <translation type="unfinished">onartu gabe</translation>
     </message>
     <message>
         <source>Debit</source>
@@ -2011,14 +3661,62 @@ Sinatzea 'legacy' motako helbideekin soilik da posible</translation>
         <source>Total credit</source>
         <translation type="unfinished">Kreditu totala</translation>
     </message>
+    <message>
+        <source>Transaction fee</source>
+        <translation type="unfinished">Transakzio tasa</translation>
+    </message>
+    <message>
+        <source>Net amount</source>
+        <translation type="unfinished">Sareko zenbatekoa</translation>
+    </message>
     <message>
         <source>Message</source>
         <translation type="unfinished">Mezua</translation>
     </message>
+    <message>
+        <source>Comment</source>
+        <translation type="unfinished">Iruzkin</translation>
+    </message>
+    <message>
+        <source>Transaction ID</source>
+        <translation type="unfinished">Transakzioaren IDa</translation>
+    </message>
+    <message>
+        <source>Transaction total size</source>
+        <translation type="unfinished">Transakzioaren tamaina osoa</translation>
+    </message>
+    <message>
+        <source>Transaction virtual size</source>
+        <translation type="unfinished">Transakzioaren tamaina birtuala</translation>
+    </message>
+    <message>
+        <source>Output index</source>
+        <translation type="unfinished">Irteera indizea</translation>
+    </message>
+    <message>
+        <source>%1 (Certificate was not verified)</source>
+        <translation type="unfinished">%1(Ziurtagiria ez da egiaztatu)</translation>
+    </message>
+    <message>
+        <source>Merchant</source>
+        <translation type="unfinished">Saltzaile</translation>
+    </message>
+    <message>
+        <source>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.</source>
+        <translation type="unfinished">Sortutako txanponek %1 bloke igaro behar dituzte erabilgarri izan aurretik. Bloke hau sortzean, sarean bidali zen blockchain-era gehitzeko. Ezin bada katean sartu, egoera "ez onartua" bihurtuko da eta ezin izango da erabili. Batzuetan, beste nodo batek zure blokearen segunduren bat barru bloke bat sortzen badu, hau gertatu daiteke.</translation>
+    </message>
+    <message>
+        <source>Debug information</source>
+        <translation type="unfinished">Arazketa informazioa</translation>
+    </message>
     <message>
         <source>Transaction</source>
         <translation type="unfinished">Transakzioa</translation>
     </message>
+    <message>
+        <source>Inputs</source>
+        <translation type="unfinished">Sarrerak</translation>
+    </message>
     <message>
         <source>Amount</source>
         <translation type="unfinished">Kopurua</translation>
@@ -2038,7 +3736,11 @@ Sinatzea 'legacy' motako helbideekin soilik da posible</translation>
         <source>This pane shows a detailed description of the transaction</source>
         <translation type="unfinished">Panel honek transakzien deskribapen xehea azaltzen du</translation>
     </message>
-    </context>
+    <message>
+        <source>Details for %1</source>
+        <translation type="unfinished">Xehetasunak honentzat:%1</translation>
+    </message>
+</context>
 <context>
     <name>TransactionTableModel</name>
     <message>
@@ -2051,16 +3753,32 @@ Sinatzea 'legacy' motako helbideekin soilik da posible</translation>
     </message>
     <message>
         <source>Label</source>
-        <translation type="unfinished">Izendapen</translation>
+        <translation type="unfinished">Etiketa</translation>
     </message>
     <message>
         <source>Unconfirmed</source>
         <translation type="unfinished">Baieztatu gabea</translation>
     </message>
+    <message>
+        <source>Abandoned</source>
+        <translation type="unfinished">Utzi</translation>
+    </message>
+    <message>
+        <source>Confirming (%1 of %2 recommended confirmations)</source>
+        <translation type="unfinished">Baieztatzen (%1 gomendatutako%2 baieztapenetatik)</translation>
+    </message>
     <message>
         <source>Confirmed (%1 confirmations)</source>
         <translation type="unfinished">Konfirmatuta (%1 konfirmazio)</translation>
     </message>
+    <message>
+        <source>Conflicted</source>
+        <translation type="unfinished">Gatazka sortua</translation>
+    </message>
+    <message>
+        <source>Immature (%1 confirmations, will be available after %2)</source>
+        <translation type="unfinished">Heldugabe ( %1baieztapen, erabilgarri izango da %2ondoren)</translation>
+    </message>
     <message>
         <source>Generated but not accepted</source>
         <translation type="unfinished">Sortua, baina ez onartua</translation>
@@ -2069,6 +3787,10 @@ Sinatzea 'legacy' motako helbideekin soilik da posible</translation>
         <source>Received with</source>
         <translation type="unfinished">Honekin jasoa</translation>
     </message>
+    <message>
+        <source>Received from</source>
+        <translation type="unfinished">Jasota honengandik:</translation>
+    </message>
     <message>
         <source>Sent to</source>
         <translation type="unfinished">Hona bidalia</translation>
@@ -2079,20 +3801,24 @@ Sinatzea 'legacy' motako helbideekin soilik da posible</translation>
     </message>
     <message>
         <source>(no label)</source>
-        <translation type="unfinished">(izendapenik ez)</translation>
+        <translation type="unfinished">(etiketarik ez)</translation>
     </message>
     <message>
         <source>Transaction status. Hover over this field to show number of confirmations.</source>
-        <translation type="unfinished">Transakzioaren egoera. Pasatu sagua gainetik konfirmazio kopurua ikusteko.</translation>
+        <translation type="unfinished">Transakzioaren egoera. Eremu honen gainean pasatzean, berrespen kopurua erakutsiko da.</translation>
     </message>
     <message>
         <source>Date and time that the transaction was received.</source>
-        <translation type="unfinished">Transakzioa jasotako data eta ordua.</translation>
+        <translation type="unfinished">Transakzioa jaso zen data eta ordua.</translation>
     </message>
     <message>
         <source>Type of transaction.</source>
         <translation type="unfinished">Transakzio mota.</translation>
     </message>
+    <message>
+        <source>User-defined intent/purpose of the transaction.</source>
+        <translation type="unfinished">Erabiltzaileak definitutako transakzioaren asmoa edo helburua.</translation>
+    </message>
     <message>
         <source>Amount removed from or added to balance.</source>
         <translation type="unfinished">Saldoan kendu edo gehitutako kopurua.</translation>
@@ -2140,10 +3866,18 @@ Sinatzea 'legacy' motako helbideekin soilik da posible</translation>
         <source>Other</source>
         <translation type="unfinished">Beste</translation>
     </message>
+    <message>
+        <source>Enter address, transaction id, or label to search</source>
+        <translation type="unfinished">Sartu helbidea, transakzioaren IDa edo etiketa bilatzeko</translation>
+    </message>
     <message>
         <source>Min amount</source>
         <translation type="unfinished">Kopuru minimoa</translation>
     </message>
+    <message>
+        <source>Range…</source>
+        <translation type="unfinished">Tartea…</translation>
+    </message>
     <message>
         <source>&amp;Copy address</source>
         <translation type="unfinished">&amp;Helbidea kopiatu</translation>
@@ -2152,6 +3886,47 @@ Sinatzea 'legacy' motako helbideekin soilik da posible</translation>
         <source>Copy &amp;label</source>
         <translation type="unfinished">Kopiatu &amp;Etiketa</translation>
     </message>
+    <message>
+        <source>Copy &amp;amount</source>
+        <translation type="unfinished">Kopiatu kopurua</translation>
+    </message>
+    <message>
+        <source>Copy transaction &amp;ID</source>
+        <translation type="unfinished">Kopiatu transakzioaren IDa</translation>
+    </message>
+    <message>
+        <source>Copy &amp;raw transaction</source>
+        <translation type="unfinished">Kopiatu transakzio &amp;gordina</translation>
+    </message>
+    <message>
+        <source>Copy full transaction &amp;details</source>
+        <translation type="unfinished">Kopiatu transakzio &amp;xehetasun osoak</translation>
+    </message>
+    <message>
+        <source>&amp;Show transaction details</source>
+        <translation type="unfinished">&amp;Erakutsi transakzio xehetasunak</translation>
+    </message>
+    <message>
+        <source>Increase transaction &amp;fee</source>
+        <translation type="unfinished">Handitu transakzioaren komisioa</translation>
+    </message>
+    <message>
+        <source>A&amp;bandon transaction</source>
+        <translation type="unfinished">&amp;Utzi transakzioa</translation>
+    </message>
+    <message>
+        <source>&amp;Edit address label</source>
+        <translation type="unfinished">Editatu helbidearen etiketa</translation>
+    </message>
+    <message>
+        <source>Show in %1</source>
+        <extracomment>Transactions table context menu action to show the selected transaction in a third-party block explorer. %1 is a stand-in argument for the URL of the explorer.</extracomment>
+        <translation type="unfinished">Erakutsi hemen:%1</translation>
+    </message>
+    <message>
+        <source>Export Transaction History</source>
+        <translation type="unfinished">Esportatu transakzioen historia</translation>
+    </message>
     <message>
         <source>Comma separated file</source>
         <extracomment>Expanded name of the CSV file format. See: https://en.wikipedia.org/wiki/Comma-separated_values.</extracomment>
@@ -2171,7 +3946,7 @@ Sinatzea 'legacy' motako helbideekin soilik da posible</translation>
     </message>
     <message>
         <source>Label</source>
-        <translation type="unfinished">Izendapen</translation>
+        <translation type="unfinished">Etiketa</translation>
     </message>
     <message>
         <source>Address</source>
@@ -2181,9 +3956,37 @@ Sinatzea 'legacy' motako helbideekin soilik da posible</translation>
         <source>Exporting Failed</source>
         <translation type="unfinished">Esportazioak huts egin du</translation>
     </message>
-    </context>
+    <message>
+        <source>There was an error trying to save the transaction history to %1.</source>
+        <translation type="unfinished">Errore bat gertatu da transakzioen historia %1 fitxategian gordetzen saiatzean.</translation>
+    </message>
+    <message>
+        <source>Exporting Successful</source>
+        <translation type="unfinished">Esportazioa arrakastatsua izan da.</translation>
+    </message>
+    <message>
+        <source>The transaction history was successfully saved to %1.</source>
+        <translation type="unfinished">Transakzioen historia arrakastaz gorde da %1 fitxategian.</translation>
+    </message>
+    <message>
+        <source>Range:</source>
+        <translation type="unfinished">tartea:</translation>
+    </message>
+    <message>
+        <source>to</source>
+        <translation type="unfinished">-ra</translation>
+    </message>
+</context>
 <context>
     <name>WalletFrame</name>
+    <message>
+        <source>No wallet has been loaded.
+Go to File &gt; Open Wallet to load a wallet.
+- OR -</source>
+        <translation type="unfinished">Ez da zorrorik kargatu.
+Joan Fitxategia &gt; Ireki Zorro menura zorro bat kargatzeko.
+– EDO –</translation>
+    </message>
     <message>
         <source>Create a new wallet</source>
         <translation type="unfinished">Diruzorro berri bat sortu</translation>
@@ -2192,98 +3995,1192 @@ Sinatzea 'legacy' motako helbideekin soilik da posible</translation>
         <source>Error</source>
         <translation type="unfinished">Akatsa</translation>
     </message>
-    </context>
-<context>
-    <name>WalletModel</name>
-    <message>
-        <source>Send Coins</source>
-        <translation type="unfinished">Txanponak bidali</translation>
-    </message>
     <message>
-        <source>Current fee:</source>
-        <translation type="unfinished">Oraingo kuota:</translation>
+        <source>Unable to decode PSBT from clipboard (invalid base64)</source>
+        <translation type="unfinished">Ezin izan da arbeletik hartutako PSBT deskodetu (base64 baliogabea).</translation>
     </message>
     <message>
-        <source>New fee:</source>
-        <translation type="unfinished">Kuota berria:</translation>
+        <source>Load Transaction Data</source>
+        <translation type="unfinished">Kargatu transakzio-datuak</translation>
     </message>
     <message>
-        <source>PSBT copied</source>
-        <translation type="unfinished">PSBT kopiatua</translation>
+        <source>Partially Signed Transaction (*.psbt)</source>
+        <translation type="unfinished">Partez Sinatutako Transakzioa (*.psbt)</translation>
     </message>
-    </context>
-<context>
-    <name>WalletView</name>
     <message>
-        <source>&amp;Export</source>
-        <translation type="unfinished">&amp;Esportatu</translation>
+        <source>PSBT file must be smaller than 100 MiB</source>
+        <translation type="unfinished">PSBT fitxategiak 100 MiB baino txikiagoa izan behar du.</translation>
     </message>
     <message>
-        <source>Export the data in the current tab to a file</source>
-        <translation type="unfinished">Uneko fitxategian datuak esportatu</translation>
+        <source>Unable to decode PSBT</source>
+        <translation type="unfinished">Ezin da PSBT deskodetu</translation>
     </message>
-    </context>
+</context>
 <context>
-    <name>bitcoin-core</name>
+    <name>WalletModel</name>
     <message>
-        <source>default wallet</source>
-        <translation type="unfinished">Diruzorro lehenetsia</translation>
+        <source>Send Coins</source>
+        <translation type="unfinished">Bidali txanponak</translation>
     </message>
     <message>
-        <source>Done loading</source>
-        <translation type="unfinished">Zamaketa amaitua</translation>
+        <source>Fee bump error</source>
+        <translation type="unfinished">Tasa handitzeko errorea.</translation>
     </message>
     <message>
-        <source>Loading wallet…</source>
-        <translation type="unfinished">Diruzorroa kargatzen...</translation>
+        <source>Increasing transaction fee failed</source>
+        <translation type="unfinished">Transakzioaren tasa handitzeak huts egin du</translation>
     </message>
     <message>
-        <source>Missing amount</source>
-        <translation type="unfinished">Zenbatekoa falta da</translation>
+        <source>Do you want to increase the fee?</source>
+        <extracomment>Asks a user if they would like to manually increase the fee of a transaction that has already been created.</extracomment>
+        <translation type="unfinished">Tasa handitu nahi duzu?</translation>
     </message>
     <message>
-        <source>No addresses available</source>
-        <translation type="unfinished">Ez dago helbiderik eskuragarri</translation>
+        <source>Current fee:</source>
+        <translation type="unfinished">Oraingo kuota:</translation>
     </message>
     <message>
-        <source>Replaying blocks…</source>
-        <translation type="unfinished">Blokeak errepikatzen...</translation>
+        <source>Increase:</source>
+        <translation type="unfinished">Handitu:</translation>
     </message>
     <message>
-        <source>Rescanning…</source>
+        <source>New fee:</source>
+        <translation type="unfinished">Kuota berria:</translation>
+    </message>
+    <message>
+        <source>Warning: This may pay the additional fee by reducing change outputs or adding inputs, when necessary. It may add a new change output if one does not already exist. These changes may potentially leak privacy.</source>
+        <translation type="unfinished">Abisua: Honek, beharrezkoa denean, komisio gehigarria ordaindu dezake itzulkin-irtenbideak murriztuz edo sarrera berriak gehituz. Itzulkina ez badago, berria sor dezake. Aldaketa hauek pribatutasuna urratzeko arriskua izan dezakete.</translation>
+    </message>
+    <message>
+        <source>Confirm fee bump</source>
+        <translation type="unfinished">Berretsi komisioaren igoera</translation>
+    </message>
+    <message>
+        <source>Can't draft transaction.</source>
+        <translation type="unfinished">Ezin da transakzio zirriborroa sortu.</translation>
+    </message>
+    <message>
+        <source>PSBT copied</source>
+        <translation type="unfinished">PSBT kopiatua</translation>
+    </message>
+    <message>
+        <source>Fee-bump PSBT copied to clipboard</source>
+        <translation type="unfinished">Komisio-igoerako PSBT arbelean kopiatu da</translation>
+    </message>
+    <message>
+        <source>Can't sign transaction.</source>
+        <translation type="unfinished">Ezin da transakzioa sinatu.</translation>
+    </message>
+    <message>
+        <source>Could not commit transaction</source>
+        <translation type="unfinished">Ezin izan da transakzioa berretsi</translation>
+    </message>
+    <message>
+        <source>Signer error</source>
+        <translation type="unfinished">Sinatzailearen errorea</translation>
+    </message>
+    <message>
+        <source>Can't display address</source>
+        <translation type="unfinished">Ezin da helbidea bistaratu</translation>
+    </message>
+</context>
+<context>
+    <name>WalletView</name>
+    <message>
+        <source>&amp;Export</source>
+        <translation type="unfinished">&amp;Esportatu</translation>
+    </message>
+    <message>
+        <source>Export the data in the current tab to a file</source>
+        <translation type="unfinished">Uneko fitxako datuak fitxategi batera esportatu</translation>
+    </message>
+    <message>
+        <source>Backup Wallet</source>
+        <translation type="unfinished">Zorroaren babeskopia egin</translation>
+    </message>
+    <message>
+        <source>Wallet Data</source>
+        <extracomment>Name of the wallet data file format.</extracomment>
+        <translation type="unfinished">Zorroaren datuak</translation>
+    </message>
+    <message>
+        <source>Backup Failed</source>
+        <translation type="unfinished">Babeskopiak huts egin du</translation>
+    </message>
+    <message>
+        <source>There was an error trying to save the wallet data to %1.</source>
+        <translation type="unfinished">Errore bat gertatu da zorroko datuak %1 fitxategian gordetzen saiatzean.</translation>
+    </message>
+    <message>
+        <source>Backup Successful</source>
+        <translation type="unfinished">Babeskopia arrakastatsua</translation>
+    </message>
+    <message>
+        <source>The wallet data was successfully saved to %1.</source>
+        <translation type="unfinished">Zorroko datuak arrakastaz gorde dira %1 fitxategian.</translation>
+    </message>
+    <message>
+        <source>Cancel</source>
+        <translation type="unfinished">Ezeztatu</translation>
+    </message>
+</context>
+<context>
+    <name>bitcoin-core</name>
+    <message>
+        <source>The %s developers</source>
+        <translation type="unfinished">%s-ren garatzaileak</translation>
+    </message>
+    <message>
+        <source>%s failed to validate the -assumeutxo snapshot state. This indicates a hardware problem, or a bug in the software, or a bad software modification that allowed an invalid snapshot to be loaded. As a result of this, the node will shut down and stop using any state that was built on the snapshot, resetting the chain height from %d to %d. On the next restart, the node will resume syncing from %d without using any snapshot data. Please report this incident to %s, including how you obtained the snapshot. The invalid snapshot chainstate will be left on disk in case it is helpful in diagnosing the issue that caused this error.</source>
+        <translation type="unfinished">%shuts egin du -assumeutxo snapshot egoera baliozkotzean. Honek hardware-arazo bat, softwareko akats bat, edo softwarearen aldaketa txar bat adierazten du, snapshot baliogabe bat kargatzea baimendu duena. Horren ondorioz, nodoa itzali egingo da eta snapshot horretan oinarrituta eraikitako edozein egoera erabiltzen uzti, katearen altuera%d -tik -%dra berrezarriz. Hurrengo berrabiaraztean, nodoak %d-tik berriro sinkronizatzen hasiko da, snapshot daturik erabili gabe. Mesedez, jakinarazi gertaera hau %s-ri, snapshot-a nola lortu zenuen azalduz. Snapshot baliogabearen chainstate diskoan utziko da, errore hau eragin duen arazoa diagnostikatzeko lagungarria izan badaiteke.</translation>
+    </message>
+    <message>
+        <source>%s request to listen on port %u. This port is considered "bad" and thus it is unlikely that any peer will connect to it. See doc/p2p-bad-ports.md for details and a full list.</source>
+        <translation type="unfinished">%s portu %u entzuten saiatu da. Portu hau “txartzat” jotzen da, eta litekeena da ez duzula parekorik konektatuta edukitzea. Xehetasun gehiagorako eta zerrenda osoa ikusteko, kontsultatu doc/p2p-bad-ports.md.</translation>
+    </message>
+    <message>
+        <source>Disk space for %s may not accommodate the block files. Approximately %u GB of data will be stored in this directory.</source>
+        <translation type="unfinished">%sbalioerako disko-lekuak baliteke blokearen fitxategiak hartzeko nahikoa ez izatea. Gutxi gorabehera %uGB datu gordeko dira direktorio honetan.</translation>
+    </message>
+    <message>
+        <source>Distributed under the MIT software license, see the accompanying file %s or %s</source>
+        <translation type="unfinished">MIT software-lizentziapean banatua, ikus erantsitako fitxategia %s edo %s</translation>
+    </message>
+    <message>
+        <source>Error loading wallet. Wallet requires blocks to be downloaded, and software does not currently support loading wallets while blocks are being downloaded out of order when using assumeutxo snapshots. Wallet should be able to load successfully after node sync reaches height %s</source>
+        <translation type="unfinished">Errorea zorroa kargatzean. Zorro honek blokeak deskargatuta egotea eskatzen du, eta softwareak ez du oraindik onartzen zorroak kargatzea blokeak ordenarik gabe deskargatzen ari direnean, assumeutxo argazkiak erabiliz. Nodoaren sinkronizazioa %s altuerara iristen denean, zorroa arrakastaz kargatu beharko luke.</translation>
+    </message>
+    <message>
+        <source>Error reading %s! Transaction data may be missing or incorrect. Rescanning wallet.</source>
+        <translation type="unfinished">Errorea %s irakurtzean! Baliteke transakzio-datuak falta izatea edo okerrak izatea. Zorroa berriro eskaneatzen.</translation>
+    </message>
+    <message>
+        <source>Error starting/committing db txn for wallet transactions removal process</source>
+        <translation type="unfinished">Errorea: ezin izan da datu-baseko transakzioa hasi edo berretsi zorroko transakzioak kentzeko prozesuan</translation>
+    </message>
+    <message>
+        <source>Error: Dumpfile format record is incorrect. Got "%s", expected "format".</source>
+        <translation type="unfinished">Errorea: Dumpfile formatu erregistroa okerra da. Lortu "%s", espero zen "format".</translation>
+    </message>
+    <message>
+        <source>Error: Dumpfile identifier record is incorrect. Got "%s", expected "%s".</source>
+        <translation type="unfinished">Errorea: Dumpfile identifikatzaile erregistroa okerra da. Lortu "%s", espero zen "%s".</translation>
+    </message>
+    <message>
+        <source>Error: Dumpfile version is not supported. This version of bitcoin-wallet only supports version 1 dumpfiles. Got dumpfile with version %s</source>
+        <translation type="unfinished">Errorea: Dump fitxategiaren bertsioa ez da onartzen. Bitcoin-wallet honen bertsio honek soilik 1. bertsioko dump fitxategiak onartzen ditu. Jasotako dump fitxategiak %s bertsioa du.</translation>
+    </message>
+    <message>
+        <source>Error: Unable to produce descriptors for this legacy wallet. Make sure to provide the wallet's passphrase if it is encrypted.</source>
+        <translation type="unfinished">Errorea: Ezin izan dira deskribatzaileak sortu jatorrizko zorro honetarako. Ziurtatu zorroa enkriptatuta badago, haren pasahitza eman duzula.</translation>
+    </message>
+    <message>
+        <source>File %s already exists. If you are sure this is what you want, move it out of the way first.</source>
+        <translation type="unfinished">%sFitxategia dagoeneko existitzen da. Ziur zaude hori nahi duzula, lekuz aldatu ezazu lehenik.</translation>
+    </message>
+    <message>
+        <source>Invalid or corrupt peers.dat (%s). If you believe this is a bug, please report it to %s. As a workaround, you can move the file (%s) out of the way (rename, move, or delete) to have a new one created on the next start.</source>
+        <translation type="unfinished">peers.dat (%s) baliogabea edo hondatuta dago. Akats bat dela uste baduzu, mesedez jakinarazi ezazu %s-ri. Aldi baterako konponbide gisa, fitxategia (%s) lekuz aldatu dezakezu (berrizendatu, mugitu edo ezabatu), hurrengo abioan berri bat sor dadin.</translation>
+    </message>
+    <message>
+        <source>Invalid value detected for '-wallet' or '-nowallet'. '-wallet' requires a string value, while '-nowallet' accepts only '1' to disable all wallets</source>
+        <translation type="unfinished">Baliogabeko balioa detektatu da '-wallet' edo '-nowallet' aukeran. '-wallet' aukerak kate (string) balio bat behar du, eta '-nowallet' aukerak soilik '1' onartzen du zorro guztiak desgaitzeko.</translation>
+    </message>
+    <message>
+        <source>More than one onion bind address is provided. Using %s for the automatically created Tor onion service.</source>
+        <translation type="unfinished">Tipula lotura helbide bat baino gehiago eman da. Automatikoki %ssortutako Tor tipula zerbitzurako erabiliko da.</translation>
+    </message>
+    <message>
+        <source>No dump file provided. To use createfromdump, -dumpfile=&lt;filename&gt; must be provided.</source>
+        <translation type="unfinished">Ez da dump fitxategirik eman. createfromdump erabiltzeko, -dumpfile=&lt;filename&gt; eman behar da.</translation>
+    </message>
+    <message>
+        <source>No dump file provided. To use dump, -dumpfile=&lt;filename&gt; must be provided.</source>
+        <translation type="unfinished">Ez da dump fitxategirik eman. Dump erabiltzeko, -dumpfile=&lt;filename&gt; eman behar da.</translation>
+    </message>
+    <message>
+        <source>Please contribute if you find %s useful. Visit %s for further information about the software.</source>
+        <translation type="unfinished">Mesedez, lagundu %s erabilgarria iruditzen bazaizu. Bisitatu %s softwareari buruzko informazio gehiago lortzeko.</translation>
+    </message>
+    <message>
+        <source>Prune configured below the minimum of %d MiB.  Please use a higher number.</source>
+        <translation type="unfinished">Prune balioa gutxieneko %d MiB azpitik konfiguratu da. Mesedez, erabili zenbaki handiago bat.</translation>
+    </message>
+    <message>
+        <source>Prune mode is incompatible with -reindex-chainstate. Use full -reindex instead.</source>
+        <translation type="unfinished">Prune modua ez da bateragarria -reindex-chainstate aukerarekin. Horren ordez, erabili -reindex osoa.</translation>
+    </message>
+    <message>
+        <source>Rename of '%s' -&gt; '%s' failed. You should resolve this by manually moving or deleting the invalid snapshot directory %s, otherwise you will encounter the same error again on the next startup.</source>
+        <translation type="unfinished">'%s'-&gt; '%s' berrizendatzea huts egin du. Hau konpondu behar duzu snapshot baliogabeko %sdirektorioa eskuz lekuz aldatuz edo ezabatuz; bestela, hurrengo abioan errore bera berriro gertatuko da.</translation>
+    </message>
+    <message>
+        <source>SQLiteDatabase: Unknown sqlite wallet schema version %d. Only version %d is supported</source>
+        <translation type="unfinished">SQLiteDatabase: Sqlite zorro eskemaren %dbertsio ezezaguna. Bertsio%d baino ez da onartzen</translation>
+    </message>
+    <message>
+        <source>The block database contains a block which appears to be from the future. This may be due to your computer's date and time being set incorrectly. Only rebuild the block database if you are sure that your computer's date and time are correct</source>
+        <translation type="unfinished">Bloke-datu-baseak etorkizunekoa dirudien bloke bat dauka. Hau zure ordenagailuaren data eta ordua gaizki ezarrita egoteagatik izan daiteke. Bloke-datu-basea berreraiki soilik ziur bazaude zure ordenagailuaren data eta ordua zuzen daudela.</translation>
+    </message>
+    <message>
+        <source>The transaction amount is too small to send after the fee has been deducted</source>
+        <translation type="unfinished">Transakzioaren zenbatekoa txikia da bidaltzeko, tasak kendu ondoren.</translation>
+    </message>
+    <message>
+        <source>This is a pre-release test build - use at your own risk - do not use for mining or merchant applications</source>
+        <translation type="unfinished">Hau aurre-argitalpeneko proba-bertsio bat da – erabili zure kontura – ez erabili meatze-lanetarako edo merkataritza-aplikazioetarako.</translation>
+    </message>
+    <message>
+        <source>This is the maximum transaction fee you pay (in addition to the normal fee) to prioritize partial spend avoidance over regular coin selection.</source>
+        <translation type="unfinished">Hau da ordainduko duzun gehieneko transakzio-komisioa (ohiko komisioari gehituta), zati bateko gastuak saihestea txanpon-hautaketa arruntaren gainetik lehenesteko.</translation>
+    </message>
+    <message>
+        <source>This is the transaction fee you may discard if change is smaller than dust at this level</source>
+        <translation type="unfinished">Hau da transakzio-tasa, eta bertako aldaketaren balioa hautsa baino txikiagoa bada bazter dezakezuna.</translation>
+    </message>
+    <message>
+        <source>This is the transaction fee you may pay when fee estimates are not available.</source>
+        <translation type="unfinished">Hau da ordain dezakezun transakzio-tasa, tasen estimazioak erabilgarri ez daudenean.</translation>
+    </message>
+    <message>
+        <source>Total length of network version string (%i) exceeds maximum length (%i). Reduce the number or size of uacomments.</source>
+        <translation type="unfinished">Sareko bertsio-katearen luzera osoak (%i) gehieneko luzera (%i) gainditzen du. Murriztu uacomments kopurua edo tamaina.</translation>
+    </message>
+    <message>
+        <source>Unable to replay blocks. You will need to rebuild the database using -reindex-chainstate.</source>
+        <translation type="unfinished">Ezin dira blokeak berriro erreproduzitu. Datu-basea berreraiki behar duzu -reindex-chainstate erabiliz.</translation>
+    </message>
+    <message>
+        <source>Unsupported category-specific logging level %1$s=%2$s. Expected %1$s=&lt;category&gt;:&lt;loglevel&gt;. Valid categories: %3$s. Valid loglevels: %4$s.</source>
+        <translation type="unfinished">Kategoria jakin bateko log-maila %1$s=%2$s ez da onartzen. %1$s=&lt;category&gt;:&lt;loglevel&gt;espero zen. Baliozko kategoriak: %3$s. Baliozko log-mailak: %4$s.</translation>
+    </message>
+    <message>
+        <source>Unsupported chainstate database format found. Please restart with -reindex-chainstate. This will rebuild the chainstate database.</source>
+        <translation type="unfinished">Onartu gabeko chainstate datu-base formatu bat aurkitu da. Mesedez, berrabiarazi -reindex-chainstate aukerarekin. Honek chainstate datu-basea berreraikiko du.</translation>
+    </message>
+    <message>
+        <source>Warning: Private keys detected in wallet {%s} with disabled private keys</source>
+        <translation type="unfinished">Abisua: gako pribatuak detektatu dira {%s} zorroan, gako pribatuak desgaituta daudenean.</translation>
+    </message>
+    <message>
+        <source>Witness data for blocks after height %d requires validation. Please restart with -reindex.</source>
+        <translation type="unfinished">%daltueratik gorako blokeetako lekuko datuak baliozkotu behar dira. Mesedez, berrabiarazi -reindex aukerarekin.</translation>
+    </message>
+    <message>
+        <source>You need to rebuild the database using -reindex to go back to unpruned mode.  This will redownload the entire blockchain</source>
+        <translation type="unfinished">Datu-basea berreraiki behar duzu -reindex aukera erabiliz moztu gabeko modura itzultzeko. Horrek blockchain osoa berriro deskargatuko du.</translation>
+    </message>
+    <message>
+        <source>%s is set very high!</source>
+        <translation type="unfinished">%soso altua ezarrita dago!</translation>
+    </message>
+    <message>
+        <source>-maxmempool must be at least %d MB</source>
+        <translation type="unfinished">-maxmempool gutxienez %dMB izan behar da.</translation>
+    </message>
+    <message>
+        <source>Cannot obtain a lock on directory %s. %s is probably already running.</source>
+        <translation type="unfinished">Ezin da blokeoa lortu direktorioan%s. %s ziurrenik dagoeneko exekutatzen ari da.</translation>
+    </message>
+    <message>
+        <source>Cannot resolve -%s address: '%s'</source>
+        <translation type="unfinished">Ezin da –%s helbidea ebatzi: '%s'</translation>
+    </message>
+    <message>
+        <source>Cannot set -forcednsseed to true when setting -dnsseed to false.</source>
+        <translation type="unfinished">Ezin da -forcednsseed true gisa ezarri -dnsseed false gisa ezartzen denean.</translation>
+    </message>
+    <message>
+        <source>Cannot set -peerblockfilters without -blockfilterindex.</source>
+        <translation type="unfinished">Ezin da -peerblockfilters ezarri -blockfilterindex gabe.</translation>
+    </message>
+    <message>
+        <source>%s is set very high! Fees this large could be paid on a single transaction.</source>
+        <translation type="unfinished">%soso altua ezarrita dago! Horrelako kuota handiak transakzio bakar batean ordaindu litezke.</translation>
+    </message>
+    <message>
+        <source>Cannot provide specific connections and have addrman find outgoing connections at the same time.</source>
+        <translation type="unfinished">Ezin dira aldi berean konexio zehatzak eman eta addrman-ek irteerako konexioak bilatzen utzi.</translation>
+    </message>
+    <message>
+        <source>Error loading %s: External signer wallet being loaded without external signer support compiled</source>
+        <translation type="unfinished">Errorea kargatzean%s: Kanpoko sinatzailearen zorroa kargatzen ari da, baina kanpoko sinatzailearen euskarririk gabe konpilatuta dago.</translation>
+    </message>
+    <message>
+        <source>Error reading %s! All keys read correctly, but transaction data or address metadata may be missing or incorrect.</source>
+        <translation type="unfinished">Errorea irakurtzean %s! Gako guztiak ongi irakurri dira, baina transakzio-datuak edo helbide-metadatuak falta daitezke edo okerrak izan daitezke.</translation>
+    </message>
+    <message>
+        <source>Error: Address book data in wallet cannot be identified to belong to migrated wallets</source>
+        <translation type="unfinished">Errorea: Zorroko helbide liburuko datuak ezin dira migrazioa egin zaien zorrotik datozen gisa identifikatu</translation>
+    </message>
+    <message>
+        <source>Error: Duplicate descriptors created during migration. Your wallet may be corrupted.</source>
+        <translation type="unfinished">Errorea: Deskribatzaile bikoiztuak sortu dira migrazioan zehar. Zure zorroa hondatuta egon daiteke.</translation>
+    </message>
+    <message>
+        <source>Error: Transaction %s in wallet cannot be identified to belong to migrated wallets</source>
+        <translation type="unfinished">Errorea: %stransakzioa ezin da identifikatu migratutako zorroei dagokiola</translation>
+    </message>
+    <message>
+        <source>Failed to remove snapshot chainstate dir (%s). Manually remove it before restarting.
+</source>
+        <translation type="unfinished">Snapshot chainstate direktorioa (%s) ezabatzea huts egin du. Ezabatu eskuz berrabiarazi aurretik.
+</translation>
+    </message>
+    <message>
+        <source>Failed to rename invalid peers.dat file. Please move or delete it and try again.</source>
+        <translation type="unfinished">Ezin izan da baliogabeko peers.dat fitxategia berrizendatu. Mugitu edo ezabatu eta saiatu berriro.</translation>
+    </message>
+    <message>
+        <source>Fee estimation failed. Fallbackfee is disabled. Wait a few blocks or enable %s.</source>
+        <translation type="unfinished">Kuota estimazioa huts egin du. Fallbackfee desgaituta dago. Bloke batzuk itxaron edo gaitu %s.</translation>
+    </message>
+    <message>
+        <source>Flushing block file to disk failed. This is likely the result of an I/O error.</source>
+        <translation type="unfinished">Bloke fitxategia diskoan gordetzea huts egin du. Litekeena da I/O (sarrera-irtenbide) errore baten ondorioa izatea.</translation>
+    </message>
+    <message>
+        <source>Flushing undo file to disk failed. This is likely the result of an I/O error.</source>
+        <translation type="unfinished">Undo fitxategia diskora idazteak huts egin du. Litekeena da I/O errore baten ondorio izatea.</translation>
+    </message>
+    <message>
+        <source>Incompatible options: -dnsseed=1 was explicitly specified, but -onlynet forbids connections to IPv4/IPv6</source>
+        <translation type="unfinished">Aukera bateraezinak: -dnsseed=1 berariaz zehaztu da, baina -onlynet aukerak IPv4/IPv6 konexioak debekatzen ditu.</translation>
+    </message>
+    <message>
+        <source>Invalid amount for %s=&lt;amount&gt;: '%s' (must be at least the minrelay fee of %s to prevent stuck transactions)</source>
+        <translation type="unfinished">Balio baliogabea %s=-&lt;amount&gt;rentzat: '%s' (gutxienez %sminrelay kuota izan behar du transakzio trabatuak saihesteko).</translation>
+    </message>
+    <message>
+        <source>Maximum transaction weight is less than transaction weight without inputs</source>
+        <translation type="unfinished">Transakzioaren gehieneko pisua sarrerarik gabeko transakzioaren pisua baino txikiagoa da</translation>
+    </message>
+    <message>
+        <source>Maximum transaction weight is too low, can not accommodate change output</source>
+        <translation type="unfinished">Transakzioaren gehieneko pisua txikiegia da, eta ez da aldaketaren irteera gehitu ahal</translation>
+    </message>
+    <message>
+        <source>Option '-checkpoints' is set but checkpoints were removed. This option has no effect.</source>
+        <translation type="unfinished">'-checkpoints' aukera ezarrita dago baina kontrolpuntuak kendu egin dira. Aukera honek ez du eraginik.</translation>
+    </message>
+    <message>
+        <source>Outbound connections restricted to CJDNS (-onlynet=cjdns) but -cjdnsreachable is not provided</source>
+        <translation type="unfinished">Irteerako konexioak CJDNSera mugatuta daude (-onlynet=cjdns), baina -cjdnsreachable ez da zehaztu</translation>
+    </message>
+    <message>
+        <source>Outbound connections restricted to Tor (-onlynet=onion) but the proxy for reaching the Tor network is explicitly forbidden: -onion=0</source>
+        <translation type="unfinished">Irteerako konexioak Tor sarera mugatuta daude (-onlynet=onion), baina Tor sarera iristeko proxy-a berariaz debekatuta dago: -onion=0.</translation>
+    </message>
+    <message>
+        <source>Outbound connections restricted to Tor (-onlynet=onion) but the proxy for reaching the Tor network is not provided: none of -proxy, -onion or -listenonion is given</source>
+        <translation type="unfinished">Irteerako konexioak Tor sarera mugatuta daude (-onlynet=onion), baina Tor sarera iristeko proxy-a ez da eman: -proxy, -onion edo -listenonion aukeretako bat ere ez da zehaztu.</translation>
+    </message>
+    <message>
+        <source>Outbound connections restricted to i2p (-onlynet=i2p) but -i2psam is not provided</source>
+        <translation type="unfinished">Konexio irteerak i2pra mugatuta daude (-onlynet=i2p) baina -i2psam ez da zehaztu</translation>
+    </message>
+    <message>
+        <source>Prune: last wallet synchronisation goes beyond pruned data. You need to -reindex (download the whole blockchain again in case of a pruned node)</source>
+        <translation type="unfinished">Prune: azken zorroaren sinkronizazioa moztutako datuak baino harago doa. -reindex egin behar duzu (moztutako nodo baten kasuan, blockchain osoa berriro deskargatuko da).</translation>
+    </message>
+    <message>
+        <source>Rename of '%s' -&gt; '%s' failed. Cannot clean up the background chainstate leveldb directory.</source>
+        <translation type="unfinished">'%s'-&gt; '%s' berrizendatzea huts egin du. Ezin da atzeko planoan dagoen chainstate LevelDB direktorioa garbitu.</translation>
+    </message>
+    <message>
+        <source>Specified -blockmaxweight (%d) exceeds consensus maximum block weight (%d)</source>
+        <translation type="unfinished">Zehaztutako -blockmaxweight (%d)-ek kontsentsuzko gehieneko bloke-pisua (%d) gainditzen du.</translation>
+    </message>
+    <message>
+        <source>Specified -blockreservedweight (%d) exceeds consensus maximum block weight (%d)</source>
+        <translation type="unfinished">Zehaztutako -blockreservedweight (%d)-ek kontsentsuzko gehieneko bloke-pisua (%d) gainditzen du.</translation>
+    </message>
+    <message>
+        <source>Specified -blockreservedweight (%d) is lower than minimum safety value of (%d)</source>
+        <translation type="unfinished">Zehaztutako -blockreservedweight (%d) segurtasunerako gutxieneko balio (%d) baino txikiagoa da</translation>
+    </message>
+    <message>
+        <source>The combination of the pre-selected inputs and the wallet automatic inputs selection exceeds the transaction maximum weight. Please try sending a smaller amount or manually consolidating your wallet's UTXOs</source>
+        <translation type="unfinished">Aurrez hautatutako sarreren eta zorroak automatikoki hautatutako sarreren konbinazioak transakzioaren gehieneko pisua gainditzen du. Saiatu zenbateko txikiago bat bidaltzen edo zure zorroko UTXOak eskuz bateratzen.</translation>
+    </message>
+    <message>
+        <source>The inputs size exceeds the maximum weight. Please try sending a smaller amount or manually consolidating your wallet's UTXOs</source>
+        <translation type="unfinished">Sarreren tamainak gehieneko pisua gainditzen du. Saiatu kopuru txikiago bat bidaltzen edo bateratu eskuz zure zorroko UTXOak</translation>
+    </message>
+    <message>
+        <source>The preselected coins total amount does not cover the transaction target. Please allow other inputs to be automatically selected or include more coins manually</source>
+        <translation type="unfinished">Aurrez hautatutako txanponen guztizko zenbatekoa ez da nahikoa transakzioaren helburua estaltzeko. Baimendu beste sarrerak automatikoki hautatzea edo gehitu txanpon gehiago eskuz</translation>
+    </message>
+    <message>
+        <source>UTXO snapshot failed to validate. Restart to resume normal initial block download, or try loading a different snapshot.</source>
+        <translation type="unfinished">UTXO irudiak balidatzeko huts egin du. Normalean Bloke hasierako deskarga berriro hasteko berrabiarazi, edo saiatu beste irudi bat kargatzen.</translation>
+    </message>
+    <message>
+        <source>Unconfirmed UTXOs are available, but spending them creates a chain of transactions that will be rejected by the mempool</source>
+        <translation type="unfinished">Konfirmatu gabeko UTXOak daude, baina horiek gastatzeak transakzio kate bat sortuko du mempool-ak baztertuko duena.</translation>
+    </message>
+    <message>
+        <source>Unexpected legacy entry in descriptor wallet found. Loading wallet %s
+
+The wallet might have been tampered with or created with malicious intent.
+</source>
+        <translation type="unfinished">Descriptor motako zorroan espero ez zen sarrera zaharkitu bat aurkitu da. Zorroa kargatzen %s
+
+Zorroa manipulatua izan daiteke edo asmo gaiztoarekin sortua.
+</translation>
+    </message>
+    <message>
+        <source>Your computer's date and time appear to be more than %d minutes out of sync with the network, this may lead to consensus failure. After you've confirmed your computer's clock, this message should no longer appear when you restart your node. Without a restart, it should stop showing automatically after you've connected to a sufficient number of new outbound peers, which may take some time. You can inspect the `timeoffset` field of the `getpeerinfo` and `getnetworkinfo` RPC methods to get more info.</source>
+        <translation type="unfinished">Zure ordenagailuaren data eta ordua sarearekiko %d minutu baino gehiago desinkronizatuta daudela dirudi, eta horrek adostasunaren porrota eragin dezake. Zure ordenagailuaren erlojua egokia dela baieztatu ondoren, mezu hau ez litzateke berriro agertu behar nodoa berrabiarazten duzunean. Berrabiarazi gabe, mezuak automatikoki desagertu beharko luke irteerako pareko nahikoa konektatzen dituzunean, baina horrek denbora pixka bat har dezake. Informazio gehiago lortzeko, ikus getpeerinfo eta getnetworkinfo RPC metodoetako timeoffset eremua.</translation>
+    </message>
+    <message>
+        <source>
+Unable to cleanup failed migration</source>
+        <translation type="unfinished">
+Ezin da huts egindako migrazioa garbitu</translation>
+    </message>
+    <message>
+        <source>
+Unable to restore backup of wallet.</source>
+        <translation type="unfinished">
+Ezin izan da zorroaren babeskopia berreskuratu</translation>
+    </message>
+    <message>
+        <source>default wallet</source>
+        <translation type="unfinished">Zorro lehenetsia</translation>
+    </message>
+    <message>
+        <source>whitebind may only be used for incoming connections ("out" was passed)</source>
+        <translation type="unfinished">whitebind parametroa soilik sarrerako konexioetarako erabil daiteke ("out" bidali da)</translation>
+    </message>
+    <message>
+        <source>A fatal internal error occurred, see debug.log for details: </source>
+        <translation type="unfinished">Barne-errore larria gertatu da, xehetasunak debug.log fitxategian ikus daitezke</translation>
+    </message>
+    <message>
+        <source>Assumeutxo data not found for the given blockhash '%s'.</source>
+        <translation type="unfinished">Assumeutxo daturik ez da aurkitu eman den '%s' bloke-hasharentzat</translation>
+    </message>
+    <message>
+        <source>Block verification was interrupted</source>
+        <translation type="unfinished">Bloke berifikazioa eten da</translation>
+    </message>
+    <message>
+        <source>Can't spend unconfirmed version %d pre-selected input with a version 3 tx</source>
+        <translation type="unfinished">Ezin da baieztatu %dgabeko bertsioaren aurrez hautatutako sarrera bat gastatu 3. bertsioaren transakzio batekin</translation>
+    </message>
+    <message>
+        <source>Can't spend unconfirmed version 3 pre-selected input with a version %d tx</source>
+        <translation type="unfinished">%dEzin da baieztatu gabeko 3. bertsioaren aurrez hautatutako sarrera bat gastatu bertsioaren transakzio batekin</translation>
+    </message>
+    <message>
+        <source>Cannot write to directory '%s'; check permissions.</source>
+        <translation type="unfinished">Ezin da '%s' direktorioan idatzi; egiaztatu baimenak.</translation>
+    </message>
+    <message>
+        <source>Config setting for %s only applied on %s network when in [%s] section.</source>
+        <translation type="unfinished">%skonfigurazio-ezarpena %s soilik aplikatzen da sarean, [%s] atalean dagoenean.</translation>
+    </message>
+    <message>
+        <source>Copyright (C) %i-%i</source>
+        <translation type="unfinished">Copyright (C) %i- %i</translation>
+    </message>
+    <message>
+        <source>Corrupt block found indicating potential hardware failure.</source>
+        <translation type="unfinished">Bloke hondatu bat aurkitu da, eta horrek hardware akats baten adierazgarri izan daiteke.</translation>
+    </message>
+    <message>
+        <source>Corrupted block database detected</source>
+        <translation type="unfinished">Bloke datu base hondatua atzeman da</translation>
+    </message>
+    <message>
+        <source>Could not find asmap file %s</source>
+        <translation type="unfinished">Ezin izan da %sasmap fitxategia aurkitu</translation>
+    </message>
+    <message>
+        <source>Could not generate scriptPubKeys (cache is empty)</source>
+        <translation type="unfinished">Ezin izan dira scriptPubKey-ak sortu (cachea hutsik dago)</translation>
+    </message>
+    <message>
+        <source>Could not parse asmap file %s</source>
+        <translation type="unfinished">Ezin izan da asmap fitxategia analizatu %s</translation>
+    </message>
+    <message>
+        <source>Could not top up scriptPubKeys</source>
+        <translation type="unfinished">Ezin izan dira scriptPubKey-ak osatu</translation>
+    </message>
+    <message>
+        <source>Disk space is too low!</source>
+        <translation type="unfinished">Diskoko lekua oso gutxi da!</translation>
+    </message>
+    <message>
+        <source>Done loading</source>
+        <translation type="unfinished">Kargatzea amaituta</translation>
+    </message>
+    <message>
+        <source>Dump file %s does not exist.</source>
+        <translation type="unfinished">%s dump fitxategia ez dago existitzen.</translation>
+    </message>
+    <message>
+        <source>Elliptic curve cryptography sanity check failure. %s is shutting down.</source>
+        <translation type="unfinished">Kurba eliptikoko kriptografiaren zentzuzko egiaztapenak huts egin du. %s itxitzen ari da.</translation>
+    </message>
+    <message>
+        <source>Error initializing block database</source>
+        <translation type="unfinished">Errorea bloke datu basea hasieratzean</translation>
+    </message>
+    <message>
+        <source>Error loading %s</source>
+        <translation type="unfinished">Kargatzean %serrorea</translation>
+    </message>
+    <message>
+        <source>Error loading %s: Wallet corrupted</source>
+        <translation type="unfinished">Errorea %s kargatzean: zorroa hondatuta dago</translation>
+    </message>
+    <message>
+        <source>Error loading %s: Wallet requires newer version of %s</source>
+        <translation type="unfinished">Errorea %s kargatzean: zorroak %sren bertsio berriago bat behar du</translation>
+    </message>
+    <message>
+        <source>Error loading block database</source>
+        <translation type="unfinished">Errorea bloke datu basea kargatzean</translation>
+    </message>
+    <message>
+        <source>Error loading databases</source>
+        <translation type="unfinished">Errorea datu-baseak kargatzean</translation>
+    </message>
+    <message>
+        <source>Error opening block database</source>
+        <translation type="unfinished">Errorea bloke-datu-basea irekitzean</translation>
+    </message>
+    <message>
+        <source>Error opening coins database</source>
+        <translation type="unfinished">Errorea txanponen datu-basea irekitzean</translation>
+    </message>
+    <message>
+        <source>Error reading configuration file: %s</source>
+        <translation type="unfinished">Errorea konfigurazio-fitxategia irakurtzean: %s</translation>
+    </message>
+    <message>
+        <source>Error reading from database, shutting down.</source>
+        <translation type="unfinished">Errorea datu-basea irakurtzean, itxiera egiten da.</translation>
+    </message>
+    <message>
+        <source>Error reading next record from wallet database</source>
+        <translation type="unfinished">Errorea zorroaren datu-basetik hurrengo erregistroa irakurtzean</translation>
+    </message>
+    <message>
+        <source>Error: Cannot extract destination from the generated scriptpubkey</source>
+        <translation type="unfinished">Errorea: Helbidea ezin da atera sortutako ScriptPubKey-tik.</translation>
+    </message>
+    <message>
+        <source>Error: Couldn't create cursor into database</source>
+        <translation type="unfinished">Errorea: Kurtsorea datu-basean sortu ezin da.</translation>
+    </message>
+    <message>
+        <source>Error: Disk space is low for %s</source>
+        <translation type="unfinished">Errorea: Diskoko lekua gutxiegi dago %s(r)entzat</translation>
+    </message>
+    <message>
+        <source>Error: Dumpfile checksum does not match. Computed %s, expected %s</source>
+        <translation type="unfinished">Errorea: Dumpfitxategiaren bat-datorrenik ez. Kalkulatutakoa , %sespero zena%s </translation>
+    </message>
+    <message>
+        <source>Error: Failed to create new watchonly wallet</source>
+        <translation type="unfinished">Errorea: Watch-only zorro berria sortzea huts egin da.</translation>
+    </message>
+    <message>
+        <source>Error: Got key that was not hex: %s</source>
+        <translation type="unfinished">Errorea: Hexadezimala ez den gakoa jaso da: %s</translation>
+    </message>
+    <message>
+        <source>Error: Got value that was not hex: %s</source>
+        <translation type="unfinished">Errorea: Hexadezimala ez den balioa jaso da: %s</translation>
+    </message>
+    <message>
+        <source>Error: Keypool ran out, please call keypoolrefill first</source>
+        <translation type="unfinished">Errorea: Keypool-a amaitu da, lehenik keypoolrefill deitu mesedez.</translation>
+    </message>
+    <message>
+        <source>Error: Missing checksum</source>
+        <translation type="unfinished">Errorea: Kontrol batura falta da</translation>
+    </message>
+    <message>
+        <source>Error: No %s addresses available.</source>
+        <translation type="unfinished">Errorea: Ez dago %s helbiderik erabilgarri.</translation>
+    </message>
+    <message>
+        <source>Error: Not all address book records were migrated</source>
+        <translation type="unfinished">Errorea: ez dira helbide-liburuko erregistro guztiak migratu</translation>
+    </message>
+    <message>
+        <source>Error: Not all transaction records were migrated</source>
+        <translation type="unfinished">Errorea: ez dira transakzio-erregistro guztiak migratu</translation>
+    </message>
+    <message>
+        <source>Error: This wallet already uses SQLite</source>
+        <translation type="unfinished">Errorea: Zorro honek jadanik SQLite erabiltzen du.</translation>
+    </message>
+    <message>
+        <source>Error: This wallet is already a descriptor wallet</source>
+        <translation type="unfinished">Errorea: Zorro hau jadanik deskribatzaile zorroa da.</translation>
+    </message>
+    <message>
+        <source>Error: Unable to begin reading all records in the database</source>
+        <translation type="unfinished">Errorea: Datu-baseko erregistro guztiak irakurtzen hasteko ezin izan da.</translation>
+    </message>
+    <message>
+        <source>Error: Unable to make a backup of your wallet</source>
+        <translation type="unfinished">Errorea: Zure zorroaren babeskopia egin ezin izan da.</translation>
+    </message>
+    <message>
+        <source>Error: Unable to parse version %u as a uint32_t</source>
+        <translation type="unfinished">Errorea: Ezin izan da %ubertsioa uint32_t gisa analizatu</translation>
+    </message>
+    <message>
+        <source>Error: Unable to read all records in the database</source>
+        <translation type="unfinished">Errorea: Datu-baseko erregistro guztiak irakurri ezin izan dira.</translation>
+    </message>
+    <message>
+        <source>Error: Unable to read wallet's best block locator record</source>
+        <translation type="unfinished">Errorea: Zorroaren blokeko kokatzaile onena irakurri ezin izan da.</translation>
+    </message>
+    <message>
+        <source>Error: Unable to remove watchonly address book data</source>
+        <translation type="unfinished">Errorea: Watch-only helbide-liburuaren datuak ezabatu ezin izan dira.</translation>
+    </message>
+    <message>
+        <source>Error: Unable to write data to disk for wallet %s</source>
+        <translation type="unfinished">Errorea: Ezin izan da daturik idatzi diskoan diru-zorroarentzat %s</translation>
+    </message>
+    <message>
+        <source>Error: Unable to write record to new wallet</source>
+        <translation type="unfinished">Errorea: Erregistroa zorro berriari idaztea ezin izan da.</translation>
+    </message>
+    <message>
+        <source>Error: Unable to write solvable wallet best block locator record</source>
+        <translation type="unfinished">Errorea: Ezin da zorro ebatigarriaren blokearen kokatzaile erregistroa idatzi</translation>
+    </message>
+    <message>
+        <source>Error: Unable to write watchonly wallet best block locator record</source>
+        <translation type="unfinished">Errorea: Watch-only zorroaren blokeko kokatzaile onena idaztea ezin izan da.</translation>
+    </message>
+    <message>
+        <source>Error: database transaction cannot be executed for wallet %s</source>
+        <translation type="unfinished">Errorea: datu-baseko transakzioa ezin da exekutatu %szorrorako</translation>
+    </message>
+    <message>
+        <source>Failed to acquire rescan reserver during wallet initialization</source>
+        <translation type="unfinished">Huts egin du berreskaneatzeko erreserba eskuratzean zorroa hasieratzean.</translation>
+    </message>
+    <message>
+        <source>Failed to close block undo file.</source>
+        <translation type="unfinished">Huts egin du blokeen desegite-fitxategia ixtean.</translation>
+    </message>
+    <message>
+        <source>Failed to close file when writing block.</source>
+        <translation type="unfinished">Huts egin du fitxategia ixtean blokea idaztean.</translation>
+    </message>
+    <message>
+        <source>Failed to disconnect block.</source>
+        <translation type="unfinished">Blokea deskonektatzea huts egin du.</translation>
+    </message>
+    <message>
+        <source>Failed to listen on any port. Use -listen=0 if you want this.</source>
+        <translation type="unfinished">Portu batean ere ezingo da entzun. Horretarako, erabili -listen=0.</translation>
+    </message>
+    <message>
+        <source>Failed to read block.</source>
+        <translation type="unfinished">Blokea irakurtzean huts egin du.</translation>
+    </message>
+    <message>
+        <source>Failed to rescan the wallet during initialization</source>
+        <translation type="unfinished">Zorroa berrikusi ezin izan da hasieratzean.</translation>
+    </message>
+    <message>
+        <source>Failed to verify database</source>
+        <translation type="unfinished">Datu-basea egiaztatzean huts egin du.</translation>
+    </message>
+    <message>
+        <source>Failed to write block.</source>
+        <translation type="unfinished">Blokea idaztea huts egin du.</translation>
+    </message>
+    <message>
+        <source>Failed to write undo data.</source>
+        <translation type="unfinished">Huts egin du desegiteko datuak idaztean.</translation>
+    </message>
+    <message>
+        <source>Failure removing transaction: %s</source>
+        <translation type="unfinished">Huts egin du transakzioa kentzean: %s</translation>
+    </message>
+    <message>
+        <source>Fee rate (%s) is lower than the minimum fee rate setting (%s)</source>
+        <translation type="unfinished">Kuota-tasa (%s) ezarritako kuota-tasa minimoa (%s) baino txikiagoa da.</translation>
+    </message>
+    <message>
+        <source>Ignoring duplicate -wallet %s.</source>
+        <translation type="unfinished">-wallet errepikatuari %sez ikusiarena egiten.</translation>
+    </message>
+    <message>
+        <source>Incorrect or no genesis block found. Wrong datadir for network?</source>
+        <translation type="unfinished">Hasierako bloke okerra edo inexistentea aurkitu da. Sarearentzako datu-karpeta okerra al da?</translation>
+    </message>
+    <message>
+        <source>Initialization sanity check failed. %s is shutting down.</source>
+        <translation type="unfinished">Hasierako zuzentasun-egiaztatak huts egin du. %sitxieren da</translation>
+    </message>
+    <message>
+        <source>Input not found or already spent</source>
+        <translation type="unfinished">Sarrera aurkitu ez da edo jadanik erabili da</translation>
+    </message>
+    <message>
+        <source>Insufficient dbcache for block verification</source>
+        <translation type="unfinished">Blokeen egiaztapenerako dbcache nahikorik ez</translation>
+    </message>
+    <message>
+        <source>Insufficient funds</source>
+        <translation type="unfinished">Funts nahikorik ez dago</translation>
+    </message>
+    <message>
+        <source>Invalid -i2psam address or hostname: '%s'</source>
+        <translation type="unfinished">-i2psam helbide edo ostalari-izena baliogabea: '%s'</translation>
+    </message>
+    <message>
+        <source>Invalid -onion address or hostname: '%s'</source>
+        <translation type="unfinished">-onion helbide edo ostalari-izena baliogabea: '%s'</translation>
+    </message>
+    <message>
+        <source>Invalid -proxy address or hostname: '%s'</source>
+        <translation type="unfinished">-proxy helbide edo ostalari-izena baliogabea '%s'</translation>
+    </message>
+    <message>
+        <source>Invalid P2P permission: '%s'</source>
+        <translation type="unfinished">P2P baimen baliogabea: '%s'</translation>
+    </message>
+    <message>
+        <source>Invalid amount for %s=&lt;amount&gt;: '%s'</source>
+        <translation type="unfinished">%s=&lt;amount&gt; baliorako kopuru baliogabea: '%s'</translation>
+    </message>
+    <message>
+        <source>A %zu MiB dbcache may be too large for a system memory of only %zu MiB.</source>
+        <translation type="unfinished">%zu MiB-eko dbcache bat handiegia izan daiteke %zu MiB baino ez duen sistemaren memoriarako.</translation>
+    </message>
+    <message>
+        <source>Creating wallet…</source>
+        <translation type="unfinished">Zorroa sortzen…</translation>
+    </message>
+    <message>
+        <source>Duplicate binding configuration for address %s. Please check your -bind, -bind=...=onion and -whitebind settings.</source>
+        <translation type="unfinished">%s helbiderako lotura-konfigurazio bikoiztua. Mesedez, egiaztatu zure -bind, -bind=...=onion eta -whitebind ezarpenak.</translation>
+    </message>
+    <message>
+        <source>Error creating %s: Could not write version metadata.</source>
+        <translation type="unfinished">Errorea %s sortzean: ezin izan da bertsioaren metadatua idatzi.</translation>
+    </message>
+    <message>
+        <source>Invalid amount for -%s=&lt;amount&gt;: '%s'</source>
+        <translation type="unfinished">-%s=&lt;amount&gt; baliorako kopuru baliogabea: '%s'</translation>
+    </message>
+    <message>
+        <source>Invalid netmask specified in -whitelist: '%s'</source>
+        <translation type="unfinished">Baliogabeko sare-maskara zehaztuta -whitelist aukeran: '%s'</translation>
+    </message>
+    <message>
+        <source>Invalid port specified in %s: '%s'</source>
+        <translation type="unfinished">Ataka baliogabea zehaztu da %s-n: '%s'</translation>
+    </message>
+    <message>
+        <source>Listening for incoming connections failed (listen returned error %s)</source>
+        <translation type="unfinished">Sarrerako konexioak entzuteko huts egin du (listen funtzioak %s errorea itzuli du)</translation>
+    </message>
+    <message>
+        <source>Loading P2P addresses…</source>
+        <translation type="unfinished">P2P helbideak kargatzen…</translation>
+    </message>
+    <message>
+        <source>Loading banlist…</source>
+        <translation type="unfinished">Debeku zerrenda kargatzen…</translation>
+    </message>
+    <message>
+        <source>Loading block index…</source>
+        <translation type="unfinished">Bloke-indizea kargatzen…</translation>
+    </message>
+    <message>
+        <source>Loading wallet…</source>
+        <translation type="unfinished">Zorroa kargatzen...</translation>
+    </message>
+    <message>
+        <source>Maximum transaction weight must be between %d and %d</source>
+        <translation type="unfinished">Transakzioaren gehieneko pisua %d eta %d artekoa izan behar da.</translation>
+    </message>
+    <message>
+        <source>Missing amount</source>
+        <translation type="unfinished">Zenbatekoa falta da</translation>
+    </message>
+    <message>
+        <source>Missing solving data for estimating transaction size</source>
+        <translation type="unfinished">Transakzioaren tamaina estimatzeko beharrezko ebazpen-datuak falta dira.</translation>
+    </message>
+    <message>
+        <source>Need to specify a port with -whitebind: '%s'</source>
+        <translation type="unfinished">Ataka zehaztu behar da -whitebind aukerarekin: '%s'</translation>
+    </message>
+    <message>
+        <source>No addresses available</source>
+        <translation type="unfinished">Ez dago helbiderik eskuragarri</translation>
+    </message>
+    <message>
+        <source>Not found pre-selected input %s</source>
+        <translation type="unfinished">Ez da aurrez hautatutako sarrera aurkitu %s</translation>
+    </message>
+    <message>
+        <source>Not solvable pre-selected input %s</source>
+        <translation type="unfinished">Ezin da ebatzi aurrez hautatutako %s sarrera</translation>
+    </message>
+    <message>
+        <source>Only direction was set, no permissions: '%s'</source>
+        <translation type="unfinished">Norabidea soilik ezarri da, baimenik gabe: '%s'</translation>
+    </message>
+    <message>
+        <source>Option '-limitancestorsize' is given but ancestor size limits have been replaced with cluster size limits (see -limitclustersize). This option has no effect.</source>
+        <translation type="unfinished">'-limitancestorsize' aukera eman da, baina arbasoen tamainaren muga ordezkatu egin da multzoen tamainaren mugarekin (ikusi -limitclustersize). Aukera honek ez du eraginik.</translation>
+    </message>
+    <message>
+        <source>Option '-limitdescendantsize' is given but descendant size limits have been replaced with cluster size limits (see -limitclustersize). This option has no effect.</source>
+        <translation type="unfinished">'-limitdescendantsize' aukera eman da, baina ondorengoen tamainaren muga ordezkatu egin da multzoen tamainaren mugarekin (ikusi -limitclustersize). Aukera honek ez du eraginik.</translation>
+    </message>
+    <message>
+        <source>Private broadcast of own transactions requested (-privatebroadcast) and -proxyrandomize is disabled. Tor circuits for private broadcast connections may be correlated to other connections over Tor. For maximum privacy set -proxyrandomize=1.</source>
+        <translation type="unfinished">Norberaren transakzioen emisio pribatua eskatu da (-privatebroadcast) eta -proxyrandomize desgaituta dago. Emisio pribaturako Tor zirkuituak beste Tor konexio batzuekin erlazionatu daitezke. Pribatutasun handiena lortzeko, ezarri -proxyrandomize=1.</translation>
+    </message>
+    <message>
+        <source>Private broadcast of own transactions requested (-privatebroadcast), but -connect is also configured. They are incompatible because the private broadcast needs to open new connections to randomly chosen Tor or I2P peers. Consider using -maxconnections=0 -addnode=... instead</source>
+        <translation type="unfinished">Norberaren transakzioen emisio pribatua eskatu da (-privatebroadcast), baina -connect ere konfiguratuta dago. Bi aukera horiek bateraezinak dira, emisio pribatuak ausaz hautatutako Tor edo I2P pareekin konexio berriak ireki behar dituelako. Horren ordez, erabili -maxconnections=0 -addnode=...</translation>
+    </message>
+    <message>
+        <source>Private broadcast of own transactions requested (-privatebroadcast), but none of Tor or I2P networks is reachable</source>
+        <translation type="unfinished">Norberaren transakzioen emisio pribatua eskatu da (-privatebroadcast), baina ez da ez Tor ez I2P sareetara konektatzerik lortu.</translation>
+    </message>
+    <message>
+        <source>Prune cannot be configured with a negative value.</source>
+        <translation type="unfinished">Moztu ez da konfiguratu daiteke balio negatibo batekin.</translation>
+    </message>
+    <message>
+        <source>Prune mode is incompatible with -txindex.</source>
+        <translation type="unfinished">Moztu modua -txindexekin bateragarria ez da.</translation>
+    </message>
+    <message>
+        <source>Pruning blockstore…</source>
+        <translation type="unfinished">Bloke biltegia mozten…</translation>
+    </message>
+    <message>
+        <source>Reducing -maxconnections from %d to %d, because of system limitations.</source>
+        <translation type="unfinished">-maxconnections %degingarren %dra murrizten, sistema-mugak direla eta.</translation>
+    </message>
+    <message>
+        <source>Replaying blocks…</source>
+        <translation type="unfinished">Blokeak errepikatzen...</translation>
+    </message>
+    <message>
+        <source>Rescanning…</source>
         <translation type="unfinished">Bereskaneatzen...</translation>
     </message>
+    <message>
+        <source>SQLiteDatabase: Failed to execute statement to verify database: %s</source>
+        <translation type="unfinished">SQLiteDatabase: Huts egin du datu-basea egiaztatzeko adierazpena exekutatzean:%s</translation>
+    </message>
+    <message>
+        <source>SQLiteDatabase: Failed to prepare statement to verify database: %s</source>
+        <translation type="unfinished">SQLiteDatabase: Huts egin du datu-basea egiaztatzeko adierazpena prestatzean:%s</translation>
+    </message>
+    <message>
+        <source>SQLiteDatabase: Failed to read database verification error: %s</source>
+        <translation type="unfinished">SQLiteDatabase: Ezin izan da datu-basearen egiaztatze errorea irakurri: %s</translation>
+    </message>
+    <message>
+        <source>SQLiteDatabase: Unexpected application id. Expected %u, got %u</source>
+        <translation type="unfinished">SQLiteDatabase: Aplikazio ID ustekabea. Espero zena:%u , lortutakoa:%u</translation>
+    </message>
+    <message>
+        <source>Section [%s] is not recognized.</source>
+        <translation type="unfinished">Atala [%s] ez da ezagutzen.</translation>
+    </message>
+    <message>
+        <source>Signer did not echo address</source>
+        <translation type="unfinished">Sinatzaileak ez du helbidea berretsi</translation>
+    </message>
+    <message>
+        <source>Signer echoed unexpected address %s</source>
+        <translation type="unfinished">Sinatzaileak ustekabeko helbidea errepikatu du%s</translation>
+    </message>
+    <message>
+        <source>Signer returned error: %s</source>
+        <translation type="unfinished">Sinatzaileak errorea itzuli du:%s</translation>
+    </message>
+    <message>
+        <source>Signing transaction failed</source>
+        <translation type="unfinished">Transakzioa sinatzea huts egin du</translation>
+    </message>
+    <message>
+        <source>Specified -walletdir "%s" does not exist</source>
+        <translation type="unfinished">Zehaztutako -walletdir "%s" direktoriua ez da existitzen.</translation>
+    </message>
+    <message>
+        <source>Specified -walletdir "%s" is a relative path</source>
+        <translation type="unfinished">Zehaztutako -walletdir "%s" bide erlatiboa da</translation>
+    </message>
+    <message>
+        <source>Specified -walletdir "%s" is not a directory</source>
+        <translation type="unfinished">Zehaztutako -walletdir "%s" ez da direktorio bat</translation>
+    </message>
+    <message>
+        <source>Specified blocks directory "%s" does not exist.</source>
+        <translation type="unfinished">Zehaztutako bloke direktorioa "%s" ez da existitzen.</translation>
+    </message>
+    <message>
+        <source>Specified data directory "%s" does not exist.</source>
+        <translation type="unfinished">Zehaztutako datu direktorioa "%s" ez da existitzen.</translation>
+    </message>
     <message>
         <source>Starting network threads…</source>
         <translation type="unfinished">Sareko hariak abiarazten...</translation>
     </message>
+    <message>
+        <source>System error while flushing: %s</source>
+        <translation type="unfinished">Sistemaren errorea garbitzean:%s</translation>
+    </message>
+    <message>
+        <source>System error while loading external block file: %s</source>
+        <translation type="unfinished">Sistemaren errorea kanpoko bloke fitxategia kargatzean:%s</translation>
+    </message>
+    <message>
+        <source>System error while saving block to disk: %s</source>
+        <translation type="unfinished">Sistemaren errorea blokea diskoan gordetzean:%s</translation>
+    </message>
+    <message>
+        <source>The %s path uses exFAT, which is known to have intermittent corruption problems on macOS. Move this directory to a different filesystem to avoid data loss.</source>
+        <translation type="unfinished">%s bideak exFAT sistema fitxategia erabiltzen du, eta horrek ustekabeko hondatze-arazoak izaten ditu maiz macOS sistemetan. Datu-galerarik saihesteko, eraman direktorio hau beste fitxategi-sistema batera.</translation>
+    </message>
     <message>
         <source>The source code is available from %s.</source>
         <translation type="unfinished">Iturri kodea %s-tik dago eskuragarri.</translation>
     </message>
+    <message>
+        <source>The specified config file %s does not exist</source>
+        <translation type="unfinished">Zehaztutako konfigurazio %sfitxategia ez da existitzen</translation>
+    </message>
     <message>
         <source>The transaction amount is too small to pay the fee</source>
         <translation type="unfinished">Transakzio kantitatea txikiegia da kuota ordaintzeko.</translation>
     </message>
+    <message>
+        <source>The transactions removal process can only be executed within a db txn</source>
+        <translation type="unfinished">Transakzioak kentzeko prozesua soilik datu-baseko transakzio (db txn) baten barruan exekutatu daiteke.</translation>
+    </message>
+    <message>
+        <source>The wallet will avoid paying less than the minimum relay fee.</source>
+        <translation type="unfinished">Zorroak saihestuko du gutxieneko transmisio-tasatik beherako ordainketa egitea</translation>
+    </message>
+    <message>
+        <source>There is no ScriptPubKeyManager for this address</source>
+        <translation type="unfinished">Helbide honentzako ScriptPubKeyManagerrik ez dago</translation>
+    </message>
     <message>
         <source>This is experimental software.</source>
         <translation type="unfinished">Hau software esperimentala da</translation>
     </message>
+    <message>
+        <source>This is the minimum transaction fee you pay on every transaction.</source>
+        <translation type="unfinished">Hau da transakzio bakoitzean ordaintzen duzun gutxieneko transakzio-tasa</translation>
+    </message>
+    <message>
+        <source>Transaction %s does not belong to this wallet</source>
+        <translation type="unfinished">%s transakzioa ez dagokio zorro honi</translation>
+    </message>
     <message>
         <source>Transaction amount too small</source>
         <translation type="unfinished">transakzio kopurua txikiegia</translation>
     </message>
+    <message>
+        <source>Transaction amounts must not be negative</source>
+        <translation type="unfinished">Transakzioko kopuruak ez dira negatiboak izan behar.</translation>
+    </message>
+    <message>
+        <source>Transaction change output index out of range</source>
+        <translation type="unfinished">Transakzioaren aldaketa irteeraren indizea esparrutik kanpo dago</translation>
+    </message>
+    <message>
+        <source>Transaction must have at least one recipient</source>
+        <translation type="unfinished">Transakzioak gutxienez hartzaile bat izan behar du.</translation>
+    </message>
+    <message>
+        <source>Transaction needs a change address, but we can't generate it.</source>
+        <translation type="unfinished">Transakzioak helbide aldaketa behar du, baina ezin dugu sortu.</translation>
+    </message>
     <message>
         <source>Transaction too large</source>
         <translation type="unfinished">Transakzio luzeegia</translation>
     </message>
+    <message>
+        <source>Unable to bind to %s on this computer (bind returned error %s)</source>
+        <translation type="unfinished">Ezin da %s helbidera lotu ordenagailu honetan (bind-ek %s errorea itzuli du)</translation>
+    </message>
+    <message>
+        <source>Unable to bind to %s on this computer. %s is probably already running.</source>
+        <translation type="unfinished">Ezin da lotu %sordenagailu honetan. %sziurrenik martxan dago.</translation>
+    </message>
+    <message>
+        <source>Unable to create the PID file '%s': %s</source>
+        <translation type="unfinished">Ezin da PID fitxategia sortu '%s':%s</translation>
+    </message>
+    <message>
+        <source>Unable to find UTXO for external input</source>
+        <translation type="unfinished">Ezin da kanpoko sarrerako UTXOa aurkitu</translation>
+    </message>
+    <message>
+        <source>Unable to open %s for writing</source>
+        <translation type="unfinished">Ezin da ireki %sidazteko</translation>
+    </message>
+    <message>
+        <source>Unable to parse -maxuploadtarget: '%s'</source>
+        <translation type="unfinished">Ezin da analizatu -maxuploadtarget: '%s'</translation>
+    </message>
+    <message>
+        <source>Unable to start HTTP server. See debug log for details.</source>
+        <translation type="unfinished">HTTP zerbitzaria abiarazi ezin izan da. Xehetasunetarako, begiratu arazketa loga.</translation>
+    </message>
+    <message>
+        <source>Unknown -blockfilterindex value %s.</source>
+        <translation type="unfinished">-blockfilterindex balio %s ezezaguna .</translation>
+    </message>
+    <message>
+        <source>Unknown address type '%s'</source>
+        <translation type="unfinished">Helbide mota ezezaguna '%s'</translation>
+    </message>
+    <message>
+        <source>Unknown change type '%s'</source>
+        <translation type="unfinished">Aldaketa mota ezezaguna '%s'</translation>
+    </message>
+    <message>
+        <source>Unknown network specified in -onlynet: '%s'</source>
+        <translation type="unfinished">Sare ezezaguna zehaztuta -onlynet-en: '%s'</translation>
+    </message>
+    <message>
+        <source>Unknown new rules activated (versionbit %i)</source>
+        <translation type="unfinished">Arau berri ezezagunak aktibatu dira (versionbit%i )</translation>
+    </message>
+    <message>
+        <source>Unrecognised option "%s" provided in -test=&lt;option&gt;.</source>
+        <translation type="unfinished">Aukerak hautazko balioa "%s"  -test=&lt;option&gt; eremuan zehaztu behar da.</translation>
+    </message>
+    <message>
+        <source>Unsupported global logging level %s=%s. Valid values: %s.</source>
+        <translation type="unfinished">Ez da onartzen erabilitako erregistro maila orokorra %s =%s. Balio egokiak: %s.</translation>
+    </message>
+    <message>
+        <source>Wallet file creation failed: %s</source>
+        <translation type="unfinished">Zorro fitxategia sortzeak huts egin du:%s</translation>
+    </message>
+    <message>
+        <source>Warning: Found invalid chain more than 6 blocks longer than our best chain. This could be due to database corruption or consensus incompatibility with peers.</source>
+        <translation type="unfinished">Abisua: gure kate onenak baino 6 bloke baino gehiago luzeagoa den kate baliogabe bat aurkitu da. Horrek datu-basearen hondatzea edo parekoekin bateragarritasunik eza adieraz dezake.</translation>
+    </message>
+    <message>
+        <source>acceptstalefeeestimates is not supported on %s chain.</source>
+        <translation type="unfinished">acceptstalefeeestimates ez da onartzen%s katean.</translation>
+    </message>
+    <message>
+        <source>Unsupported logging category %s=%s.</source>
+        <translation type="unfinished">Onartzen ez den erregistro kategoria%s =%s.</translation>
+    </message>
+    <message>
+        <source>Error loading %s: Wallet is a legacy wallet. Please migrate to a descriptor wallet using the migration tool (migratewallet RPC).</source>
+        <translation type="unfinished">Errorea %s kargatzean: zorroa jatorrizko (legacy) zorro bat da. Mesedez, migratu deskribatzaile-zorro batera migrazio-tresna erabiliz (migratewallet RPC).</translation>
+    </message>
+    <message>
+        <source>Error: Dumpfile specifies an unsupported database format (%s). Only sqlite database dumps are supported</source>
+        <translation type="unfinished">Errorea: Dumpfile-k onartzen ez den datu-base formatua (%s) zehazten du. SQLite datu-base dump-ak baino ez dira onartzen</translation>
+    </message>
+    <message>
+        <source>Failed to calculate bump fees, because unconfirmed UTXOs depend on an enormous cluster of unconfirmed transactions.</source>
+        <translation type="unfinished">Huts egin du komisioaren igoera kalkulatzean, baieztatu gabeko UTXOak baieztatu gabeko transakzioen multzo erraldoi batean oinarritzen direlako.</translation>
+    </message>
+    <message>
+        <source>Transaction requires one destination of non-zero value, a non-zero feerate, or a pre-selected input</source>
+        <translation type="unfinished">Transakzioak gutxienez baldintza hauetako bat bete behar du: helmuga batek balio zero ez izatea, komisio-tasa (feerate) zero ez izatea, edo sarrera bat aurrez hautatuta egotea.</translation>
+    </message>
+    <message>
+        <source>Unrecognized descriptor found. Loading wallet %s
+
+The wallet might have been created on a newer version.
+Please try running the latest software version.
+</source>
+        <translation type="unfinished">Deskribatzaile ezezaguna aurkitu da. %s zorroa kargatzen.
+
+Baliteke zorroa bertsio berriago batean sortua izatea.
+Mesedez, saiatu softwarearen azken bertsioa exekutatzen.
+</translation>
+    </message>
+    <message>
+        <source>Do you want to rebuild the databases now?</source>
+        <translation type="unfinished">Datu-baseak berreraiki nahi dituzu orain?</translation>
+    </message>
+    <message>
+        <source>Error: Could not add watchonly tx %s to watchonly wallet</source>
+        <translation type="unfinished">Errorea: Ezin izan da ikuspegi-soileko %s transakzioa gehitu ikuspegi-soileko zorroan.</translation>
+    </message>
+    <message>
+        <source>Error: Could not delete watchonly transactions. </source>
+        <translation type="unfinished">Errorea: ezin izan dira begiratze-soileko transakzioak ezabatu.</translation>
+    </message>
+    <message>
+        <source>Error: Wallet does not exist</source>
+        <translation type="unfinished">Errorea: zorroa ez da existitzen.</translation>
+    </message>
+    <message>
+        <source>Error: cannot remove legacy wallet records</source>
+        <translation type="unfinished">Errorea: ezin dira ondarezko zorroaren erregistroak ezabatu.</translation>
+    </message>
+    <message>
+        <source>Failed to start indexes, shutting down…</source>
+        <translation type="unfinished">Indizeak abiaraztea huts egin du, itzaltzen…</translation>
+    </message>
+    <message>
+        <source>Invalid -proxy address or hostname, ends with '=': '%s'</source>
+        <translation type="unfinished">Baliogabeko -proxy helbidea edo ostalari-izena, '=' ikurrarekin amaitzen da: '%s'</translation>
+    </message>
+    <message>
+        <source>Not enough file descriptors available. %d available, %d required.</source>
+        <translation type="unfinished">Ez dago nahikoa fitxategi-deskribatzailerik. %deskuragarri, %dbeharrezkoak.</translation>
+    </message>
+    <message>
+        <source>Unrecognized network in -proxy='%s': '%s'</source>
+        <translation type="unfinished">Sare ezezaguna -proxy='%s' parametroan: '%s'</translation>
+    </message>
+    <message>
+        <source>User Agent comment (%s) contains unsafe characters.</source>
+        <translation type="unfinished">Erabiltzaile-agentearen iruzkinak (%s) karaktere arriskutsuak ditu.</translation>
+    </message>
     <message>
         <source>Verifying blocks…</source>
         <translation type="unfinished">Blokeak egiaztatzen...</translation>
     </message>
     <message>
         <source>Verifying wallet(s)…</source>
-        <translation type="unfinished">Diruzorroak egiaztatzen...</translation>
+        <translation type="unfinished">Zorroak egiaztatzen...</translation>
+    </message>
+    <message>
+        <source>Wallet needed to be rewritten: restart %s to complete</source>
+        <translation type="unfinished">Zorroa berridatzi behar izan da: %sberrabiarazi osatzeko</translation>
+    </message>
+    <message>
+        <source>Settings file could not be read</source>
+        <translation type="unfinished">Ezarpenen fitxategia ezin izan da irakurri</translation>
+    </message>
+    <message>
+        <source>Settings file could not be written</source>
+        <translation type="unfinished">Ezarpenen fitxategia ezin izan da idatzi</translation>
     </message>
-    </context>
+</context>
 </TS>
\ No newline at end of file
diff --git a/src/qt/locale/bitcoin_fa.ts b/src/qt/locale/bitcoin_fa.ts
index aee8b17d27f7..5004cd13ef3e 100644
--- a/src/qt/locale/bitcoin_fa.ts
+++ b/src/qt/locale/bitcoin_fa.ts
@@ -13,6 +13,10 @@
         <source>&amp;New</source>
         <translation type="unfinished">&amp;جدید</translation>
     </message>
+    <message>
+        <source>Copy the currently selected address to the clipboard</source>
+        <translation type="unfinished">آدرس انتخاب شده کنونی را در حافظه رونوشت کن</translation>
+    </message>
     <message>
         <source>Export the data in the current tab to a file</source>
         <translation type="unfinished">داده های موجود در برگه فعلی را به یک فایل صادر کنید</translation>
@@ -25,10 +29,6 @@
         <source>&amp;Delete</source>
         <translation type="unfinished">&amp;حذف</translation>
     </message>
-    <message>
-        <source>Choose the address to send coins to</source>
-        <translation type="unfinished">آدرسی را برای ارسال سکه‌ها انتخاب کنید</translation>
-    </message>
     <message>
         <source>Choose the address to receive coins with</source>
         <translation type="unfinished">آدرسی را برای دریافت سکه‌ها انتخاب کنید</translation>
@@ -66,7 +66,7 @@ Signing is only possible with addresses of the type 'legacy'.</source>
     <message>
         <source>Comma separated file</source>
         <extracomment>Expanded name of the CSV file format. See: https://en.wikipedia.org/wiki/Comma-separated_values.</extracomment>
-        <translation type="unfinished">فایل جدا شده با کاما</translation>
+        <translation type="unfinished">فایل جدا شده با ویرگول</translation>
     </message>
     </context>
 <context>
@@ -102,10 +102,6 @@ Signing is only possible with addresses of the type 'legacy'.</source>
         <source>Custom…</source>
         <translation type="unfinished">سفارشی...</translation>
     </message>
-    <message>
-        <source>Amount</source>
-        <translation type="unfinished">میزان وجه:</translation>
-    </message>
     <message>
         <source>Enter a Bitcoin address (e.g. %1)</source>
         <translation type="unfinished">آدرس بیت کوین را وارد کنید (به طور مثال %1)</translation>
@@ -155,7 +151,7 @@ Signing is only possible with addresses of the type 'legacy'.</source>
     </message>
     <message>
         <source>%1 m</source>
-        <translation type="unfinished">%1 دقیقه قبل</translation>
+        <translation type="unfinished">£%1 گیگابایت</translation>
     </message>
     <message>
         <source>%1 s</source>
@@ -165,10 +161,6 @@ Signing is only possible with addresses of the type 'legacy'.</source>
         <source>None</source>
         <translation type="unfinished">هیچ کدام</translation>
     </message>
-    <message>
-        <source>N/A</source>
-        <translation type="unfinished">موجود نیست</translation>
-    </message>
     <message>
         <source>%1 ms</source>
         <translation type="unfinished">%1 میلی ثانیه</translation>
@@ -410,6 +402,14 @@ Signing is only possible with addresses of the type 'legacy'.</source>
         <source>Processing blocks on disk…</source>
         <translation type="unfinished">در حال پردازش بلوکها روی دیسک..</translation>
     </message>
+    <message>
+        <source>Connecting to peers…</source>
+        <translation type="unfinished">در حال اتصال به همتاهای شبکه(پیِر ها)...</translation>
+    </message>
+    <message>
+        <source>Request payments (generates QR codes and bitcoin: URIs)</source>
+        <translation type="unfinished">درخواست پرداخت (ساخت کد QR و بیت‌کوین: URIs)</translation>
+    </message>
     <message>
         <source>Show the list of used sending addresses and labels</source>
         <translation type="unfinished">نمایش لیست آدرس‌ها و لیبل‌های ارسالی استفاده شده</translation>
@@ -503,10 +503,6 @@ Signing is only possible with addresses of the type 'legacy'.</source>
         <extracomment>Name of the menu item that restores wallet from a backup file.</extracomment>
         <translation type="unfinished">بازیابی کیف پول…</translation>
     </message>
-    <message>
-        <source>Close all wallets</source>
-        <translation type="unfinished">همه‌ی کیف پول‌ها را ببند</translation>
-    </message>
     <message>
         <source>Show the %1 help message to get a list with possible Bitcoin command-line options</source>
         <translation type="unfinished">برای دریافت لیستی از گزینه های خط فرمان بیت کوین ، پیام راهنمایی %1 را نشان دهید</translation>
@@ -525,6 +521,11 @@ Signing is only possible with addresses of the type 'legacy'.</source>
         <extracomment>The title for Restore Wallet File Windows</extracomment>
         <translation type="unfinished">بارگیری پشتیبان‌گیری کیف پول</translation>
     </message>
+    <message>
+        <source>Restore Wallet</source>
+        <extracomment>Title of pop-up window shown when the user is attempting to restore a wallet.</extracomment>
+        <translation type="unfinished">بازیابی کیف پول</translation>
+    </message>
     <message>
         <source>Wallet Name</source>
         <extracomment>Label of the input field where the name of the wallet is entered.</extracomment>
@@ -585,17 +586,67 @@ Signing is only possible with addresses of the type 'legacy'.</source>
         <source>Error: %1</source>
         <translation type="unfinished">خطا: %1</translation>
     </message>
+    <message>
+        <source>Date: %1
+</source>
+        <translation type="unfinished">تاریخ: %1
+</translation>
+    </message>
+    <message>
+        <source>Amount: %1
+</source>
+        <translation type="unfinished">مبلغ: %1
+</translation>
+    </message>
+    <message>
+        <source>Wallet: %1
+</source>
+        <translation type="unfinished">کیف پول: %1
+</translation>
+    </message>
+    <message>
+        <source>Type: %1
+</source>
+        <translation type="unfinished">نوع: %1
+</translation>
+    </message>
+    <message>
+        <source>Label: %1
+</source>
+        <translation type="unfinished">برچسب: %1
+</translation>
+    </message>
+    <message>
+        <source>Address: %1
+</source>
+        <translation type="unfinished">آدرس: %1
+</translation>
+    </message>
+    <message>
+        <source>Sent transaction</source>
+        <translation type="unfinished">تراکنش ارسالی</translation>
+    </message>
+    <message>
+        <source>Incoming transaction</source>
+        <translation type="unfinished">تراکنش دریافتی</translation>
+    </message>
     <message>
         <source>Private key &lt;b&gt;disabled&lt;/b&gt;</source>
         <translation type="unfinished">کلید خصوصی &lt;b&gt;غیر فعال &lt;/b&gt;</translation>
     </message>
+    <message>
+        <source>Wallet is &lt;b&gt;encrypted&lt;/b&gt; and currently &lt;b&gt;unlocked&lt;/b&gt;</source>
+        <translation type="unfinished">کیف پول است &lt;b&gt; رمزگذاری شده &lt;/b&gt; و در حال حاضر &lt;b&gt; تفسیر شده است &lt;/b&gt;
+ </translation>
+    </message>
+    <message>
+        <source>Wallet is &lt;b&gt;encrypted&lt;/b&gt; and currently &lt;b&gt;locked&lt;/b&gt;</source>
+        <translation type="unfinished">کیف پول است &lt;b&gt; رمزگذاری شده &lt;/b&gt; و در حال حاضر &lt;b&gt; تفسیر شده &lt;/b&gt;
+ </translation>
+    </message>
     </context>
 <context>
     <name>CoinControlDialog</name>
-    <message>
-        <source>After Fee:</source>
-        <translation type="unfinished">بعد از احتساب کارمزد</translation>
-    </message>
     <message>
         <source>Change:</source>
         <translation type="unfinished">تغییر</translation>
@@ -758,6 +809,57 @@ Signing is only possible with addresses of the type 'legacy'.</source>
         <translation type="unfinished">تدوین شده بدون حمایت از امضای خارجی (نیازمند امضای خارجی)</translation>
     </message>
 </context>
+<context>
+    <name>EditAddressDialog</name>
+    <message>
+        <source>Edit Address</source>
+        <translation type="unfinished">ویرایش آدرس</translation>
+    </message>
+    <message>
+        <source>&amp;Label</source>
+        <translation type="unfinished">برچسب</translation>
+    </message>
+    <message>
+        <source>The label associated with this address list entry</source>
+        <translation type="unfinished">برچسب مرتبط با لیست آدرس ورودی</translation>
+    </message>
+    <message>
+        <source>The address associated with this address list entry. This can only be modified for sending addresses.</source>
+        <translation type="unfinished">برچسب مرتبط با لیست آدرس ورودی می باشد. این می تواند فقط  برای آدرس های ارسالی اصلاح شود.</translation>
+    </message>
+    <message>
+        <source>&amp;Address</source>
+        <translation type="unfinished">آدرس</translation>
+    </message>
+    <message>
+        <source>New sending address</source>
+        <translation type="unfinished">آدرس ارسالی جدید</translation>
+    </message>
+    <message>
+        <source>Edit receiving address</source>
+        <translation type="unfinished">ویرایش آدرس دریافتی</translation>
+    </message>
+    <message>
+        <source>Edit sending address</source>
+        <translation type="unfinished">ویرایش آدرس ارسالی</translation>
+    </message>
+    <message>
+        <source>The entered address "%1" is not a valid Bitcoin address.</source>
+        <translation type="unfinished">آدرس وارد شده "%1" آدرس معتبر بیت کوین نیست.</translation>
+    </message>
+    <message>
+        <source>The entered address "%1" is already in the address book with label "%2".</source>
+        <translation type="unfinished">آدرس وارد شده "%1" در حال حاظر در دفترچه آدرس ها موجود است با برچسب "%2" .</translation>
+    </message>
+    <message>
+        <source>Could not unlock wallet.</source>
+        <translation type="unfinished">نمیتوان کیف پول را باز کرد.</translation>
+    </message>
+    <message>
+        <source>New key generation failed.</source>
+        <translation type="unfinished">تولید کلید جدید به خطا انجامید.</translation>
+    </message>
+</context>
 <context>
     <name>Intro</name>
     <message numerus="yes">
@@ -785,11 +887,7 @@ Signing is only possible with addresses of the type 'legacy'.</source>
             <numerusform>(sufficient to restore backups %n day(s) old)</numerusform>
         </translation>
     </message>
-    <message>
-        <source>Error</source>
-        <translation type="unfinished">خطا</translation>
-    </message>
-</context>
+    </context>
 <context>
     <name>ModalOverlay</name>
     <message>
@@ -1148,6 +1246,12 @@ Signing is only possible with addresses of the type 'legacy'.</source>
         <source>Cannot sign inputs while wallet is locked.</source>
         <translation type="unfinished">وقتی کیف پول قفل است، نمی توان ورودی ها را امضا کرد.</translation>
     </message>
+    <message numerus="yes">
+        <source>Signed %n input(s), but more signatures are still required.</source>
+        <translation type="unfinished">
+            <numerusform />
+        </translation>
+    </message>
     <message>
         <source>Unknown error processing transaction.</source>
         <translation type="unfinished">مشکل نامشخصی در پردازش عملیات رخ داده.</translation>
@@ -1177,9 +1281,11 @@ Signing is only possible with addresses of the type 'legacy'.</source>
         <source>or</source>
         <translation type="unfinished">یا</translation>
     </message>
-    <message>
-        <source>Transaction has %1 unsigned inputs.</source>
-        <translation type="unfinished">%1Transaction has  unsigned inputs.</translation>
+    <message numerus="yes">
+        <source>Transaction has %n unsigned input(s).</source>
+        <translation type="unfinished">
+            <numerusform />
+        </translation>
     </message>
     <message>
         <source>Transaction still needs signature(s).</source>
@@ -1194,6 +1300,10 @@ Signing is only possible with addresses of the type 'legacy'.</source>
         <translation type="unfinished">(اما این کیف پول نمی تواند معاملات را امضا کند.)
  </translation>
     </message>
+    <message>
+        <source>(But this wallet does not have the right keys.)</source>
+        <translation type="unfinished">(اما این کیف پول کلید درست را ندارد.)</translation>
+    </message>
     <message>
         <source>Transaction status is unknown.</source>
         <translation type="unfinished">وضعیت عملیات نامشخص است.</translation>
@@ -1265,7 +1375,7 @@ If you are receiving this error you should request the merchant provide a BIP21
     <message>
         <source>Address</source>
         <extracomment>Title of Peers Table column which contains the IP/Onion/I2P address of the connected peer.</extracomment>
-        <translation type="unfinished">آدرس</translation>
+        <translation type="unfinished">نشانی</translation>
     </message>
     <message>
         <source>Type</source>
@@ -1280,10 +1390,6 @@ If you are receiving this error you should request the merchant provide a BIP21
     </context>
 <context>
     <name>RPCConsole</name>
-    <message>
-        <source>Network</source>
-        <translation type="unfinished">شبکه</translation>
-    </message>
     <message>
         <source>Local Addresses</source>
         <translation type="unfinished">آدرس‌های محلی</translation>
@@ -1312,10 +1418,6 @@ If you are receiving this error you should request the merchant provide a BIP21
         <source>Last Transaction</source>
         <translation type="unfinished">اخرین تراکنش</translation>
     </message>
-    <message>
-        <source>User Agent</source>
-        <translation type="unfinished">نماینده کاربر</translation>
-    </message>
     <message>
         <source>Node window</source>
         <translation type="unfinished">پنجره گره</translation>
@@ -1355,6 +1457,10 @@ If you are receiving this error you should request the merchant provide a BIP21
     </context>
 <context>
     <name>ReceiveCoinsDialog</name>
+    <message>
+        <source>Copy &amp;label</source>
+        <translation type="unfinished">تکثیر برچسب</translation>
+    </message>
     <message>
         <source>Copy &amp;amount</source>
         <translation type="unfinished">روگرفت م&amp;قدار</translation>
@@ -1385,13 +1491,17 @@ If you are receiving this error you should request the merchant provide a BIP21
         <translation type="unfinished">کپی مقدار</translation>
     </message>
     <message>
-        <source>Copy amount</source>
-        <translation type="unfinished">کپی مقدار</translation>
+        <source>Copy fee</source>
+        <translation type="unfinished">کپی هزینه</translation>
     </message>
     <message>
         <source>Copy after fee</source>
         <translation type="unfinished">کپی کردن بعد از احتساب کارمزد</translation>
     </message>
+    <message>
+        <source>Copy bytes</source>
+        <translation type="unfinished">کپی کردن بایت ها</translation>
+    </message>
     <message>
         <source>Copy change</source>
         <translation type="unfinished">کپی کردن تغییر</translation>
@@ -1434,6 +1544,10 @@ If you are receiving this error you should request the merchant provide a BIP21
         <source>You can sign messages/agreements with your legacy (P2PKH) 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.</source>
         <translation type="unfinished">می‌توانید پیام‌ها/توافق‌نامه‌هایی را با آدرس‌های قدیمی خود (P2PKH) امضا کنید تا ثابت کنید که می‌توانید بیت‌کوین‌های ارسال شده برای آنها را دریافت کنید. مراقب باشید هیچ چیز مبهم یا تصادفی را امضا نکنید، زیرا حملات فیشینگ ممکن است سعی کنند شما را فریب دهند تا با هویت خود آنها را امضا کنید. فقط اظهارات کاملاً مفصلی را که قابل قبول هستند را امضا کنید.</translation>
     </message>
+    <message>
+        <source>Copy the current signature to the clipboard</source>
+        <translation type="unfinished">امضا کنونی را در حافظه رونوشت کن</translation>
+    </message>
     <message>
         <source>The entered address does not refer to a legacy (P2PKH) key. Message signing for SegWit and other non-P2PKH address types is not supported in this version of %1. Please check the address and try again.</source>
         <translation type="unfinished">آدرسی که وارد شده است به کلید قدیمی (P2PKH) اشاره نمی‌کند. امضای پیام برای آدرس‌های SegWit و سایر آدرس‌های غیر P2PKH در این نسخه %1 پشتیبانی نمی‌شود. لطفاً آدرس را بررسی کرده و دوباره امتحان کنید.</translation>
@@ -1470,29 +1584,8 @@ If you are receiving this error you should request the merchant provide a BIP21
 <context>
     <name>TransactionView</name>
     <message>
-        <source>Copy &amp;amount</source>
-        <translation type="unfinished">روگرفت م&amp;قدار</translation>
-    </message>
-    <message>
-        <source>Comma separated file</source>
-        <extracomment>Expanded name of the CSV file format. See: https://en.wikipedia.org/wiki/Comma-separated_values.</extracomment>
-        <translation type="unfinished">فایل جدا شده با کاما</translation>
-    </message>
-    <message>
-        <source>Type</source>
-        <translation type="unfinished">نوع</translation>
-    </message>
-    </context>
-<context>
-    <name>WalletFrame</name>
-    <message>
-        <source>Create a new wallet</source>
-        <translation type="unfinished">کیف پول جدیدی ایجاد کنید
- </translation>
-    </message>
-    <message>
-        <source>Error</source>
-        <translation type="unfinished">خطا</translation>
+        <source>Address</source>
+        <translation type="unfinished">نشانی</translation>
     </message>
     </context>
 <context>
@@ -1528,6 +1621,10 @@ If you are receiving this error you should request the merchant provide a BIP21
 </context>
 <context>
     <name>bitcoin-core</name>
+    <message>
+        <source>%s request to listen on port %u. This port is considered "bad" and thus it is unlikely that any peer will connect to it. See doc/p2p-bad-ports.md for details and a full list.</source>
+        <translation type="unfinished">%sدرخواست گوش دادن به پورت %u. این پورت به عنوان پورت "بد" در نظر  گرفته شده بنابراین بعید است که یک همتا به آن متصل شود. برای مشاهده جزییات و دیدن فهرست کامل فایل doc/p2p-bad-ports.md را مشاهده کنید.</translation>
+    </message>
     <message>
         <source>Error starting/committing db txn for wallet transactions removal process</source>
         <translation type="unfinished">خطا در شروع یا انجام تراکنش پایگاه داده برای فرآیند حذف تراکنش‌های کیف پول</translation>
@@ -1562,6 +1659,14 @@ If you are receiving this error you should request the merchant provide a BIP21
         <source>Maximum transaction weight is too low, can not accommodate change output</source>
         <translation type="unfinished">حداکثر وزن تراکنش بسیار کم است، امکان افزودن خروجی تغییر (change output) وجود ندارد</translation>
     </message>
+    <message>
+        <source>Option '-checkpoints' is set but checkpoints were removed. This option has no effect.</source>
+        <translation type="unfinished">گزینه '-checkpoints' نهاده شده ولی checkpoint ها پاک شده‌اند. این گزینه کاربردی ندارد.</translation>
+    </message>
+    <message>
+        <source>Prune: last wallet synchronisation goes beyond pruned data. You need to -reindex (download the whole blockchain again in case of a pruned node)</source>
+        <translation type="unfinished">«هرس‌سازی (Prune): آخرین همگام‌سازی کیف پول فراتر از داده‌های هرس‌شده است. لازم است ‎-reindex‎ را اجرا کنید (در صورت استفاده از نود هرس‌شده، باید کل بلاک‌چین دوباره دانلود شود).»</translation>
+    </message>
     <message>
         <source>Rename of '%s' -&gt; '%s' failed. Cannot clean up the background chainstate leveldb directory.</source>
         <translation type="unfinished">تغییر نام '%s' به '%s' با شکست مواجه شد. نمی‌توان پوشهٔ leveldb مربوط به chainstate پس‌زمینه را پاک‌سازی کرد</translation>
@@ -1582,6 +1687,14 @@ If you are receiving this error you should request the merchant provide a BIP21
         <source>The combination of the pre-selected inputs and the wallet automatic inputs selection exceeds the transaction maximum weight. Please try sending a smaller amount or manually consolidating your wallet's UTXOs</source>
         <translation type="unfinished">ترکیب ورودی‌های از پیش انتخاب‌شده و ورودی‌های انتخاب‌شده به‌صورت خودکار توسط کیف‌پول از حداکثر وزن تراکنش فراتر رفته است. لطفاً مقدار کمتری ارسال کنید یا UTXOهای کیف‌پول را به‌صورت دستی تجمیع کنید</translation>
     </message>
+    <message>
+        <source>The inputs size exceeds the maximum weight. Please try sending a smaller amount or manually consolidating your wallet's UTXOs</source>
+        <translation type="unfinished">اندازه ورودی از حداکثر مقدار موجودی بیشتر است.  لطفاً مقدار کمتری ارسال کنید یا به صورت دستی مقدار موجودی خرج نشده کیف پول خود را در ارسال تراکنش اعمال کنید. </translation>
+    </message>
+    <message>
+        <source>The preselected coins total amount does not cover the transaction target. Please allow other inputs to be automatically selected or include more coins manually</source>
+        <translation type="unfinished">مقدار کل بیتکوینی که از پیش انتخاب کردید کمتر از مبلغ مورد نظر برای انجام تراکنش است .  لطفاً اجازه دهید ورودی های دیگر به طور خودکار انتخاب شوند یا مقدار بیتکوین های بیشتری را به صورت دستی اضافه کنید</translation>
+    </message>
     <message>
         <source>Your computer's date and time appear to be more than %d minutes out of sync with the network, this may lead to consensus failure. After you've confirmed your computer's clock, this message should no longer appear when you restart your node. Without a restart, it should stop showing automatically after you've connected to a sufficient number of new outbound peers, which may take some time. You can inspect the `timeoffset` field of the `getpeerinfo` and `getnetworkinfo` RPC methods to get more info.</source>
         <translation type="unfinished">ساعت و تاریخ رایانه شما بیش از %d دقیقه با شبکه هماهنگ نیست، که ممکن است باعث اختلال در اجماع شود. پس از اینکه ساعت رایانه خود را تنظیم کردید، این پیام پس از راه‌اندازی مجدد نود دیگر ظاهر نخواهد شد. اگر نود را مجدداً راه‌اندازی نکنید، این پیام به‌طور خودکار پس از اتصال به تعداد کافی از همتایان جدید خروجی، ناپدید خواهد شد که ممکن است کمی زمان ببرد. برای دریافت اطلاعات بیشتر، می‌توانید به فیلد timeoffset در متدهای RPC به نام‌های getpeerinfo و getnetworkinfo مراجعه کنید.</translation>
@@ -1619,6 +1732,14 @@ If you are receiving this error you should request the merchant provide a BIP21
         <source>Elliptic curve cryptography sanity check failure. %s is shutting down.</source>
         <translation type="unfinished">بررسی سلامت رمزنگاری منحنی بیضوی با شکست مواجه شد. %s در حال خاموش شدن است.</translation>
     </message>
+    <message>
+        <source>Error loading databases</source>
+        <translation type="unfinished">خطا در بارگذاری پایگاه های داده</translation>
+    </message>
+    <message>
+        <source>Error opening coins database</source>
+        <translation type="unfinished">خطا در بازکردن پایگاه داده بلاک coins</translation>
+    </message>
     <message>
         <source>Error reading configuration file: %s</source>
         <translation type="unfinished">خطا در خواندن فایل تنظیمات: %s</translation>
@@ -1635,6 +1756,10 @@ If you are receiving this error you should request the merchant provide a BIP21
         <source>Error: Unable to read wallet's best block locator record</source>
         <translation type="unfinished">خطا: خواندن بهترین سابقه یاب بلوک کیف پول امکان پذیر نیست</translation>
     </message>
+    <message>
+        <source>Error: Unable to write data to disk for wallet %s</source>
+        <translation type="unfinished">خطا: ناتوان در نوشتن داده روی دیسک برای کیف پول %s</translation>
+    </message>
     <message>
         <source>Error: Unable to write solvable wallet best block locator record</source>
         <translation type="unfinished">خطا: نوشتن بهترین سابقه یاب بلوک کیف پول قابل حل امکان پذیر نیست</translation>
@@ -1647,10 +1772,26 @@ If you are receiving this error you should request the merchant provide a BIP21
         <source>Error: database transaction cannot be executed for wallet %s</source>
         <translation type="unfinished">خطا: تراکنش پایگاه داده را نمی توان برای کیف پول اجرا کرد %s</translation>
     </message>
+    <message>
+        <source>Failed to disconnect block.</source>
+        <translation type="unfinished">گسستن بلاک شکست خورد.</translation>
+    </message>
+    <message>
+        <source>Failed to read block.</source>
+        <translation type="unfinished">خواندن بلاک شکست خورد.</translation>
+    </message>
+    <message>
+        <source>Failed to write block.</source>
+        <translation type="unfinished">نوشتن بلاک شکست خورد.</translation>
+    </message>
     <message>
         <source>Failure removing transaction: %s</source>
         <translation type="unfinished">عدم موفقیت در حذف تراکنش:%s</translation>
     </message>
+    <message>
+        <source>Maximum transaction weight must be between %d and %d</source>
+        <translation type="unfinished">حداکثر وزن تراکنش باید میان %d و %d باشد</translation>
+    </message>
     <message>
         <source>Transaction %s does not belong to this wallet</source>
         <translation type="unfinished">تراکنش %s به این کیف پول تعلق ندارد</translation>
@@ -1659,6 +1800,10 @@ If you are receiving this error you should request the merchant provide a BIP21
         <source>Wallet file creation failed: %s</source>
         <translation type="unfinished">عدم موفقیت در ساخت فایل کیف پول: %s</translation>
     </message>
+    <message>
+        <source>Do you want to rebuild the databases now?</source>
+        <translation type="unfinished">آیا اکنون تمایل به بازسازی پایگاه های داده دارید؟</translation>
+    </message>
     <message>
         <source>Error: Could not add watchonly tx %s to watchonly wallet</source>
         <translation type="unfinished">خطا:‌ نشد تراکنش فقط قابل مشاهده %s به کیف پول فقط قابل مشاهده اضافه شود</translation>
@@ -1667,5 +1812,29 @@ If you are receiving this error you should request the merchant provide a BIP21
         <source>Error: Could not delete watchonly transactions. </source>
         <translation type="unfinished">خطا: تراکنش های فقط دیدنی حذف نشد.</translation>
     </message>
+    <message>
+        <source>Error: Wallet does not exist</source>
+        <translation type="unfinished">خطا: کیف پول وجود ندارد</translation>
+    </message>
+    <message>
+        <source>Error: cannot remove legacy wallet records</source>
+        <translation type="unfinished">خطا: نمیتوان پیشینه کیف پول قدیمی را پاک کرد</translation>
+    </message>
+    <message>
+        <source>Failed to start indexes, shutting down…</source>
+        <translation type="unfinished">آغاز فهرست ها شکست خورد، در حال خاموش کردن...</translation>
+    </message>
+    <message>
+        <source>Invalid -proxy address or hostname, ends with '=': '%s'</source>
+        <translation type="unfinished">نشانی یا نام میزبان -proxy نادرست است، با '=' پایان می یابد: '%s'</translation>
+    </message>
+    <message>
+        <source>Not enough file descriptors available. %d available, %d required.</source>
+        <translation type="unfinished">ویژگی‌‌‌نما های فایل کافی نیستند. دردسترس %d، مورد نیاز %d</translation>
+    </message>
+    <message>
+        <source>Unrecognized network in -proxy='%s': '%s'</source>
+        <translation type="unfinished">تارنورد (Network) در -proxy='%s' شناسا نیست: '%s'</translation>
+    </message>
     </context>
 </TS>
\ No newline at end of file
diff --git a/src/qt/locale/bitcoin_fi.ts b/src/qt/locale/bitcoin_fi.ts
index ec540e856c1d..81d22ccb6a54 100644
--- a/src/qt/locale/bitcoin_fi.ts
+++ b/src/qt/locale/bitcoin_fi.ts
@@ -29,6 +29,10 @@
         <source>Enter address or label to search</source>
         <translation type="unfinished">Anna etsittävä osoite tai tunniste</translation>
     </message>
+    <message>
+        <source>Copy the currently selected address to the clipboard</source>
+        <translation type="unfinished">Kopioi valittu osoite leikepöydälle</translation>
+    </message>
     <message>
         <source>Export the data in the current tab to a file</source>
         <translation type="unfinished">Vie auki olevan välilehden tiedot tiedostoon</translation>
@@ -762,6 +766,23 @@ Allekirjoitus on mahdollista vain 'legacy'-tyyppisillä osoitteilla.</translatio
         <extracomment>Label of the input field where the name of the wallet is entered.</extracomment>
         <translation type="unfinished">Lompakon nimi</translation>
     </message>
+    <message>
+        <source>Invalid Wallet Name</source>
+        <translation type="unfinished">Virheellinen lomapkon nimi</translation>
+    </message>
+    <message>
+        <source>Wallet name cannot be empty</source>
+        <translation type="unfinished">Lompakon nimeä ei voi jättää tyhjäksi</translation>
+    </message>
+    <message>
+        <source>Restore and Migrate Wallet Backup</source>
+        <translation type="unfinished">Palauta ja siirrä lompakon varmuuskopio</translation>
+    </message>
+    <message>
+        <source>Restore and Migrate Wallet</source>
+        <extracomment>Title of pop-up window shown when the user is attempting to restore a wallet.</extracomment>
+        <translation type="unfinished">Palauta ja siirrä lompakko</translation>
+    </message>
     <message>
         <source>&amp;Window</source>
         <translation type="unfinished">&amp;Ikkuna</translation>
@@ -1121,6 +1142,24 @@ Siirtoprosessi luo varmuuskopion lompakosta ennen siirtoa. Tämä varmuuskopioti
         <source>Solvable but not watched scripts have been migrated to a new wallet named '%1'.</source>
         <translation type="unfinished">Ratkaistavat mutta ei katsotut skriptit on siirretty uuteen lompakkoon nimeltä '%1'.</translation>
     </message>
+    <message>
+        <source>Restore and Migrate wallet</source>
+        <translation type="unfinished">Palauta ja siirrä lompakko</translation>
+    </message>
+    <message>
+        <source>Are you sure you wish to restore the wallet file &lt;i&gt;%1&lt;/i&gt; to &lt;i&gt;%2&lt;/i&gt; and migrate it?</source>
+        <translation type="unfinished">Haluatko varmasti palauttaa lompakon &lt;i&gt;%1&lt;/i&gt; kohteeseen &lt;i&gt;%2&lt;/i&gt; ja siirtää sen?</translation>
+    </message>
+    <message>
+        <source>Restore Wallet</source>
+        <extracomment>Title of progress window which is displayed when wallets are being restored.</extracomment>
+        <translation type="unfinished">Palauta lompakko</translation>
+    </message>
+    <message>
+        <source>Restoring Wallet &lt;b&gt;%1&lt;/b&gt;…</source>
+        <extracomment>Descriptive text of the restore wallets progress window which indicates to the user that wallets are currently being restored.</extracomment>
+        <translation type="unfinished">Lompakon palautus&lt;b&gt;%1&lt;/b&gt;…</translation>
+    </message>
     <message>
         <source>Migration failed</source>
         <translation type="unfinished">Siirto epäonnistui</translation>
@@ -1244,10 +1283,6 @@ Siirtoprosessi luo varmuuskopion lompakosta ennen siirtoa. Tämä varmuuskopioti
         <source>Disable Private Keys</source>
         <translation type="unfinished">Poista yksityisavaimet käytöstä</translation>
     </message>
-    <message>
-        <source>Make a blank wallet. Blank wallets do not initially have private keys or scripts. Private keys and addresses can be imported, or an HD seed can be set, at a later time.</source>
-        <translation type="unfinished">Luo tyhjä lompakko. Tyhjissä lompakoissa ei aluksi ole yksityisavaimia tai skriptejä. Myöhemmin voidaan tuoda yksityisavaimia ja -osoitteita, tai asettaa HD-siemen.</translation>
-    </message>
     <message>
         <source>Make Blank Wallet</source>
         <translation type="unfinished">Luo tyhjä lompakko</translation>
@@ -1457,8 +1492,8 @@ Siirtoprosessi luo varmuuskopion lompakosta ennen siirtoa. Tämä varmuuskopioti
         <source>(sufficient to restore backups %n day(s) old)</source>
         <extracomment>Explanatory text on the capability of the current prune target.</extracomment>
         <translation type="unfinished">
-            <numerusform />
-            <numerusform />
+            <numerusform>(riittää %n päivän vanhojen varmuuskopioiden palauttamiseen)</numerusform>
+            <numerusform>(riittää %n päivää vanhojen varmuuskopioiden palauttamiseen)</numerusform>
         </translation>
     </message>
     <message>
@@ -1575,6 +1610,11 @@ Siirtoprosessi luo varmuuskopion lompakosta ennen siirtoa. Tämä varmuuskopioti
         <source>Enabling pruning significantly reduces the disk space required to store transactions. All blocks are still fully validated. Reverting this setting requires re-downloading the entire blockchain.</source>
         <translation type="unfinished">Rajaamisen ottaminen käyttöön vähentää merkittävästi tapahtumien tallentamiseen tarvittavaa levytilaa. Kaikki lohkot validoidaan edelleen täysin. Tämän asetuksen peruuttaminen edellyttää koko lohkoketjun lataamista uudelleen.</translation>
     </message>
+    <message>
+        <source>Maximum database cache size. Make sure you have enough RAM. A larger cache can contribute to faster sync, after which the benefit is less pronounced for most use cases. Lowering the cache size will reduce memory usage. Unused mempool memory is shared for this cache.</source>
+        <extracomment>Tooltip text for Options window setting that sets the size of the database cache. Explains the corresponding effects of increasing/decreasing this value.</extracomment>
+        <translation type="unfinished">Tietokannan välimuistin enimmäiskoko. Varmista, että keskusmuistia on riittävästi. Suurempi välimuisti voi nopeuttaa synkronointia, mutta sen jälkeen hyöty ei ole enää niin merkittävä useimmissa käyttötapauksissa. Välimuistin koon pienentäminen vähentää muistin käyttöä. Käyttämätön mempool-muisti jaetaan tätä välimuistia varten.</translation>
+    </message>
     <message>
         <source>Size of &amp;database cache</source>
         <translation type="unfinished">&amp;Tietokannan välimuistin koko</translation>
@@ -1587,6 +1627,14 @@ Siirtoprosessi luo varmuuskopion lompakosta ennen siirtoa. Tämä varmuuskopioti
         <source>Full path to a %1 compatible script (e.g. C:\Downloads\hwi.exe or /Users/you/Downloads/hwi.py). Beware: malware can steal your coins!</source>
         <translation type="unfinished">Täysi polku %1 yhteensopivaan komentosarjaan (esim. C:\Downloads\hwi.exe tai /Users/you/Downloads/hwi.py). Varo: haittaohjelmat voivat varastaa kolikkosi!</translation>
     </message>
+    <message>
+        <source>Automatically open the Bitcoin client port on the router. This only works when your router supports PCP or NAT-PMP and it is enabled. The external port could be random.</source>
+        <translation type="unfinished">Avaa reitittimen Bitcoin-asiakasohjelman portti automaattisesti. Tämä toimii vain, jos reitittimesi tukee PCP:tä tai NAT-PMP:tä ja se on otettu käyttöön. Ulkoinen portti voi olla satunnainen.</translation>
+    </message>
+    <message>
+        <source>Map port using PCP or NA&amp;T-PMP</source>
+        <translation type="unfinished">Portin uudelleenohjaus PCP:llä tai NA&amp;T-PMP:llä</translation>
+    </message>
     <message>
         <source>IP address of the proxy (e.g. IPv4: 127.0.0.1 / IPv6: ::1)</source>
         <translation type="unfinished">IP osoite proxille (esim. IPv4: 127.0.0.1 / IPv6: ::1)</translation>
@@ -1782,6 +1830,10 @@ Siirtoprosessi luo varmuuskopion lompakosta ennen siirtoa. Tämä varmuuskopioti
         <source>Choose the default subdivision unit to show in the interface and when sending coins.</source>
         <translation type="unfinished">Valitse mitä yksikköä käytetään ensisijaisesti bitcoin-määrien näyttämiseen.</translation>
     </message>
+    <message>
+        <source>Third-party URLs (e.g. a block explorer) that appear in the transactions tab as context menu items. %s in the URL is replaced by transaction hash. Multiple URLs are separated by vertical bar |.</source>
+        <translation type="unfinished">Kolmannen osapuolen URL-osoitteet (esim. block explorer), jotka esiintyvät siirrot-välilehden pikavalikoissa. URL-osoitteessa oleva %s korvataan siirtotunnisteella.  Jos URL-osoitteita on useampia, ne on eroteltu pystyviivalla |.</translation>
+    </message>
     <message>
         <source>&amp;Third-party transaction URLs</source>
         <translation type="unfinished">&amp;Kolmannen osapuolen tapahtuma-URL-osoitteet</translation>
@@ -1974,9 +2026,12 @@ Siirtoprosessi luo varmuuskopion lompakosta ennen siirtoa. Tämä varmuuskopioti
         <source>Could not sign any more inputs.</source>
         <translation type="unfinished">Syötteitä ei voitu enää allekirjoittaa.</translation>
     </message>
-    <message>
-        <source>Signed %1 inputs, but more signatures are still required.</source>
-        <translation type="unfinished">%1 syötettä allekirjoitettiin, mutta lisää allekirjoituksia tarvitaan.</translation>
+    <message numerus="yes">
+        <source>Signed %n input(s), but more signatures are still required.</source>
+        <translation type="unfinished">
+            <numerusform />
+            <numerusform />
+        </translation>
     </message>
     <message>
         <source>Signed transaction successfully. Transaction is ready to broadcast.</source>
@@ -2035,9 +2090,12 @@ Siirtoprosessi luo varmuuskopion lompakosta ennen siirtoa. Tämä varmuuskopioti
         <source>or</source>
         <translation type="unfinished">tai</translation>
     </message>
-    <message>
-        <source>Transaction has %1 unsigned inputs.</source>
-        <translation type="unfinished">Siirrossa on %1 allekirjoittamatonta syötettä.</translation>
+    <message numerus="yes">
+        <source>Transaction has %n unsigned input(s).</source>
+        <translation type="unfinished">
+            <numerusform />
+            <numerusform />
+        </translation>
     </message>
     <message>
         <source>Transaction is missing some information about inputs.</source>
@@ -2328,10 +2386,6 @@ Jos saat tämän virheen, pyydä kauppiasta antamaan BIP21-yhteensopiva URI.</tr
         <source>Transaction Relay</source>
         <translation type="unfinished">Siirtokulu</translation>
     </message>
-    <message>
-        <source>Starting Block</source>
-        <translation type="unfinished">Alkaen lohkosta</translation>
-    </message>
     <message>
         <source>Synced Headers</source>
         <translation type="unfinished">Synkronoidut ylätunnisteet</translation>
@@ -2430,6 +2484,10 @@ Jos saat tämän virheen, pyydä kauppiasta antamaan BIP21-yhteensopiva URI.</tr
         <source>Services</source>
         <translation type="unfinished">Palvelut</translation>
     </message>
+    <message>
+        <source>High bandwidth BIP152 compact block relay: %1</source>
+        <translation type="unfinished">Suuren kaistanleveyden BIP152-tiivislohkojen välitys: %1</translation>
+    </message>
     <message>
         <source>High Bandwidth</source>
         <translation type="unfinished">Suuri kaistanleveys</translation>
@@ -2902,7 +2960,7 @@ Luo natiivin segwit-osoitteen (BIP-173). Jotkin vanhat lompakot eivät tue sitä
     </message>
     <message>
         <source>Insufficient funds!</source>
-        <translation type="unfinished">Lompakon saldo ei riitä!</translation>
+        <translation type="unfinished">Riittämätön saldo!</translation>
     </message>
     <message>
         <source>Quantity:</source>
@@ -3201,10 +3259,6 @@ Huom: Koska maksu lasketaan per tavu, "100 satoshin per kB" maksunopeus 500 virt
         <source>The amount exceeds your balance.</source>
         <translation type="unfinished">Määrä ylittää tilisi saldon.</translation>
     </message>
-    <message>
-        <source>The total exceeds your balance when the %1 transaction fee is included.</source>
-        <translation type="unfinished">Kokonaismäärä ylittää saldosi kun %1 siirtomaksu lisätään summaan.</translation>
-    </message>
     <message>
         <source>Duplicate address found: addresses should only be used once each.</source>
         <translation type="unfinished">Osoite esiintyy useaan kertaan: osoitteita tulisi käyttää vain kerran kutakin.</translation>
@@ -4099,10 +4153,6 @@ ilman, että käytetään mitään snapshot-tietoja. Ilmoita tästä tapauksesta
         <source>Warning: Private keys detected in wallet {%s} with disabled private keys</source>
         <translation type="unfinished">Varoitus: lompakosta {%s} tunnistetut yksityiset avaimet, on poistettu käytöstä</translation>
     </message>
-    <message>
-        <source>Warning: We do not appear to fully agree with our peers! You may need to upgrade, or other nodes may need to upgrade.</source>
-        <translation type="unfinished">Varoitus: Olemme ristiriidassa vertaisten kanssa! Sinun tulee päivittää tai toisten solmujen tulee päivitää.</translation>
-    </message>
     <message>
         <source>You need to rebuild the database using -reindex to go back to unpruned mode.  This will redownload the entire blockchain</source>
         <translation type="unfinished">Palataksesi karsimattomaan tilaan joudut uudelleenrakentamaan tietokannan -reindex -valinnalla. Tämä lataa koko lohkoketjun uudestaan.</translation>
@@ -4175,10 +4225,6 @@ Ei voinut palauttaa lompakon varmuuskopiota..</translation>
         <source>Dump file %s does not exist.</source>
         <translation type="unfinished">Dump-tiedostoa %s ei ole olemassa.</translation>
     </message>
-    <message>
-        <source>Error creating %s</source>
-        <translation type="unfinished">Virhe luodessa %s</translation>
-    </message>
     <message>
         <source>Error initializing block database</source>
         <translation type="unfinished">Virhe alustaessa lohkotietokantaa</translation>
@@ -4187,10 +4233,6 @@ Ei voinut palauttaa lompakon varmuuskopiota..</translation>
         <source>Error loading %s</source>
         <translation type="unfinished">Virhe ladattaessa %s</translation>
     </message>
-    <message>
-        <source>Error loading %s: Private keys can only be disabled during creation</source>
-        <translation type="unfinished">Virhe %s:n lataamisessa: Yksityiset avaimet voidaan poistaa käytöstä vain luomisen aikana</translation>
-    </message>
     <message>
         <source>Error loading %s: Wallet corrupted</source>
         <translation type="unfinished">Virhe ladattaessa %s: Lompakko vioittunut</translation>
@@ -4297,7 +4339,7 @@ Ei voinut palauttaa lompakon varmuuskopiota..</translation>
     </message>
     <message>
         <source>Insufficient funds</source>
-        <translation type="unfinished">Lompakon saldo ei riitä</translation>
+        <translation type="unfinished">Riittämätön saldo</translation>
     </message>
     <message>
         <source>Invalid -i2psam address or hostname: '%s'</source>
@@ -4471,10 +4513,6 @@ Ei voinut palauttaa lompakon varmuuskopiota..</translation>
         <source>This is the minimum transaction fee you pay on every transaction.</source>
         <translation type="unfinished">Tämä on jokaisesta siirrosta maksettava vähimmäismaksu.</translation>
     </message>
-    <message>
-        <source>This is the transaction fee you will pay if you send a transaction.</source>
-        <translation type="unfinished">Tämä on se siirtomaksu, jonka maksat, mikäli lähetät siirron.</translation>
-    </message>
     <message>
         <source>Transaction %s does not belong to this wallet</source>
         <translation type="unfinished">Tapahtuma %s ei kuulu tähän lompakkoon</translation>
diff --git a/src/qt/locale/bitcoin_fil.ts b/src/qt/locale/bitcoin_fil.ts
index feaf9babf800..b73abc6cd3ca 100644
--- a/src/qt/locale/bitcoin_fil.ts
+++ b/src/qt/locale/bitcoin_fil.ts
@@ -630,7 +630,7 @@ Signing is only possible with addresses of the type 'legacy'.</source>
     </message>
     <message>
         <source>After Fee:</source>
-        <translation type="unfinished">Pagkatapos ng Bayad:</translation>
+        <translation type="unfinished">Bayad sa pagtapusan:</translation>
     </message>
     <message>
         <source>Change:</source>
@@ -654,7 +654,7 @@ Signing is only possible with addresses of the type 'legacy'.</source>
     </message>
     <message>
         <source>Date</source>
-        <translation type="unfinished">Petsa</translation>
+        <translation type="unfinished">Datiles</translation>
     </message>
     <message>
         <source>Confirmations</source>
@@ -1331,9 +1331,12 @@ Signing is only possible with addresses of the type 'legacy'.</source>
         <source>Could not sign any more inputs.</source>
         <translation type="unfinished">Hindi makapag-sign ng anumang karagdagang mga input.</translation>
     </message>
-    <message>
-        <source>Signed %1 inputs, but more signatures are still required.</source>
-        <translation type="unfinished">Naka-sign %1 na mga input, ngunit kailangan pa ng maraming mga lagda.</translation>
+    <message numerus="yes">
+        <source>Signed %n input(s), but more signatures are still required.</source>
+        <translation type="unfinished">
+            <numerusform />
+            <numerusform />
+        </translation>
     </message>
     <message>
         <source>Signed transaction successfully. Transaction is ready to broadcast.</source>
@@ -1363,6 +1366,13 @@ Signing is only possible with addresses of the type 'legacy'.</source>
         <source>or</source>
         <translation type="unfinished">o</translation>
     </message>
+    <message numerus="yes">
+        <source>Transaction has %n unsigned input(s).</source>
+        <translation type="unfinished">
+            <numerusform />
+            <numerusform />
+        </translation>
+    </message>
     </context>
 <context>
     <name>PaymentServer</name>
@@ -1526,10 +1536,6 @@ Signing is only possible with addresses of the type 'legacy'.</source>
         <source>Version</source>
         <translation type="unfinished">Bersyon</translation>
     </message>
-    <message>
-        <source>Starting Block</source>
-        <translation type="unfinished">Pasimulang Block</translation>
-    </message>
     <message>
         <source>Synced Headers</source>
         <translation type="unfinished">Mga header na na-sync</translation>
@@ -1826,7 +1832,7 @@ Signing is only possible with addresses of the type 'legacy'.</source>
     <name>RecentRequestsTableModel</name>
     <message>
         <source>Date</source>
-        <translation type="unfinished">Datiles</translation>
+        <translation type="unfinished">Petsa</translation>
     </message>
     <message>
         <source>Message</source>
@@ -2056,10 +2062,6 @@ Signing is only possible with addresses of the type 'legacy'.</source>
         <source>The amount exceeds your balance.</source>
         <translation type="unfinished">Ang halaga ay lumampas sa iyong balanse.</translation>
     </message>
-    <message>
-        <source>The total exceeds your balance when the %1 transaction fee is included.</source>
-        <translation type="unfinished">Ang kabuuan ay lumampas sa iyong balanse kapag kasama ang %1 na bayad sa transaksyon.</translation>
-    </message>
     <message>
         <source>Duplicate address found: addresses should only be used once each.</source>
         <translation type="unfinished">Natagpuan ang duplicate na address: ang mga address ay dapat isang beses lamang gamitin bawat isa.</translation>
@@ -2764,10 +2766,6 @@ Signing is only possible with addresses of the type 'legacy'.</source>
         <source>Warning: Private keys detected in wallet {%s} with disabled private keys</source>
         <translation type="unfinished">Babala: Napansin ang mga private key sa walet { %s} na may mga hindi pinaganang private key</translation>
     </message>
-    <message>
-        <source>Warning: We do not appear to fully agree with our peers! You may need to upgrade, or other nodes may need to upgrade.</source>
-        <translation type="unfinished">Babala: Mukhang hindi kami ganap na sumasang-ayon sa aming mga peers! Maaaring kailanganin mong mag-upgrade, o ang ibang mga node ay maaaring kailanganing mag-upgrade.</translation>
-    </message>
     <message>
         <source>You need to rebuild the database using -reindex to go back to unpruned mode.  This will redownload the entire blockchain</source>
         <translation type="unfinished">Kailangan mong muling itayo ang database gamit ang -reindex upang bumalik sa unpruned mode. I-do-download muli nito ang buong blockchain</translation>
@@ -2808,10 +2806,6 @@ Signing is only possible with addresses of the type 'legacy'.</source>
         <source>Error loading %s</source>
         <translation type="unfinished">Kamalian sa pag-lo-load %s</translation>
     </message>
-    <message>
-        <source>Error loading %s: Private keys can only be disabled during creation</source>
-        <translation type="unfinished">Kamalian sa pag-lo-load %s: Ang private key ay maaaring hindi paganahin sa panahon ng paglikha lamang</translation>
-    </message>
     <message>
         <source>Error loading %s: Wallet corrupted</source>
         <translation type="unfinished">Kamalian sa pag-lo-load %s: Nasira ang walet</translation>
@@ -2928,10 +2922,6 @@ Signing is only possible with addresses of the type 'legacy'.</source>
         <source>This is the minimum transaction fee you pay on every transaction.</source>
         <translation type="unfinished">Ito ang pinakamababang bayad sa transaksyon na babayaran mo sa bawat transaksyon.</translation>
     </message>
-    <message>
-        <source>This is the transaction fee you will pay if you send a transaction.</source>
-        <translation type="unfinished">Ito ang bayad sa transaksyon na babayaran mo kung magpapadala ka ng transaksyon.</translation>
-    </message>
     <message>
         <source>Transaction amount too small</source>
         <translation type="unfinished">Masyadong maliit ang halaga ng transaksyon</translation>
diff --git a/src/qt/locale/bitcoin_fo.ts b/src/qt/locale/bitcoin_fo.ts
index be7dc072f499..400ddd12e591 100644
--- a/src/qt/locale/bitcoin_fo.ts
+++ b/src/qt/locale/bitcoin_fo.ts
@@ -3,11 +3,23 @@
     <name>AddressBookPage</name>
     <message>
         <source>Right-click to edit address or label</source>
-        <translation type="unfinished">Høgraklikk fyri at broyta adressu ella spjaldur</translation>
+        <translation type="unfinished">Høgratrýst fyri at broyta adressu ella spjaldur</translation>
     </message>
     <message>
         <source>Create a new address</source>
-        <translation type="unfinished">Stovna adressu</translation>
+        <translation type="unfinished">Innlegg nýggja útgjaldsadressu</translation>
+    </message>
+    <message>
+        <source>&amp;New</source>
+        <translation type="unfinished">&amp;Nýggja</translation>
+    </message>
+    <message>
+        <source>&amp;Copy</source>
+        <translation type="unfinished">&amp;Avrita</translation>
+    </message>
+    <message>
+        <source>C&amp;lose</source>
+        <translation type="unfinished">&amp;Lat aftur</translation>
     </message>
     <message>
         <source>Delete the currently selected address from the list</source>
@@ -17,24 +29,83 @@
         <source>Enter address or label to search</source>
         <translation type="unfinished">Leita eftir adressu ella spjaldri</translation>
     </message>
+    <message>
+        <source>Copy the currently selected address to the clipboard</source>
+        <translation type="unfinished">Avrita valdu adressuna á setiborðið</translation>
+    </message>
+    <message>
+        <source>Export the data in the current tab to a file</source>
+        <translation type="unfinished">Tak dáturnar, í hesum glugganum, út til fílu</translation>
+    </message>
+    <message>
+        <source>&amp;Export</source>
+        <translation type="unfinished">Tak &amp;út</translation>
+    </message>
+    <message>
+        <source>&amp;Delete</source>
+        <translation type="unfinished">&amp;Strika</translation>
+    </message>
+    <message>
+        <source>Choose the address to send coins to</source>
+        <translation type="unfinished">Vel adressu at senda myntir til</translation>
+    </message>
+    <message>
+        <source>Choose the address to receive coins with</source>
+        <translation type="unfinished">Vel inngjaldsadressu</translation>
+    </message>
+    <message>
+        <source>C&amp;hoose</source>
+        <translation type="unfinished">&amp;Vel</translation>
+    </message>
+    <message>
+        <source>These are your Bitcoin addresses for sending payments. Always check the amount and the receiving address before sending coins.</source>
+        <translation type="unfinished">Hetta eru goymdar Bitcoin adressur at senda til. Kanna altíð upphæddina og útgjaldsadressuna áðrenn hvørja flyting.</translation>
+    </message>
+    <message>
+        <source>These are your Bitcoin addresses for receiving payments. Use the 'Create new receiving address' button in the receive tab to create new addresses.
+Signing is only possible with addresses of the type 'legacy'.</source>
+        <translation type="unfinished">Hetta eru tínar Bitcoin adressur at móttakað við. Vel 'Framleið nýggja inngjaldsadressu', undir Móttak-skiljiblaðnum fyri at útroknað nýggjar adressur.
+Undirritan, av boðum, er einans møgulig fyri 'legacy' (eldri) adressusløg.</translation>
+    </message>
     <message>
         <source>&amp;Copy Address</source>
-        <translation type="unfinished">&amp;Avrita addressu</translation>
+        <translation type="unfinished">&amp;Avrita adressu</translation>
     </message>
     <message>
         <source>Copy &amp;Label</source>
-        <translation type="unfinished">Avrita &amp;Spjaldur</translation>
+        <translation type="unfinished">Avrita &amp;spjaldur</translation>
     </message>
     <message>
         <source>&amp;Edit</source>
         <translation type="unfinished">&amp;Broyt</translation>
     </message>
+    <message>
+        <source>Export Address List</source>
+        <translation type="unfinished">Tak adressuskrá út</translation>
+    </message>
+    <message>
+        <source>Comma separated file</source>
+        <extracomment>Expanded name of the CSV file format. See: https://en.wikipedia.org/wiki/Comma-separated_values.</extracomment>
+        <translation type="unfinished">Kommaskilt fíla</translation>
+    </message>
     <message>
         <source>There was an error trying to save the address list to %1. Please try again.</source>
         <extracomment>An error message. %1 is a stand-in argument for the name of the file we attempted to save to.</extracomment>
-        <translation type="unfinished">Villa við goyming av adressuskrá til %1. Vinaliga royn aftur.</translation>
+        <translation type="unfinished">Villa við goyming av adressuskrá í %1. Vinaliga royn aftur.</translation>
+    </message>
+    <message>
+        <source>Sending addresses - %1</source>
+        <translation type="unfinished">%1: Útgjaldsadressur</translation>
     </message>
-    </context>
+    <message>
+        <source>Receiving addresses - %1</source>
+        <translation type="unfinished">%1: Inngjaldsadressur</translation>
+    </message>
+    <message>
+        <source>Exporting Failed</source>
+        <translation type="unfinished">Úttøka miseydnaðist</translation>
+    </message>
+</context>
 <context>
     <name>AddressTableModel</name>
     <message>
@@ -50,28 +121,207 @@
         <translation type="unfinished">(einki spjaldur)</translation>
     </message>
 </context>
+<context>
+    <name>AskPassphraseDialog</name>
+    <message>
+        <source>Passphrase Dialog</source>
+        <translation type="unfinished">Loyniorð áseting</translation>
+    </message>
+    <message>
+        <source>Enter passphrase</source>
+        <translation type="unfinished">Inntøppa loyniorð</translation>
+    </message>
+    <message>
+        <source>New passphrase</source>
+        <translation type="unfinished">Nýtt loyniorð</translation>
+    </message>
+    <message>
+        <source>Repeat new passphrase</source>
+        <translation type="unfinished">Endurtak nýggja loyniorðið</translation>
+    </message>
+    <message>
+        <source>Show passphrase</source>
+        <translation type="unfinished">Vís loyniorðið</translation>
+    </message>
+    <message>
+        <source>Encrypt wallet</source>
+        <translation type="unfinished">Brongla mappu</translation>
+    </message>
+    <message>
+        <source>This operation needs your wallet passphrase to unlock the wallet.</source>
+        <translation type="unfinished">Atgerðin tørvar loyniorðið til mappuna, fyri at latað mappuna upp.</translation>
+    </message>
+    <message>
+        <source>Unlock wallet</source>
+        <translation type="unfinished">Lat mappu upp</translation>
+    </message>
+    <message>
+        <source>Change passphrase</source>
+        <translation type="unfinished">Broyt loyniorð</translation>
+    </message>
+    <message>
+        <source>Confirm wallet encryption</source>
+        <translation type="unfinished">Vátta mappu bronglan</translation>
+    </message>
+    <message>
+        <source>Warning: If you encrypt your wallet and lose your passphrase, you will &lt;b&gt;LOSE ALL OF YOUR BITCOINS&lt;/b&gt;!</source>
+        <translation type="unfinished">Gev gætur: Bronglar tú mappuna og gloymur loyniorðið &lt;b&gt;MISSUR TÚ ALLAR TÍNAR BITCOINS&lt;/b&gt;!</translation>
+    </message>
+    <message>
+        <source>Are you sure you wish to encrypt your wallet?</source>
+        <translation type="unfinished">Ynskir tú at brongla tína mappu?</translation>
+    </message>
+    <message>
+        <source>Wallet encrypted</source>
+        <translation type="unfinished">Mappa er brongla</translation>
+    </message>
+    <message>
+        <source>Enter the new passphrase for the wallet.&lt;br/&gt;Please use a passphrase of &lt;b&gt;ten or more random characters&lt;/b&gt;, or &lt;b&gt;eight or more words&lt;/b&gt;.</source>
+        <translation type="unfinished">Inntøppa nýggja loyniorðið fyri mappuna.&lt;br/&gt;Vinaliga nýt eitt loyniorð ið er samansett av &lt;b&gt;tíggju ella fleiri tilvildarligum stavum&lt;/b&gt;, ella &lt;b&gt;átta ella fleiri orðum&lt;/b&gt;.</translation>
+    </message>
+    <message>
+        <source>Enter the old passphrase and new passphrase for the wallet.</source>
+        <translation type="unfinished">Inntøppa gamla loyniorðið og nýggja loyniorðið til mappuna.</translation>
+    </message>
+    <message>
+        <source>Continue</source>
+        <translation type="unfinished">Hald áfram</translation>
+    </message>
+    <message>
+        <source>Back</source>
+        <translation type="unfinished">Ógilda</translation>
+    </message>
+    <message>
+        <source>Remember that encrypting your wallet cannot fully protect your bitcoins from being stolen by malware infecting your computer.</source>
+        <translation type="unfinished">Hav í huga at tað at brongla tína mappu ikki er ein fullfíggjað verja ímóti at tínar bitcoins kunnu stjalast av illbúnaði á tíni teldu.</translation>
+    </message>
+    <message>
+        <source>Wallet to be encrypted</source>
+        <translation type="unfinished">Mappa ið verður brongla</translation>
+    </message>
+    <message>
+        <source>Your wallet is about to be encrypted. </source>
+        <translation type="unfinished">Tín mappa verður brongla. </translation>
+    </message>
+    <message>
+        <source>Your wallet is now encrypted. </source>
+        <translation type="unfinished">Tín mappa er nú bronglað.</translation>
+    </message>
+    <message>
+        <source>IMPORTANT: Any previous backups you have made of your wallet file should be replaced with the newly generated, encrypted wallet file. For security reasons, previous backups of the unencrypted wallet file will become useless as soon as you start using the new, encrypted wallet.</source>
+        <translation type="unfinished">GEV GÆTUR: Undanfarin trygdarrit, tú hevur gjørt av mappufíluni, eiga at vera útskift við nýframleiddu bronglaðu mappufíluna. Av trygdarávum verða undanfarin trydarrit av óbronglaðu mappufíluni gjørd óvirkin, tá tú byrjar at brúka nýbronglaðu mappuna.</translation>
+    </message>
+    <message>
+        <source>Wallet encryption failed</source>
+        <translation type="unfinished">Mappu bronglan miseydnaðist</translation>
+    </message>
+    <message>
+        <source>Wallet encryption failed due to an internal error. Your wallet was not encrypted.</source>
+        <translation type="unfinished">Mappu bronglanin miseydnaðist vegnað ein innankervis trupulleika. Tín mappa var ikki bronglað.</translation>
+    </message>
+    <message>
+        <source>The supplied passphrases do not match.</source>
+        <translation type="unfinished">Loyniorðini samsvara ikki.</translation>
+    </message>
+    <message>
+        <source>Wallet unlock failed</source>
+        <translation type="unfinished">Mappu upplating miseydnaðist</translation>
+    </message>
+    <message>
+        <source>The passphrase entered for the wallet decryption was incorrect.</source>
+        <translation type="unfinished">Ásetta loyniorðið, til mappuavbronglingina, er ikki rætt.</translation>
+    </message>
+    <message>
+        <source>The passphrase entered for the wallet decryption is incorrect. It contains a null character (ie - a zero byte). If the passphrase was set with a version of this software prior to 25.0, please try again with only the characters up to — but not including — the first null character. If this is successful, please set a new passphrase to avoid this issue in the future.</source>
+        <translation type="unfinished">Ásetta loyniorðið, til mappuavbronglingina, er ikki rætt. Tað inniheldur ein, ella fleiri, 'null' stavir (t.e. eitt být við virðinum 0). Var mappan bronglað við eini útgávu av hesum ritbúnaðinum eldri enn 25.0, royn so aftur við øllum stavunum fram til — men ikki við — fyrsta 'null' stavi. Um tað eydnast, vinaliga ásett eitt nýtt loyniorð fyri sleppa undan hesum trupulleikanum.</translation>
+    </message>
+    <message>
+        <source>Wallet passphrase was successfully changed.</source>
+        <translation type="unfinished">Tað eydnaðist at broyta loyniorð á mappuni.</translation>
+    </message>
+    <message>
+        <source>Passphrase change failed</source>
+        <translation type="unfinished">Miseydnaðist at broyta loyniorð</translation>
+    </message>
+    <message>
+        <source>The old passphrase entered for the wallet decryption is incorrect. It contains a null character (ie - a zero byte). If the passphrase was set with a version of this software prior to 25.0, please try again with only the characters up to — but not including — the first null character.</source>
+        <translation type="unfinished">Gamla loyniorðið, til mappuavbronglingina, er ikki rætt. Tað inniheldur ein, ella fleir, 'null' stavir (t.e. eitt být við virðinum 0). Var mappan bronglað við eini útgávu av hesum ritbúnaðinum eldri enn 25.0, royn so aftur við øllum stavunum fram til — men ikki við — fyrsta 'null' stavi.</translation>
+    </message>
+    <message>
+        <source>Warning: The Caps Lock key is on!</source>
+        <translation type="unfinished">Gev gætur: Caps Lock knøtturin er tendraður.</translation>
+    </message>
+</context>
+<context>
+    <name>BanTableModel</name>
+    <message>
+        <source>IP/Netmask</source>
+        <translation type="unfinished">IP/Netsíla</translation>
+    </message>
+    <message>
+        <source>Banned Until</source>
+        <translation type="unfinished">Svartalistaður til</translation>
+    </message>
+</context>
 <context>
     <name>BitcoinApplication</name>
     <message>
         <source>Settings file %1 might be corrupt or invalid.</source>
         <translation type="unfinished">Uppsetanarfílan %1 kann vera avskeplað ella ógildig.</translation>
     </message>
+    <message>
+        <source>Runaway exception</source>
+        <translation type="unfinished">Undantak ið hædd ikki er tikið fyri</translation>
+    </message>
+    <message>
+        <source>A fatal error occurred. %1 can no longer continue safely and will quit.</source>
+        <translation type="unfinished">Ein óbøtilig villa kom fyri. %1 fær ikki hildi fram á álítandi hátt og steðgar.</translation>
+    </message>
     <message>
         <source>Internal error</source>
-        <translation type="unfinished">Innanhýsis villa</translation>
+        <translation type="unfinished">Innankervis villa</translation>
+    </message>
+    <message>
+        <source>An internal error occurred. %1 will attempt to continue safely. This is an unexpected bug which can be reported as described below.</source>
+        <translation type="unfinished">Ein innankervis villa kom fyri. %1 roynur at halda fram á álítandi hátt. Hetta er ein óvæntaður trupulleiki og kann fráboðast, sambært lýsingini niðanfyri.</translation>
     </message>
-    </context>
+</context>
 <context>
     <name>QObject</name>
     <message>
         <source>Do you want to reset settings to default values, or to abort without making changes?</source>
         <extracomment>Explanatory text shown on startup when the settings file cannot be read. Prompts user to make a choice between resetting or aborting.</extracomment>
-        <translation type="unfinished">Ynskir tú at endurstilla stillingar til upprunaligar stillingar, ella at avlýsa broytingar?</translation>
+        <translation type="unfinished">Ynskir tú at broyta stillingar til forsettar stillingar, ella at avlýsa broytingar?</translation>
+    </message>
+    <message>
+        <source>A fatal error occurred. Check that settings file is writable, or try running with -nosettings.</source>
+        <extracomment>Explanatory text shown on startup when the settings file could not be written. Prompts user to check that we have the ability to write to the file. Explains that the user has the option of running without a settings file.</extracomment>
+        <translation type="unfinished">Ein óbøtilig villa kom fyri. Syrg fyri at forritið hevur rættindi at skriva til stillingarfíluna, ella royn at koyra forritið við -nosettings ávirkinum.</translation>
     </message>
     <message>
         <source>Error: %1</source>
         <translation type="unfinished">Villa: %1</translation>
     </message>
+    <message>
+        <source>%1 didn't yet exit safely…</source>
+        <translation type="unfinished">%1 slóknaði á óálítandi hátt…</translation>
+    </message>
+    <message>
+        <source>unknown</source>
+        <translation type="unfinished">ókend</translation>
+    </message>
+    <message>
+        <source>Embedded "%1"</source>
+        <translation type="unfinished">Viðfest "%1"</translation>
+    </message>
+    <message>
+        <source>Default system font "%1"</source>
+        <translation type="unfinished">Stýrikervis-forsett stavsnið "%1"</translation>
+    </message>
+    <message>
+        <source>Custom…</source>
+        <translation type="unfinished">Nýtaratillaga…</translation>
+    </message>
     <message>
         <source>Amount</source>
         <translation type="unfinished">Upphædd</translation>
@@ -84,6 +334,10 @@
         <source>Ctrl+W</source>
         <translation type="unfinished">CTRL+W</translation>
     </message>
+    <message>
+        <source>Unroutable</source>
+        <translation type="unfinished">Óbeinasamt</translation>
+    </message>
     <message>
         <source>Inbound</source>
         <extracomment>An inbound connection from a peer. An inbound connection is a connection initiated by a peer.</extracomment>
@@ -94,10 +348,48 @@
         <extracomment>An outbound connection to a peer. An outbound connection is a connection initiated by us.</extracomment>
         <translation type="unfinished">Útgangandi</translation>
     </message>
+    <message>
+        <source>Full Relay</source>
+        <extracomment>Peer connection type that relays all network information.</extracomment>
+        <translation type="unfinished">Óskerd framsendan</translation>
+    </message>
+    <message>
+        <source>Block Relay</source>
+        <extracomment>Peer connection type that relays network information about blocks and not transactions or addresses.</extracomment>
+        <translation type="unfinished">Blokk-framsendan</translation>
+    </message>
+    <message>
+        <source>Manual</source>
+        <extracomment>Peer connection type established manually through one of several methods.</extracomment>
+        <translation type="unfinished">Nýtarastovnað</translation>
+    </message>
+    <message>
+        <source>Feeler</source>
+        <extracomment>Short-lived peer connection type that tests the aliveness of known addresses.</extracomment>
+        <translation type="unfinished">Kannari</translation>
+    </message>
+    <message>
+        <source>Address Fetch</source>
+        <extracomment>Short-lived peer connection type that solicits known addresses from a peer.</extracomment>
+        <translation type="unfinished">Atsetursavnan</translation>
+    </message>
+    <message>
+        <source>Private Broadcast</source>
+        <extracomment>Short-lived peer connection type that is used for broadcasting privacy-sensitive data.</extracomment>
+        <translation type="unfinished">Loyniútvarping</translation>
+    </message>
     <message>
         <source>%1 h</source>
         <translation type="unfinished">%1 t</translation>
     </message>
+    <message>
+        <source>None</source>
+        <translation type="unfinished">Ongar</translation>
+    </message>
+    <message>
+        <source>N/A</source>
+        <translation type="unfinished">—</translation>
+    </message>
     <message numerus="yes">
         <source>%n second(s)</source>
         <translation type="unfinished">
@@ -144,13 +436,33 @@
             <numerusform>%n ár</numerusform>
         </translation>
     </message>
-    </context>
+    <message>
+        <source>default wallet</source>
+        <translation type="unfinished">forsett mappa</translation>
+    </message>
+</context>
 <context>
     <name>BitcoinGUI</name>
     <message>
         <source>&amp;Overview</source>
         <translation type="unfinished">&amp;Yvirlit</translation>
     </message>
+    <message>
+        <source>Show general overview of wallet</source>
+        <translation type="unfinished">Vís yvirskipað yvirlit av mappu</translation>
+    </message>
+    <message>
+        <source>&amp;Transactions</source>
+        <translation type="unfinished">&amp;Flytingar</translation>
+    </message>
+    <message>
+        <source>Browse transaction history</source>
+        <translation type="unfinished">Vís flytingaryvirlit, tilhoyrandi mappuna</translation>
+    </message>
+    <message>
+        <source>E&amp;xit</source>
+        <translation type="unfinished">&amp;Lat aftur</translation>
+    </message>
     <message>
         <source>Quit application</source>
         <translation type="unfinished">Sløkk forrit</translation>
@@ -161,7 +473,7 @@
     </message>
     <message>
         <source>Show information about %1</source>
-        <translation type="unfinished">Vís upplýsingar um %1</translation>
+        <translation type="unfinished">Vís kunning um %1</translation>
     </message>
     <message>
         <source>About &amp;Qt</source>
@@ -169,1176 +481,4719 @@
     </message>
     <message>
         <source>Show information about Qt</source>
-        <translation type="unfinished">Vís upplýsingar um Qt</translation>
+        <translation type="unfinished">Vís kunning um Qt</translation>
     </message>
     <message>
         <source>Modify configuration options for %1</source>
         <translation type="unfinished">Broyt uppsetanarstillingar fyri %1</translation>
     </message>
     <message>
-        <source>Network activity disabled.</source>
-        <extracomment>A substring of the tooltip.</extracomment>
-        <translation type="unfinished">Net-virksemi óvirkijað.</translation>
+        <source>Create a new wallet</source>
+        <translation type="unfinished">Ger nýggja mappu</translation>
     </message>
     <message>
-        <source>&amp;Receive</source>
-        <translation type="unfinished">&amp;Móttak</translation>
+        <source>&amp;Minimize</source>
+        <translation type="unfinished">&amp;Minsta</translation>
     </message>
     <message>
-        <source>Sign &amp;message…</source>
-        <translation type="unfinished">&amp;Undirrita  boð</translation>
+        <source>Wallet:</source>
+        <translation type="unfinished">Mappa:</translation>
     </message>
     <message>
-        <source>Sign messages with your Bitcoin addresses to prove you own them</source>
-        <translation type="unfinished">Undirrita boðini við tíni Bitcoin-adressu fyri at prógva at tey eru tíni</translation>
+        <source>Network activity disabled.</source>
+        <extracomment>A substring of the tooltip.</extracomment>
+        <translation type="unfinished">Net-virksemi óvirkt.</translation>
     </message>
     <message>
-        <source>&amp;File</source>
-        <translation type="unfinished">&amp;Fíla</translation>
+        <source>Proxy is &lt;b&gt;enabled&lt;/b&gt;: %1</source>
+        <translation type="unfinished">&lt;b&gt;Virktur&lt;/b&gt; proxy: %1</translation>
     </message>
     <message>
-        <source>&amp;Settings</source>
-        <translation type="unfinished">&amp;Stillingar</translation>
+        <source>Send coins to a Bitcoin address</source>
+        <translation type="unfinished">Send myntir til eina Bitcoin adressu</translation>
     </message>
     <message>
-        <source>&amp;Help</source>
-        <translation type="unfinished">&amp;Hjálp</translation>
-    </message>
-    <message numerus="yes">
-        <source>Processed %n block(s) of transaction history.</source>
-        <translation type="unfinished">
-            <numerusform />
-            <numerusform />
-        </translation>
+        <source>Backup wallet to another location</source>
+        <translation type="unfinished">Trygdaravrita mappuna til eitt annað stað</translation>
     </message>
     <message>
-        <source>%1 behind</source>
-        <translation type="unfinished">%1 aftanfyri</translation>
+        <source>Change the passphrase used for wallet encryption</source>
+        <translation type="unfinished">Broyt loyniorðið ið verður brúkt til bronglan av mappu</translation>
     </message>
     <message>
-        <source>Error</source>
-        <translation type="unfinished">Villa</translation>
+        <source>&amp;Receive</source>
+        <translation type="unfinished">&amp;Móttak</translation>
     </message>
     <message>
-        <source>Warning</source>
-        <translation type="unfinished">Ávaring</translation>
+        <source>&amp;Options…</source>
+        <translation type="unfinished">&amp;Stillingar…</translation>
     </message>
     <message>
-        <source>Up to date</source>
-        <translation type="unfinished">Javnsettur</translation>
+        <source>&amp;Encrypt Wallet…</source>
+        <translation type="unfinished">&amp;Brongla mappu…</translation>
     </message>
     <message>
-        <source>Ctrl+Q</source>
-        <translation type="unfinished">CTRL+Q</translation>
+        <source>Encrypt the private keys that belong to your wallet</source>
+        <translation type="unfinished">Brongla privatu lyklarnar tilhoyrandi mappuna</translation>
     </message>
     <message>
-        <source>Ctrl+M</source>
-        <translation type="unfinished">CTRL+M</translation>
+        <source>&amp;Backup Wallet…</source>
+        <translation type="unfinished">&amp;Trygdaravrita mappu…</translation>
     </message>
     <message>
-        <source>%1 client</source>
-        <translation type="unfinished">%1 viðskiftari</translation>
-    </message>
-    <message numerus="yes">
-        <source>%n active connection(s) to Bitcoin network.</source>
-        <extracomment>A substring of the tooltip.</extracomment>
-        <translation type="unfinished">
-            <numerusform>%n virkið samband til Bitcoin netið.</numerusform>
-            <numerusform>%n virkin sambond til Bitcoin netið.</numerusform>
-        </translation>
+        <source>&amp;Change Passphrase…</source>
+        <translation type="unfinished">B&amp;royt loyniorð…</translation>
     </message>
     <message>
-        <source>Disable network activity</source>
-        <extracomment>A context menu item.</extracomment>
-        <translation type="unfinished">Óvirkja net-virksemið.</translation>
+        <source>Sign &amp;message…</source>
+        <translation type="unfinished">&amp;Undirrita boð…</translation>
     </message>
     <message>
-        <source>Enable network activity</source>
-        <extracomment>A context menu item. The network activity was disabled previously.</extracomment>
-        <translation type="unfinished">Virkja net-virksemið.</translation>
+        <source>Sign messages with your Bitcoin addresses to prove you own them</source>
+        <translation type="unfinished">Undirrita boðini við tíni Bitcoin-adressu fyri at prógva at tey eru tíni</translation>
     </message>
     <message>
-        <source>Error: %1</source>
-        <translation type="unfinished">Villa: %1</translation>
+        <source>&amp;Verify message…</source>
+        <translation type="unfinished">&amp;Vátta boð…</translation>
     </message>
     <message>
-        <source>Warning: %1</source>
-        <translation type="unfinished">Ávaring: %1</translation>
+        <source>Verify messages to ensure they were signed with specified Bitcoin addresses</source>
+        <translation type="unfinished">Sannroyn boð fyri at tryggja at tey vóru undirritaði av ávísaru Bitcoin adressu</translation>
     </message>
     <message>
-        <source>Label: %1
-</source>
-        <translation type="unfinished">Spjaldur: %1
-</translation>
+        <source>&amp;Load PSBT from file…</source>
+        <translation type="unfinished">&amp;Innles PSBT frá fílu…</translation>
     </message>
     <message>
-        <source>Address: %1
-</source>
-        <translation type="unfinished">Adressa: %1
-</translation>
+        <source>Open &amp;URI…</source>
+        <translation type="unfinished">Innles U&amp;RI…</translation>
     </message>
-    </context>
-<context>
-    <name>CoinControlDialog</name>
     <message>
-        <source>Quantity:</source>
-        <translation type="unfinished">Mongd:</translation>
+        <source>Close Wallet…</source>
+        <translation type="unfinished">Lat mappu aftur…</translation>
     </message>
     <message>
-        <source>Bytes:</source>
-        <translation type="unfinished">Být:</translation>
+        <source>Create Wallet…</source>
+        <translation type="unfinished">Ger mappu…</translation>
     </message>
     <message>
-        <source>Amount:</source>
-        <translation type="unfinished">Upphædd:</translation>
+        <source>Close All Wallets…</source>
+        <translation type="unfinished">Lat allar mappur aftur…</translation>
     </message>
     <message>
-        <source>Change:</source>
-        <translation type="unfinished">Vekslipeningur:</translation>
+        <source>Restore and Migrate Wallet File…</source>
+        <translation type="unfinished">Endurinnles og uppstiga mappufílu...</translation>
     </message>
     <message>
-        <source>(un)select all</source>
-        <translation type="unfinished">(frá)vel alt</translation>
+        <source>&amp;File</source>
+        <translation type="unfinished">&amp;Fíla</translation>
     </message>
     <message>
-        <source>Amount</source>
-        <translation type="unfinished">Upphædd</translation>
+        <source>&amp;Settings</source>
+        <translation type="unfinished">&amp;Stillingar</translation>
     </message>
     <message>
-        <source>Copy amount</source>
-        <translation type="unfinished">Avrita mongd</translation>
+        <source>&amp;Help</source>
+        <translation type="unfinished">&amp;Hjálp</translation>
     </message>
     <message>
-        <source>&amp;Copy address</source>
-        <translation type="unfinished">&amp;Avrita adressu</translation>
+        <source>Tabs toolbar</source>
+        <translation type="unfinished">Skiljiblað amboðsbjálki</translation>
     </message>
     <message>
-        <source>Copy &amp;label</source>
-        <translation type="unfinished">Avrita &amp;spjaldur</translation>
+        <source>Syncing Headers (%1%)…</source>
+        <translation type="unfinished">Samstillar blokkhøvd (%1%)…</translation>
     </message>
     <message>
-        <source>Copy &amp;amount</source>
-        <translation type="unfinished">Avrita &amp;upphædd</translation>
+        <source>Synchronizing with network…</source>
+        <translation type="unfinished">Samstillar við net…</translation>
     </message>
     <message>
-        <source>Copy quantity</source>
-        <translation type="unfinished">Avrita mongd</translation>
+        <source>Indexing blocks on disk…</source>
+        <translation type="unfinished">Forstílar blokkar á diski…</translation>
     </message>
     <message>
-        <source>Copy bytes</source>
-        <translation type="unfinished">Avrita být</translation>
+        <source>Processing blocks on disk…</source>
+        <translation type="unfinished">Viðgerð blokkar á diski…</translation>
     </message>
     <message>
-        <source>Copy change</source>
-        <translation type="unfinished">Avrita vekslipening</translation>
+        <source>Connecting to peers…</source>
+        <translation type="unfinished">Sambindur við javningar…</translation>
     </message>
     <message>
-        <source>Can vary +/- %1 satoshi(s) per input.</source>
-        <translation type="unfinished">Kann vera ymiskt +/- %1 satoshi fyri hvørt ískoyti.</translation>
+        <source>Request payments (generates QR codes and bitcoin: URIs)</source>
+        <translation type="unfinished">Umbið gjald (framleiður QR kotu og bitcoin: URI'ir)</translation>
     </message>
     <message>
-        <source>(no label)</source>
-        <translation type="unfinished">(einki spjaldur)</translation>
+        <source>Show the list of used sending addresses and labels</source>
+        <translation type="unfinished">Vís útgjaldsadressurnar, og tilhoyrandi spjøldur, í adressuskránni.</translation>
     </message>
     <message>
-        <source>change from %1 (%2)</source>
-        <translation type="unfinished">vekslipeningur frá %1 (%2)</translation>
+        <source>Show the list of used receiving addresses and labels</source>
+        <translation type="unfinished">Vís listan av brúktum inngjaldsadressum og spjøldrum</translation>
     </message>
     <message>
-        <source>(change)</source>
-        <translation type="unfinished">(vekslipeningur)</translation>
+        <source>&amp;Command-line options</source>
+        <translation type="unfinished">&amp;Stýriboð-linju møguleikar</translation>
     </message>
-</context>
+    <message numerus="yes">
+        <source>Processed %n block(s) of transaction history.</source>
+        <translation type="unfinished">
+            <numerusform>Viðgjørt %n blokk av flytingarsøgu.</numerusform>
+            <numerusform>Viðgjørt %n blokkar av flytingum.</numerusform>
+        </translation>
+    </message>
+    <message>
+        <source>%1 behind</source>
+        <translation type="unfinished">%1 afturúr</translation>
+    </message>
+    <message>
+        <source>Catching up…</source>
+        <translation type="unfinished">Samstillar…</translation>
+    </message>
+    <message>
+        <source>Last received block was generated %1 ago.</source>
+        <translation type="unfinished">Seinast móttikni blokkur var framleiddur fyri %1 síðan.</translation>
+    </message>
+    <message>
+        <source>Transactions after this will not yet be visible.</source>
+        <translation type="unfinished">Nýggjari flytingar eru enn ókendar.</translation>
+    </message>
+    <message>
+        <source>Error</source>
+        <translation type="unfinished">Villa</translation>
+    </message>
+    <message>
+        <source>Warning</source>
+        <translation type="unfinished">Gev gætur</translation>
+    </message>
+    <message>
+        <source>Information</source>
+        <translation type="unfinished">Upplýsingar</translation>
+    </message>
+    <message>
+        <source>Up to date</source>
+        <translation type="unfinished">Javnsettur</translation>
+    </message>
+    <message>
+        <source>Load Partially Signed Bitcoin Transaction</source>
+        <translation type="unfinished">Innles Partvís Undirritaða Bitcoin Flyting</translation>
+    </message>
+    <message>
+        <source>Load PSBT from &amp;clipboard…</source>
+        <translation type="unfinished">Innles PSBT av setiborði…</translation>
+    </message>
+    <message>
+        <source>Load Partially Signed Bitcoin Transaction from clipboard</source>
+        <translation type="unfinished">Innles Partvís Undirritaða Bitcoin Flyting av setiborði</translation>
+    </message>
+    <message>
+        <source>Node window</source>
+        <translation type="unfinished">Knútagluggi</translation>
+    </message>
+    <message>
+        <source>Open node debugging and diagnostic console</source>
+        <translation type="unfinished">Lat upp knúta villukemban og brekfinningarstýrstøðina.</translation>
+    </message>
+    <message>
+        <source>&amp;Sending addresses</source>
+        <translation type="unfinished">&amp;Útgjaldsadressur</translation>
+    </message>
+    <message>
+        <source>&amp;Receiving addresses</source>
+        <translation type="unfinished">&amp;Inngjaldsadressur</translation>
+    </message>
+    <message>
+        <source>Open a bitcoin: URI</source>
+        <translation type="unfinished">Innles eitt bitcoin: URI</translation>
+    </message>
+    <message>
+        <source>Open Wallet</source>
+        <translation type="unfinished">Innles mappu</translation>
+    </message>
+    <message>
+        <source>Open a wallet</source>
+        <translation type="unfinished">Innles eina mappu</translation>
+    </message>
+    <message>
+        <source>Close wallet</source>
+        <translation type="unfinished">Lat mappu aftur</translation>
+    </message>
+    <message>
+        <source>Restore Wallet…</source>
+        <extracomment>Name of the menu item that restores wallet from a backup file.</extracomment>
+        <translation type="unfinished">Endurinnles mappu…</translation>
+    </message>
+    <message>
+        <source>Restore a wallet from a backup file</source>
+        <extracomment>Status tip for Restore Wallet menu item</extracomment>
+        <translation type="unfinished">Indurinnles eina mappu frá trygdaravritsfílu</translation>
+    </message>
+    <message>
+        <source>Close all wallets</source>
+        <translation type="unfinished">Lat allar mappur aftur</translation>
+    </message>
+    <message>
+        <source>Migrate Wallet</source>
+        <translation type="unfinished">Uppstiga mappuforsnið</translation>
+    </message>
+    <message>
+        <source>Migrate a wallet</source>
+        <translation type="unfinished">Uppstiga forsniðið á eini mappu</translation>
+    </message>
+    <message>
+        <source>Show the %1 help message to get a list with possible Bitcoin command-line options</source>
+        <translation type="unfinished">Vís %1 hjálpartekstin fyri ein lista við Bitcoin stýriboð-linju møgulleikum</translation>
+    </message>
+    <message>
+        <source>&amp;Mask values</source>
+        <translation type="unfinished">&amp;Fjal upphæddir</translation>
+    </message>
+    <message>
+        <source>Mask the values in the Overview tab</source>
+        <translation type="unfinished">Fjalir upphæddirnar undir Yvirlit skiljiblaðnum</translation>
+    </message>
+    <message>
+        <source>No wallets available</source>
+        <translation type="unfinished">Ongar tøkar mappur</translation>
+    </message>
+    <message>
+        <source>Wallet Data</source>
+        <extracomment>Name of the wallet data file format.</extracomment>
+        <translation type="unfinished">Mappudátur</translation>
+    </message>
+    <message>
+        <source>Load Wallet Backup</source>
+        <extracomment>The title for Restore Wallet File Windows</extracomment>
+        <translation type="unfinished">Innles mappu tygdaravrit</translation>
+    </message>
+    <message>
+        <source>Restore Wallet</source>
+        <extracomment>Title of pop-up window shown when the user is attempting to restore a wallet.</extracomment>
+        <translation type="unfinished">Endurinnles mappu</translation>
+    </message>
+    <message>
+        <source>Wallet Name</source>
+        <extracomment>Label of the input field where the name of the wallet is entered.</extracomment>
+        <translation type="unfinished">Mappunavn</translation>
+    </message>
+    <message>
+        <source>Invalid Wallet Name</source>
+        <translation type="unfinished">Ógildigt mappunavn</translation>
+    </message>
+    <message>
+        <source>Wallet name cannot be empty</source>
+        <translation type="unfinished">Mappunavn kann ikki vera tómt</translation>
+    </message>
+    <message>
+        <source>Restore and Migrate Wallet Backup</source>
+        <translation type="unfinished">Endurinnles og uppstiga mapputrygdaravrit</translation>
+    </message>
+    <message>
+        <source>Restore and Migrate Wallet</source>
+        <extracomment>Title of pop-up window shown when the user is attempting to restore a wallet.</extracomment>
+        <translation type="unfinished">Endurinnles og uppstiga mappu</translation>
+    </message>
+    <message>
+        <source>&amp;Window</source>
+        <translation type="unfinished">&amp;Gluggi</translation>
+    </message>
+    <message>
+        <source>Zoom</source>
+        <translation type="unfinished">Suma</translation>
+    </message>
+    <message>
+        <source>Main Window</source>
+        <translation type="unfinished">Høvuðsgluggi</translation>
+    </message>
+    <message>
+        <source>%1 client</source>
+        <translation type="unfinished">%1 viðskiftari</translation>
+    </message>
+    <message>
+        <source>&amp;Hide</source>
+        <translation type="unfinished">&amp;Fjal</translation>
+    </message>
+    <message>
+        <source>S&amp;how</source>
+        <translation type="unfinished">&amp;Vís</translation>
+    </message>
+    <message numerus="yes">
+        <source>%n active connection(s) to Bitcoin network.</source>
+        <extracomment>A substring of the tooltip.</extracomment>
+        <translation type="unfinished">
+            <numerusform>%n virkið samband til Bitcoin netið.</numerusform>
+            <numerusform>%n virkin sambond til Bitcoin netið.</numerusform>
+        </translation>
+    </message>
+    <message>
+        <source>Click for more actions.</source>
+        <extracomment>A substring of the tooltip. "More actions" are available via the context menu.</extracomment>
+        <translation type="unfinished">Trýst fyri fleiri møgulleikar.</translation>
+    </message>
+    <message>
+        <source>Show Peers tab</source>
+        <extracomment>A context menu item. The "Peers tab" is an element of the "Node window".</extracomment>
+        <translation type="unfinished">Vís Javningar skiljiblaðið</translation>
+    </message>
+    <message>
+        <source>Disable network activity</source>
+        <extracomment>A context menu item.</extracomment>
+        <translation type="unfinished">Óvirkja net-virksemið.</translation>
+    </message>
+    <message>
+        <source>Enable network activity</source>
+        <extracomment>A context menu item. The network activity was disabled previously.</extracomment>
+        <translation type="unfinished">Virkja net-virksemið.</translation>
+    </message>
+    <message>
+        <source>Pre-syncing Headers (%1%)…</source>
+        <translation type="unfinished">Undan-samstillar blokkhøvd (%1%)…</translation>
+    </message>
+    <message>
+        <source>Error: %1</source>
+        <translation type="unfinished">Villa: %1</translation>
+    </message>
+    <message>
+        <source>Warning: %1</source>
+        <translation type="unfinished">Gev gætur: %1</translation>
+    </message>
+    <message>
+        <source>Date: %1
+</source>
+        <translation type="unfinished">Dagfesting: %1
+</translation>
+    </message>
+    <message>
+        <source>Amount: %1
+</source>
+        <translation type="unfinished">Upphædd: %1
+</translation>
+    </message>
+    <message>
+        <source>Wallet: %1
+</source>
+        <translation type="unfinished">Mappa: %1
+</translation>
+    </message>
+    <message>
+        <source>Type: %1
+</source>
+        <translation type="unfinished">Slag: %1
+</translation>
+    </message>
+    <message>
+        <source>Label: %1
+</source>
+        <translation type="unfinished">Spjaldur: %1
+</translation>
+    </message>
+    <message>
+        <source>Address: %1
+</source>
+        <translation type="unfinished">Adressa: %1
+</translation>
+    </message>
+    <message>
+        <source>Sent transaction</source>
+        <translation type="unfinished">Útgjald</translation>
+    </message>
+    <message>
+        <source>Incoming transaction</source>
+        <translation type="unfinished">Inngjald</translation>
+    </message>
+    <message>
+        <source>HD key generation is &lt;b&gt;enabled&lt;/b&gt;</source>
+        <translation type="unfinished">HD lyklagerð er &lt;b&gt;virkt&lt;/b&gt;</translation>
+    </message>
+    <message>
+        <source>HD key generation is &lt;b&gt;disabled&lt;/b&gt;</source>
+        <translation type="unfinished">HD lyklagerð er &lt;b&gt;óvirkt&lt;/b&gt;</translation>
+    </message>
+    <message>
+        <source>Private key &lt;b&gt;disabled&lt;/b&gt;</source>
+        <translation type="unfinished">Privatir lyklar &lt;b&gt;óvirktir&lt;/b&gt;</translation>
+    </message>
+    <message>
+        <source>Wallet is &lt;b&gt;encrypted&lt;/b&gt; and currently &lt;b&gt;unlocked&lt;/b&gt;</source>
+        <translation type="unfinished">Mappan er &lt;b&gt;bronglað&lt;/b&gt; og, í løtuni, &lt;b&gt;opin&lt;/b&gt;.</translation>
+    </message>
+    <message>
+        <source>Wallet is &lt;b&gt;encrypted&lt;/b&gt; and currently &lt;b&gt;locked&lt;/b&gt;</source>
+        <translation type="unfinished">Mappan er &lt;b&gt;bronglað&lt;/b&gt; og, í løtuni, &lt;b&gt;løst&lt;/b&gt;.</translation>
+    </message>
+    <message>
+        <source>Original message:</source>
+        <translation type="unfinished">Upprunalig boð:</translation>
+    </message>
+</context>
+<context>
+    <name>UnitDisplayStatusBarControl</name>
+    <message>
+        <source>Unit to show amounts in. Click to select another unit.</source>
+        <translation type="unfinished">Eindir ið upphæddir skulu vísast í. Trýst fyri at velja eina aðra eind.</translation>
+    </message>
+</context>
+<context>
+    <name>CoinControlDialog</name>
+    <message>
+        <source>Coin Selection</source>
+        <translation type="unfinished">Myntval</translation>
+    </message>
+    <message>
+        <source>Quantity:</source>
+        <translation type="unfinished">Mongd:</translation>
+    </message>
+    <message>
+        <source>Bytes:</source>
+        <translation type="unfinished">Být:</translation>
+    </message>
+    <message>
+        <source>Amount:</source>
+        <translation type="unfinished">Upphædd:</translation>
+    </message>
+    <message>
+        <source>Fee:</source>
+        <translation type="unfinished">Avgjald:</translation>
+    </message>
+    <message>
+        <source>After Fee:</source>
+        <translation type="unfinished">Eftir avgjald:</translation>
+    </message>
+    <message>
+        <source>Change:</source>
+        <translation type="unfinished">Vekslipeningur:</translation>
+    </message>
+    <message>
+        <source>(un)select all</source>
+        <translation type="unfinished">(frá)vel allar</translation>
+    </message>
+    <message>
+        <source>Tree mode</source>
+        <translation type="unfinished">Bólkað í adressum</translation>
+    </message>
+    <message>
+        <source>List mode</source>
+        <translation type="unfinished">Óbólkaðar myntir</translation>
+    </message>
+    <message>
+        <source>Amount</source>
+        <translation type="unfinished">Upphædd</translation>
+    </message>
+    <message>
+        <source>Received with label</source>
+        <translation type="unfinished">Inngoldin á spjaldur</translation>
+    </message>
+    <message>
+        <source>Received with address</source>
+        <translation type="unfinished">Inngoldin á adressu</translation>
+    </message>
+    <message>
+        <source>Date</source>
+        <translation type="unfinished">Dagfesting</translation>
+    </message>
+    <message>
+        <source>Confirmations</source>
+        <translation type="unfinished">Váttanir</translation>
+    </message>
+    <message>
+        <source>Confirmed</source>
+        <translation type="unfinished">Váttað</translation>
+    </message>
+    <message>
+        <source>Copy amount</source>
+        <translation type="unfinished">Avrita upphædd</translation>
+    </message>
+    <message>
+        <source>&amp;Copy address</source>
+        <translation type="unfinished">&amp;Avrita adressu</translation>
+    </message>
+    <message>
+        <source>Copy &amp;label</source>
+        <translation type="unfinished">Avrita &amp;spjaldur</translation>
+    </message>
+    <message>
+        <source>Copy &amp;amount</source>
+        <translation type="unfinished">Avrita &amp;upphædd</translation>
+    </message>
+    <message>
+        <source>Copy transaction &amp;ID and output index</source>
+        <translation type="unfinished">Avrita flytingar-&amp;eymerki og úttaksraðtal</translation>
+    </message>
+    <message>
+        <source>L&amp;ock unspent</source>
+        <translation type="unfinished">&amp;Læs ónýtta (mynt)</translation>
+    </message>
+    <message>
+        <source>&amp;Unlock unspent</source>
+        <translation type="unfinished">Lat &amp;upp fyri ónýttari (mynt)</translation>
+    </message>
+    <message>
+        <source>Copy quantity</source>
+        <translation type="unfinished">Avrita mongd</translation>
+    </message>
+    <message>
+        <source>Copy fee</source>
+        <translation type="unfinished">Avrita avgjald</translation>
+    </message>
+    <message>
+        <source>Copy after fee</source>
+        <translation type="unfinished">Avrita upphædd við avgjaldi</translation>
+    </message>
+    <message>
+        <source>Copy bytes</source>
+        <translation type="unfinished">Avrita být</translation>
+    </message>
+    <message>
+        <source>Copy change</source>
+        <translation type="unfinished">Avrita vekslipening</translation>
+    </message>
+    <message>
+        <source>(%1 locked)</source>
+        <translation type="unfinished">(%1 løst)</translation>
+    </message>
+    <message>
+        <source>Can vary +/- %1 satoshi(s) per input.</source>
+        <translation type="unfinished">Kann vera ymiskt +/- %1 satoshi(s) fyri hvørt inntak.</translation>
+    </message>
+    <message>
+        <source>(no label)</source>
+        <translation type="unfinished">(einki spjaldur)</translation>
+    </message>
+    <message>
+        <source>change from %1 (%2)</source>
+        <translation type="unfinished">vekslipeningur frá %1 (%2)</translation>
+    </message>
+    <message>
+        <source>(change)</source>
+        <translation type="unfinished">(vekslipeningur)</translation>
+    </message>
+</context>
+<context>
+    <name>CreateWalletActivity</name>
+    <message>
+        <source>Create Wallet</source>
+        <extracomment>Title of window indicating the progress of creation of a new wallet.</extracomment>
+        <translation type="unfinished">Ger mappu</translation>
+    </message>
+    <message>
+        <source>Creating Wallet &lt;b&gt;%1&lt;/b&gt;…</source>
+        <extracomment>Descriptive text of the create wallet progress window which indicates to the user which wallet is currently being created.</extracomment>
+        <translation type="unfinished">Ger mappu &lt;b&gt;%1&lt;/b&gt;…</translation>
+    </message>
+    <message>
+        <source>Create wallet failed</source>
+        <translation type="unfinished">Miseydnaðist at gera mappu</translation>
+    </message>
+    <message>
+        <source>Create wallet warning</source>
+        <translation type="unfinished">Ávaring undir ger av mappu</translation>
+    </message>
+    <message>
+        <source>Can't list signers</source>
+        <translation type="unfinished">Fær ikki víst undirritarar</translation>
+    </message>
+    <message>
+        <source>Too many external signers found</source>
+        <translation type="unfinished">Óv nógvir ytri undirritarir funnir</translation>
+    </message>
+</context>
+<context>
+    <name>LoadWalletsActivity</name>
+    <message>
+        <source>Load Wallets</source>
+        <extracomment>Title of progress window which is displayed when wallets are being loaded.</extracomment>
+        <translation type="unfinished">Innles mappur</translation>
+    </message>
+    <message>
+        <source>Loading wallets…</source>
+        <extracomment>Descriptive text of the load wallets progress window which indicates to the user that wallets are currently being loaded.</extracomment>
+        <translation type="unfinished">Innlesur mappur…</translation>
+    </message>
+</context>
+<context>
+    <name>MigrateWalletActivity</name>
+    <message>
+        <source>Migrate wallet</source>
+        <translation type="unfinished">Uppstiga mappuforsnið</translation>
+    </message>
+    <message>
+        <source>Are you sure you wish to migrate the wallet &lt;i&gt;%1&lt;/i&gt;?</source>
+        <translation type="unfinished">Ynskir tú at uppstiga forsniðið á &lt;i&gt;%1&lt;/i&gt; mappuni?</translation>
+    </message>
+    <message>
+        <source>Migrating the wallet will convert this wallet to one or more descriptor wallets. A new wallet backup will need to be made.
+If this wallet contains any watchonly scripts, a new wallet will be created which contains those watchonly scripts.
+If this wallet contains any solvable but not watched scripts, a different and new wallet will be created which contains those scripts.
+
+The migration process will create a backup of the wallet before migrating. This backup file will be named &lt;wallet name&gt;-&lt;timestamp&gt;.legacy.bak and can be found in the directory for this wallet. In the event of an incorrect migration, the backup can be restored with the "Restore Wallet" functionality.</source>
+        <translation type="unfinished">Mappuupstigan formbroytur hesa mappuna til eina ella fleiri lyklalýsingar mappur. Ein nýggj mappa verður gjørd.
+Inniheldur mappan eygleiðingarscript, so verður ein nýggj mappa gjørd við teimum eygleiðingarscriptunum.
+Inniheldur mappan loysilig-script, ið ikki eru eygleiðingarscript, so verður ein nýggj mappa gjørd við teimum scriptunum.
+
+Uppstiganartilgongdin tekur eitt trygdaravrit, av mappuni, áðrenn uppstigan. Trygdaravritið verður kallað &lt;wallet name&gt;-&lt;timestamp&gt;.legacy.bak og liggur í somu skjáttu sum hendan mappan. Í fall uppstiganin miseydnast, kann trygdaravritið verða endurinnlisið við "Endurinnles mappu" hentleikanum.</translation>
+    </message>
+    <message>
+        <source>Migrate Wallet</source>
+        <translation type="unfinished">Uppstiga mappuforsnið</translation>
+    </message>
+    <message>
+        <source>Migrating Wallet &lt;b&gt;%1&lt;/b&gt;…</source>
+        <translation type="unfinished">Uppstigar forsniðið tilhoyrandi mappu &lt;b&gt;%1&lt;/b&gt;…</translation>
+    </message>
+    <message>
+        <source>The wallet '%1' was migrated successfully.</source>
+        <translation type="unfinished">Tað eydnaðist at uppstiga forsniðið á '%1' mappuni.</translation>
+    </message>
+    <message>
+        <source>Watchonly scripts have been migrated to a new wallet named '%1'.</source>
+        <translation type="unfinished">Eygleiðingarscriptir eru uppstigaði til eina nýggja mappu kallað '%1'.</translation>
+    </message>
+    <message>
+        <source>Solvable but not watched scripts have been migrated to a new wallet named '%1'.</source>
+        <translation type="unfinished">Loysilig, men ikki eygleiðingar-, script eru uppstiga til nýggja mappu nevnd '%1'.</translation>
+    </message>
+    <message>
+        <source>Restore and Migrate wallet</source>
+        <translation type="unfinished">Endurinnles og uppstiga mappu</translation>
+    </message>
+    <message>
+        <source>Are you sure you wish to restore the wallet file &lt;i&gt;%1&lt;/i&gt; to &lt;i&gt;%2&lt;/i&gt; and migrate it?</source>
+        <translation type="unfinished">Ynskir tú at endurinnlesa mappufíluna &lt;i&gt;%1&lt;/i&gt; til &lt;i&gt;%2&lt;/i&gt; og uppstiga forsnið mappunar?</translation>
+    </message>
+    <message>
+        <source>Restoring the wallet will copy the backup file to the wallets directory and place it in the standard wallet directory layout. The original file will not be modified.
+
+Migrating the wallet will convert the restored wallet to one or more descriptor wallets. A new wallet backup will need to be made.
+If this wallet contains any watchonly scripts, a new wallet will be created which contains those watchonly scripts.
+If this wallet contains any solvable but not watched scripts, a different and new wallet will be created which contains those scripts.
+
+The migration process will create a backup of the wallet before migrating. This backup file will be named &lt;wallet name&gt;-&lt;timestamp&gt;.legacy.bak and can be found in the directory for this wallet. In the event of an incorrect migration, the backup can be restored with the "Restore Wallet" functionality.</source>
+        <translation type="unfinished">Endurinnlesing av mappufílu avritar trygdaravritið til mappuskjáttuna. Upprunaliga fílin verður ikki broytt.
+
+Mappuupstigan formbroytur endurinnlisnu mappuna til eina ella fleiri lyklalýsingar mappur. Neyðugt verður at gera eitt nýtt mapputrygdaravrit.
+Inniheldur mappan eygleiðingarscript, so verður ein nýggj mappa gjørd við teimum eygleiðingarscriptunum.
+Inniheldur mappan loysilig-script, ið ikki eru eygleiðingarscript, so verður ein nýggj mappa gjørd við teimum scriptunum.
+
+Fyrst í uppstiganartilgongdini verður eitt trygdaravrit gjørt, av mappuni.
+Trygdaravritið verður kallað &lt;wallet name&gt;-&lt;timestamp&gt;.legacy.bak og liggur í somu skjáttu sum hendan mappan. Í fall uppstiganin miseydnast, kann trygdaravritið verða endurinnlisið við "Endurinnles mappu" hentleikanum.</translation>
+    </message>
+    <message>
+        <source>Restore Wallet</source>
+        <extracomment>Title of progress window which is displayed when wallets are being restored.</extracomment>
+        <translation type="unfinished">Endurinnles mappu</translation>
+    </message>
+    <message>
+        <source>Restoring Wallet &lt;b&gt;%1&lt;/b&gt;…</source>
+        <extracomment>Descriptive text of the restore wallets progress window which indicates to the user that wallets are currently being restored.</extracomment>
+        <translation type="unfinished">Endurinnlesur mappu &lt;b&gt;%1&lt;/b&gt;...</translation>
+    </message>
+    <message>
+        <source>Migration failed</source>
+        <translation type="unfinished">Uppstiganin miseydnaðist</translation>
+    </message>
+    <message>
+        <source>Migration Successful</source>
+        <translation type="unfinished">Uppstiganin eydnaðist</translation>
+    </message>
+</context>
+<context>
+    <name>OpenWalletActivity</name>
+    <message>
+        <source>Open wallet failed</source>
+        <translation type="unfinished">Mappuinnlesing miseydnaðist</translation>
+    </message>
+    <message>
+        <source>Open wallet warning</source>
+        <translation type="unfinished">Ávaring undir upplating av mappu</translation>
+    </message>
+    <message>
+        <source>Open Wallet</source>
+        <extracomment>Title of window indicating the progress of opening of a wallet.</extracomment>
+        <translation type="unfinished">Innles mappu</translation>
+    </message>
+    <message>
+        <source>Opening Wallet &lt;b&gt;%1&lt;/b&gt;…</source>
+        <extracomment>Descriptive text of the open wallet progress window which indicates to the user which wallet is currently being opened.</extracomment>
+        <translation type="unfinished">Innlesur mappu &lt;b&gt;%1&lt;/b&gt;…</translation>
+    </message>
+</context>
+<context>
+    <name>RestoreWalletActivity</name>
+    <message>
+        <source>Restore Wallet</source>
+        <extracomment>Title of progress window which is displayed when wallets are being restored.</extracomment>
+        <translation type="unfinished">Endurinnles mappu</translation>
+    </message>
+    <message>
+        <source>Restoring Wallet &lt;b&gt;%1&lt;/b&gt;…</source>
+        <extracomment>Descriptive text of the restore wallets progress window which indicates to the user that wallets are currently being restored.</extracomment>
+        <translation type="unfinished">Endurinnlesur mappu &lt;b&gt;%1&lt;/b&gt;...</translation>
+    </message>
+    <message>
+        <source>Restore wallet failed</source>
+        <extracomment>Title of message box which is displayed when the wallet could not be restored.</extracomment>
+        <translation type="unfinished">Endurinnlesing av mappu miseydnaðist</translation>
+    </message>
+    <message>
+        <source>Restore wallet warning</source>
+        <extracomment>Title of message box which is displayed when the wallet is restored with some warning.</extracomment>
+        <translation type="unfinished">Ávaring undir endurinnlesing av mappu</translation>
+    </message>
+    <message>
+        <source>Restore wallet message</source>
+        <extracomment>Title of message box which is displayed when the wallet is successfully restored.</extracomment>
+        <translation type="unfinished">Mappuendurinnlesingin væleydnað</translation>
+    </message>
+</context>
+<context>
+    <name>WalletController</name>
+    <message>
+        <source>Close wallet</source>
+        <translation type="unfinished">Lat mappu aftur</translation>
+    </message>
+    <message>
+        <source>Are you sure you wish to close the wallet &lt;i&gt;%1&lt;/i&gt;?</source>
+        <translation type="unfinished">Ynskir tú at lata &lt;i&gt;%1&lt;/i&gt; mappuna aftur?</translation>
+    </message>
+    <message>
+        <source>Closing the wallet for too long can result in having to resync the entire chain if pruning is enabled.</source>
+        <translation type="unfinished">Er niðurskerjing virkja, og mappan ikki innilisin í longri tíð, kann verða neyðugt at samstilla alla ketuna umaftur.</translation>
+    </message>
+    <message>
+        <source>Close all wallets</source>
+        <translation type="unfinished">Lat allar mappur aftur</translation>
+    </message>
+    <message>
+        <source>Are you sure you wish to close all wallets?</source>
+        <translation type="unfinished">Ynskir tú at lata allar mappurnar aftur?</translation>
+    </message>
+</context>
+<context>
+    <name>CreateWalletDialog</name>
+    <message>
+        <source>Create Wallet</source>
+        <translation type="unfinished">Ger mappu</translation>
+    </message>
+    <message>
+        <source>You are one step away from creating your new wallet!</source>
+        <translation type="unfinished">Eitt stig afturat, til at gera tær tína nýggju mappu!</translation>
+    </message>
+    <message>
+        <source>Please provide a name and, if desired, enable any advanced options</source>
+        <translation type="unfinished">Vinaliga navngev mappuna og, um tú ynskir, virkja eina ella fleiri víðkaða stilling</translation>
+    </message>
+    <message>
+        <source>Wallet Name</source>
+        <translation type="unfinished">Mappunavn</translation>
+    </message>
+    <message>
+        <source>Wallet</source>
+        <translation type="unfinished">Mappa</translation>
+    </message>
+    <message>
+        <source>Encrypt the wallet. The wallet will be encrypted with a passphrase of your choice.</source>
+        <translation type="unfinished">Brongla mappuna. Mappan verður brongla við einum loyniorði ið tú velur.</translation>
+    </message>
+    <message>
+        <source>Encrypt Wallet</source>
+        <translation type="unfinished">Brongla Mappu</translation>
+    </message>
+    <message>
+        <source>Advanced Options</source>
+        <translation type="unfinished">Víðkaðar stillingar</translation>
+    </message>
+    <message>
+        <source>Disable private keys for this wallet. Wallets with private keys disabled will have no private keys and cannot have an HD seed or imported private keys. This is ideal for watch-only wallets.</source>
+        <translation type="unfinished">Óvirkja privatar lyklar fyri mappuna. Mappur, har privatir lyklar eru óvirktir, kunnu hvørki innihalda privatar lyklar ella HD røtur. Til ber heldur ikki at innleggja privatar lyklar, í mappuna, seinni. Hetta er ætlað til eygleiðingarmappur; mappur ið einans kunnu síggja adressur, og tað ið har til hoyrur, men ikki undirrita flytingar og boð.</translation>
+    </message>
+    <message>
+        <source>Disable Private Keys</source>
+        <translation type="unfinished">Óvirkja privatar lyklar</translation>
+    </message>
+    <message>
+        <source>Make a blank wallet. Blank wallets do not initially have private keys or scripts. Private keys and addresses can be imported using descriptors at a later time.</source>
+        <translation type="unfinished">Ger eina tóma mappu. At byrja við innihalda tómar mappur ikki privatar lyklar ella script. Privatir lyklar og adressur kunnu innleggjast seinni við lyklalýsingun.</translation>
+    </message>
+    <message>
+        <source>Make Blank Wallet</source>
+        <translation type="unfinished">Ger tóma mappu</translation>
+    </message>
+    <message>
+        <source>Use an external signing device such as a hardware wallet. Configure the external signer script in wallet preferences first.</source>
+        <translation type="unfinished">Nýt eina ytri undirritaraeind so sum eina tólbúnaðarmappu. Áset skejlarrit, tilhoyrandi ytra undirritaran, í Stillingar-&gt;Mappa, áðrenn.</translation>
+    </message>
+    <message>
+        <source>External signer</source>
+        <translation type="unfinished">Ytri undirritara</translation>
+    </message>
+    <message>
+        <source>Create</source>
+        <translation type="unfinished">Ger</translation>
+    </message>
+    <message>
+        <source>Compiled without external signing support (required for external signing)</source>
+        <extracomment>"External signing" means using devices such as hardware wallets.</extracomment>
+        <translation type="unfinished">Týtt uttan ytri-undirritaranarfunku (neyðug fyri ytri-undirritan)</translation>
+    </message>
+</context>
+<context>
+    <name>EditAddressDialog</name>
+    <message>
+        <source>Edit Address</source>
+        <translation type="unfinished">Broyt adressu</translation>
+    </message>
+    <message>
+        <source>&amp;Label</source>
+        <translation type="unfinished">&amp;Spjaldur</translation>
+    </message>
+    <message>
+        <source>The label associated with this address list entry</source>
+        <translation type="unfinished">Spjaldrið knýtt at hesi adressuni í adressuskránni</translation>
+    </message>
+    <message>
+        <source>The address associated with this address list entry. This can only be modified for sending addresses.</source>
+        <translation type="unfinished">Adressan knýtt at hesi skráseting í adressuskránni. Teigurin kann einans broytast fyri útgjaldsadressur.</translation>
+    </message>
+    <message>
+        <source>&amp;Address</source>
+        <translation type="unfinished">&amp;Adressa</translation>
+    </message>
+    <message>
+        <source>New sending address</source>
+        <translation type="unfinished">Nýggja útgjaldsadressu</translation>
+    </message>
+    <message>
+        <source>Edit receiving address</source>
+        <translation type="unfinished">Broyt inngjaldsadressu</translation>
+    </message>
+    <message>
+        <source>Edit sending address</source>
+        <translation type="unfinished">Broyt útgjaldsadressu</translation>
+    </message>
+    <message>
+        <source>The entered address "%1" is not a valid Bitcoin address.</source>
+        <translation type="unfinished">Inntøppaða adressan "%1" er ikki ein gildig Bitcoin adressa.</translation>
+    </message>
+    <message>
+        <source>Address "%1" already exists as a receiving address with label "%2" and so cannot be added as a sending address.</source>
+        <translation type="unfinished">Adressan "%1" finst longu sum ein adressa í egnari mappu, við spjaldrinum "%2". Tí kann hon ikki leggjast í adressubókina sum ein útgjaldsadressa.</translation>
+    </message>
+    <message>
+        <source>The entered address "%1" is already in the address book with label "%2".</source>
+        <translation type="unfinished">Inntøppaða adressan "%1" er longu í adressubókini við spjaldrinum "%2".</translation>
+    </message>
+    <message>
+        <source>Could not unlock wallet.</source>
+        <translation type="unfinished">Til bar ikki at lata mappu upp.</translation>
+    </message>
+    <message>
+        <source>New key generation failed.</source>
+        <translation type="unfinished">Miseydnaðist at framleiða nýggjan almennan lykil</translation>
+    </message>
+</context>
+<context>
+    <name>FreespaceChecker</name>
+    <message>
+        <source>A new data directory will be created.</source>
+        <translation type="unfinished">Ein nýggj dátuskjátta verður gjørd.</translation>
+    </message>
+    <message>
+        <source>name</source>
+        <translation type="unfinished">navn</translation>
+    </message>
+    <message>
+        <source>Directory already exists. Add %1 if you intend to create a new directory here.</source>
+        <translation type="unfinished">Skjáttan finst longu. Legg %1 afturat um ætlanin er at gera eina nýggja skjáttu her.</translation>
+    </message>
+    <message>
+        <source>Path already exists, and is not a directory.</source>
+        <translation type="unfinished">Leiðin finst longu og er ikki ein skjátta.</translation>
+    </message>
+    <message>
+        <source>Cannot create data directory here.</source>
+        <translation type="unfinished">Ber ikki til at stovna dátuskjáttu her.</translation>
+    </message>
+</context>
+<context>
+    <name>HelpMessageDialog</name>
+    <message>
+        <source>version</source>
+        <translation type="unfinished">útgáva</translation>
+    </message>
+    <message>
+        <source>About %1</source>
+        <translation type="unfinished">Um %1</translation>
+    </message>
+    <message>
+        <source>Command-line options</source>
+        <translation type="unfinished">Stýriboð-linju møguleikar</translation>
+    </message>
+</context>
+<context>
+    <name>ShutdownWindow</name>
+    <message>
+        <source>%1 is shutting down…</source>
+        <translation type="unfinished">%1 letur aftur…</translation>
+    </message>
+    <message>
+        <source>Do not shut down the computer until this window disappears.</source>
+        <translation type="unfinished">Ikki sløkkja telduna áðrenn hesin gluggin er horvin.</translation>
+    </message>
+</context>
+<context>
+    <name>Intro</name>
+    <message>
+        <source>Welcome</source>
+        <translation type="unfinished">Vælkomin</translation>
+    </message>
+    <message>
+        <source>Welcome to %1.</source>
+        <translation type="unfinished">Vælkomin til %1.</translation>
+    </message>
+    <message>
+        <source>As this is the first time the program is launched, you can choose where %1 will store its data.</source>
+        <translation type="unfinished">Av tí at hetta er fyrsta koyring, av forritinum, verður tú spurd(ur) um hvar %1 skal goyma sínar dátur.</translation>
+    </message>
+    <message>
+        <source>Limit block chain storage to</source>
+        <translation type="unfinished">Avmarka blokkketu goymslu til</translation>
+    </message>
+    <message>
+        <source>Reverting this setting requires re-downloading the entire blockchain. It is faster to download the full chain first and prune it later. Disables some advanced features.</source>
+        <translation type="unfinished">Eftir ásetingin er broytt er eyðugt at niðurtakað alla blokkketuna umaftur. Tað er skjótari at niðurtakað alla ketuna fyrst, og síðani niðurskerja hana aftaná. Hetta óvirkjar nakrar víðkaðar møgulleikar.</translation>
+    </message>
+    <message>
+        <source> GB</source>
+        <translation type="unfinished">GB</translation>
+    </message>
+    <message>
+        <source>This initial synchronisation is very demanding, and may expose hardware problems with your computer that had previously gone unnoticed. Each time you run %1, it will continue downloading where it left off.</source>
+        <translation type="unfinished">Hendan innleiðandi samstillanin er sera krevjandi, og kann avdúka trupulleikar, við tólbúnaðinum í teldu tíni, ið tú annars ikki hevur varnast. Niðurtøkan heldur áfram, hvørja ferð %1 verður koyrt.</translation>
+    </message>
+    <message>
+        <source>When you click OK, %1 will begin to download and process the full %4 block chain (%2 GB) starting with the earliest transactions in %3 when %4 initially launched.</source>
+        <translation type="unfinished">Eftir at tú trýstur á Góðkenn, fer %1 undir niðurtøku og váttanarviðgerð av allari %4 blokkketuni (%2 GB). Byrja verður við fyrstu flytingunum í %3 tá %4  var sjósett.</translation>
+    </message>
+    <message>
+        <source>If you have chosen to limit block chain storage (pruning), the historical data must still be downloaded and processed, but will be deleted afterward to keep your disk usage low.</source>
+        <translation type="unfinished">Hevur tú valt at avmarka blokkketu goymslu (niðurskerjing), verða søguligu dáturnar tiknar niður og viðgjørdar, men verða síðani strikaðar fyri at minka um nýtslu av diskplássinum.</translation>
+    </message>
+    <message>
+        <source>Use the default data directory</source>
+        <translation type="unfinished">Nýt forsettu-dátuskjáttuna</translation>
+    </message>
+    <message>
+        <source>Use a custom data directory:</source>
+        <translation type="unfinished">Nýtaraásett dátuskjátta:</translation>
+    </message>
+    <message numerus="yes">
+        <source>%n GB of space available</source>
+        <translation type="unfinished">
+            <numerusform>%n GB av goymsluplássi tøkt</numerusform>
+            <numerusform>%n GB av goymsluplássi tøkt</numerusform>
+        </translation>
+    </message>
+    <message numerus="yes">
+        <source>(of %n GB needed)</source>
+        <translation type="unfinished">
+            <numerusform>(av %n GB ið tørvur er á)</numerusform>
+            <numerusform>(av %n GB ið tørvur er á)</numerusform>
+        </translation>
+    </message>
+    <message numerus="yes">
+        <source>(%n GB needed for full chain)</source>
+        <translation type="unfinished">
+            <numerusform>(tørvur er á %n GB fyri alla ketuna)</numerusform>
+            <numerusform>(tørvur er á %n GB fyri alla ketuna)</numerusform>
+        </translation>
+    </message>
+    <message>
+        <source>Choose data directory</source>
+        <translation type="unfinished">Vel dátuskjáttu</translation>
+    </message>
+    <message>
+        <source>At least %1 GB of data will be stored in this directory, and it will grow over time.</source>
+        <translation type="unfinished">Í minsta lagið %1 GB av dátum verða lagdar í skjáttuna, og tær økjast sum tíðin líður.</translation>
+    </message>
+    <message>
+        <source>Approximately %1 GB of data will be stored in this directory.</source>
+        <translation type="unfinished">Á leið %1 GB av dátum verða lagdar í hesa skjáttuna.</translation>
+    </message>
+    <message numerus="yes">
+        <source>(sufficient to restore backups %n day(s) old)</source>
+        <extracomment>Explanatory text on the capability of the current prune target.</extracomment>
+        <translation type="unfinished">
+            <numerusform>(nøktandi at endurinnlesa %n dag gamalt trygdaravrit)</numerusform>
+            <numerusform>(nøktandi at endurinnlesa %n dagar gomul trygdaravrit)</numerusform>
+        </translation>
+    </message>
+    <message>
+        <source>%1 will download and store a copy of the Bitcoin block chain.</source>
+        <translation type="unfinished">%1 tekur niður og goymir eitt avrit av Bitcoin blokkketuni.</translation>
+    </message>
+    <message>
+        <source>The wallet will also be stored in this directory.</source>
+        <translation type="unfinished">Mappan verður eisini løgd í hesa skjáttuna.</translation>
+    </message>
+    <message>
+        <source>Error: Specified data directory "%1" cannot be created.</source>
+        <translation type="unfinished">Villa: Ber ikki til at stovnað ásettu dátuskjáttuna "%1".</translation>
+    </message>
+    <message>
+        <source>Error</source>
+        <translation type="unfinished">Villa</translation>
+    </message>
+</context>
+<context>
+    <name>ModalOverlay</name>
+    <message>
+        <source>Form</source>
+        <translation type="unfinished">Formil</translation>
+    </message>
+    <message>
+        <source>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.</source>
+        <translation type="unfinished">Nýggjari flytingar eru enn ókendar, og tí kann vísta saldan, á mappuni, vera óeftirfarandi. Kunningin gerst tíðarhóskandi tá tín knútur er samstillaður við bitcoin netið; nágreina niðanfyri.</translation>
+    </message>
+    <message>
+        <source>Attempting to spend bitcoins that are affected by not-yet-displayed transactions will not be accepted by the network.</source>
+        <translation type="unfinished">Netið góðtekur ikki nýtslu av bitcoins, ið hesin knúturin ikki enn hevur kunnleika til og harvið ikki vera vístar.</translation>
+    </message>
+    <message>
+        <source>Number of blocks left</source>
+        <translation type="unfinished">Írestandi blokkar</translation>
+    </message>
+    <message>
+        <source>Unknown…</source>
+        <translation type="unfinished">Ókend…</translation>
+    </message>
+    <message>
+        <source>calculating…</source>
+        <translation type="unfinished">útroknar…</translation>
+    </message>
+    <message>
+        <source>Last block time</source>
+        <translation type="unfinished">Tíð fyri seinasta blokk</translation>
+    </message>
+    <message>
+        <source>Progress</source>
+        <translation type="unfinished">Framgongd</translation>
+    </message>
+    <message>
+        <source>Progress increase per hour</source>
+        <translation type="unfinished">Framgongd um tíman</translation>
+    </message>
+    <message>
+        <source>Estimated time left until synced</source>
+        <translation type="unfinished">Mett tíð til fulla samstillan</translation>
+    </message>
+    <message>
+        <source>Hide</source>
+        <translation type="unfinished">Loka</translation>
+    </message>
+    <message>
+        <source>%1 is currently syncing.  It will download headers and blocks from peers and validate them until reaching the tip of the block chain.</source>
+        <translation type="unfinished">%1 samstillar í løtuni. Tað tekur niður og váttar blokkhøvd og blokkar, frá javningum; fram til endan á blokkketuni.</translation>
+    </message>
+    <message>
+        <source>Unknown. Syncing Headers (%1, %2%)…</source>
+        <translation type="unfinished">Ókent. Samstillar blokkhøvd (%1, %2%)…</translation>
+    </message>
+    <message>
+        <source>Unknown. Pre-syncing Headers (%1, %2%)…</source>
+        <translation type="unfinished">Ókent. Undan-samstillar blokkhøvd (%1, %2%)…</translation>
+    </message>
+</context>
+<context>
+    <name>OpenURIDialog</name>
+    <message>
+        <source>Open bitcoin URI</source>
+        <translation type="unfinished">Innles bitcoin URI</translation>
+    </message>
+    <message>
+        <source>Paste address from clipboard</source>
+        <extracomment>Tooltip text for button that allows you to paste an address that is in your clipboard.</extracomment>
+        <translation type="unfinished">Innset adressu av setiborði</translation>
+    </message>
+</context>
+<context>
+    <name>OptionsDialog</name>
+    <message>
+        <source>Options</source>
+        <translation type="unfinished">Stillingar</translation>
+    </message>
+    <message>
+        <source>&amp;Main</source>
+        <translation type="unfinished">&amp;Høvuðs</translation>
+    </message>
+    <message>
+        <source>Automatically start %1 after logging in to the system.</source>
+        <translation type="unfinished">Koyr %1 sjálvvirkandi eftir innritan á stýrikervið.</translation>
+    </message>
+    <message>
+        <source>&amp;Start %1 on system login</source>
+        <translation type="unfinished">&amp;Koyr %1 eftir innritan á stýrikervi.</translation>
+    </message>
+    <message>
+        <source>Enabling pruning significantly reduces the disk space required to store transactions. All blocks are still fully validated. Reverting this setting requires re-downloading the entire blockchain.</source>
+        <translation type="unfinished">Niðurskerjing lækkar munandi um goymsluplássið ið tørvur er á at goyma flytingar. Allir blokkar verða framvegis váttaðir. Eftir ásetingin er broytt er eyðugt at niðurtakað alla blokkketuna umaftur.</translation>
+    </message>
+    <message>
+        <source>Maximum database cache size. Make sure you have enough RAM. A larger cache can contribute to faster sync, after which the benefit is less pronounced for most use cases. Lowering the cache size will reduce memory usage. Unused mempool memory is shared for this cache.</source>
+        <extracomment>Tooltip text for Options window setting that sets the size of the database cache. Explains the corresponding effects of increasing/decreasing this value.</extracomment>
+        <translation type="unfinished">Støddarmark á dátugrunnkova. Syrg fyri at teldan hevur nokk av RAM. Ein stórri kovi kann skunda undir samstillan, men, í flestu nýtsludømum, eru eingir aðrir nevniverdir ágóðar. At lækka stóddina á kovanum minkar um ritminnisnýtsluna. Óbrúkt minnispuljuminni er deilt til hendan kovan.</translation>
+    </message>
+    <message>
+        <source>Size of &amp;database cache</source>
+        <translation type="unfinished">Stødd &amp;dátugrunnskova</translation>
+    </message>
+    <message>
+        <source>Number of script &amp;verification threads</source>
+        <translation type="unfinished">Script-&amp;váttanartræðrir</translation>
+    </message>
+    <message>
+        <source>Full path to a %1 compatible script (e.g. C:\Downloads\hwi.exe or /Users/you/Downloads/hwi.py). Beware: malware can steal your coins!</source>
+        <translation type="unfinished">Fullfíggja leið til eitt %1 sínamillumvirki skeljarrit (t.d. C:\Downloads\hwi.exe ella /Users/you/Downloads/hwi.py). Gev gætur: Illbúnaður kann stjala tín pening!</translation>
+    </message>
+    <message>
+        <source>Automatically open the Bitcoin client port on the router. This only works when your router supports PCP or NAT-PMP and it is enabled. The external port could be random.</source>
+        <translation type="unfinished">Sjálvvirkandi upplating av Bitcoin viðskiftara portrið á beinaranum. Hetta virkar bert um tín beinari hevur virktan PCP ella NAT-PMP hentleika. Ytra portrið kann vera tilvildarligt.</translation>
+    </message>
+    <message>
+        <source>Map port using PCP or NA&amp;T-PMP</source>
+        <translation type="unfinished">&amp;Kortlegg portur við PCP ella NAT-PMP</translation>
+    </message>
+    <message>
+        <source>IP address of the proxy (e.g. IPv4: 127.0.0.1 / IPv6: ::1)</source>
+        <translation type="unfinished">IP-atsetur á proxy'inum (t.d. IPv4: 127.0.0.1 / IPv6: ::1)</translation>
+    </message>
+    <message>
+        <source>Shows if the supplied default SOCKS5 proxy is used to reach peers via this network type.</source>
+        <translation type="unfinished">Vísur um ásetti SOCKS5 proxy'in er brúktur at sambinda við javningar umvegis hetta slagið av neti.</translation>
+    </message>
+    <message>
+        <source>Minimize instead of exit the application when the window is closed. When this option is enabled, the application will be closed only after selecting Exit in the menu.</source>
+        <translation type="unfinished">Minsta ístaðin fyri at slókkja forritið aftur tá vindeyga verður latið aftur. Tá stillingin er virkt kann forritið bert slókkjast við at velja "Lat aftur" Fíla valmyndini.</translation>
+    </message>
+    <message>
+        <source>Font in the Overview tab: </source>
+        <translation type="unfinished">Stavsnið undir Yvirlit skiljiblaðnum:</translation>
+    </message>
+    <message>
+        <source>Options set in this dialog are overridden by the command line:</source>
+        <translation type="unfinished">Stillingar ásettir umvegis stýriboð-linjuna ið hava hæggri raðfesting enn teir í hesum markamótinum:</translation>
+    </message>
+    <message>
+        <source>Open the %1 configuration file from the working directory.</source>
+        <translation type="unfinished">Lat upp uppsetanarfíluna, %1, úr verkskjáttuni.</translation>
+    </message>
+    <message>
+        <source>Open Configuration File</source>
+        <translation type="unfinished">Lat upp uppsetanarfílu</translation>
+    </message>
+    <message>
+        <source>Reset all client options to default.</source>
+        <translation type="unfinished">Endurset allar viðskiftarastillingar til forsettar.</translation>
+    </message>
+    <message>
+        <source>&amp;Reset Options</source>
+        <translation type="unfinished">&amp;Endurset stillingar</translation>
+    </message>
+    <message>
+        <source>&amp;Network</source>
+        <translation type="unfinished">&amp;Net</translation>
+    </message>
+    <message>
+        <source>Prune &amp;block storage to</source>
+        <translation type="unfinished">&amp;Niðursker blokkgoymslu til</translation>
+    </message>
+    <message>
+        <source>Reverting this setting requires re-downloading the entire blockchain.</source>
+        <translation type="unfinished">Eftir ásetingin er broytt er eyðugt at niðurtakað alla blokkketuna umaftur.</translation>
+    </message>
+    <message>
+        <source>Set the number of script verification threads. Negative values correspond to the number of cores you want to leave free to the system.</source>
+        <extracomment>Tooltip text for Options window setting that sets the number of script verification threads. Explains that negative values mean to leave these many cores free to the system.</extracomment>
+        <translation type="unfinished">Ásetur tal av script-váttanartræðrum. Negativ virði svarað til absolutta tali av kjarnum ið skulu verða tøkar til stýrikervið.</translation>
+    </message>
+    <message>
+        <source>(0 = auto, &lt;0 = leave that many cores free)</source>
+        <translation type="unfinished">(0 = sjálvvirkandi, &lt;0 = tal av tøkum kjarnum)</translation>
+    </message>
+    <message>
+        <source>This allows you or a third party tool to communicate with the node through command-line and JSON-RPC commands.</source>
+        <extracomment>Tooltip text for Options window setting that enables the RPC server.</extracomment>
+        <translation type="unfinished">Loyvir tær ella einum 3. part amboði at samskifta við knútin umvegis stýriboð-linju og JSON-RPC stýriboð.</translation>
+    </message>
+    <message>
+        <source>Enable R&amp;PC server</source>
+        <extracomment>An Options window setting to enable the RPC server.</extracomment>
+        <translation type="unfinished">Virkja &amp;RPC ambætara</translation>
+    </message>
+    <message>
+        <source>W&amp;allet</source>
+        <translation type="unfinished">&amp;Mappa</translation>
+    </message>
+    <message>
+        <source>Whether to set subtract fee from amount as default or not.</source>
+        <extracomment>Tooltip text for Options window setting that sets subtracting the fee from a sending amount as default.</extracomment>
+        <translation type="unfinished">Um flugubein skal verða forsett í "Draga avgjald frá upphædd", tá sendandi flyting verður fyrireika.</translation>
+    </message>
+    <message>
+        <source>Subtract &amp;fee from amount by default</source>
+        <extracomment>An Options window setting to set subtracting the fee from a sending amount as default.</extracomment>
+        <translation type="unfinished">Forsett &amp;avgjaldsfrádraging frá upphæddum at senda</translation>
+    </message>
+    <message>
+        <source>Expert</source>
+        <translation type="unfinished">Serkønar</translation>
+    </message>
+    <message>
+        <source>Enable coin &amp;control features</source>
+        <translation type="unfinished">Vís mynt-&amp;val møgulleikar</translation>
+    </message>
+    <message>
+        <source>If you disable the spending of unconfirmed change, the change from a transaction cannot be used until that transaction has at least one confirmation. This also affects how your balance is computed.</source>
+        <translation type="unfinished">Frávelur tú møgulleikan, at nýta óváttaðan vekslipening, kann vekslipeningurin ikki nýtast fyrr enn tann flytingin hevur í minsta lagið eina váttan. Hetta ávirkar eisini hvussu tín salda verður útroknað.</translation>
+    </message>
+    <message>
+        <source>&amp;Spend unconfirmed change</source>
+        <translation type="unfinished">&amp;Nýt óváttaðan vekslipening</translation>
+    </message>
+    <message>
+        <source>Enable &amp;PSBT controls</source>
+        <extracomment>An options window setting to enable PSBT controls.</extracomment>
+        <translation type="unfinished">Vís &amp;PSBT møgulleikar</translation>
+    </message>
+    <message>
+        <source>Whether to show PSBT controls.</source>
+        <extracomment>Tooltip text for options window setting that enables PSBT controls.</extracomment>
+        <translation type="unfinished">Um møgulleikar, fyri at partvís undirritað flytingar, eru sjónligir ella ikki.</translation>
+    </message>
+    <message>
+        <source>External Signer (e.g. hardware wallet)</source>
+        <translation type="unfinished">Ytri undirritari (t.d. tólbúnaðarmappa)</translation>
+    </message>
+    <message>
+        <source>&amp;External signer script path</source>
+        <translation type="unfinished">Leið til skeljarrit tilhoyrandi ytri undirritara</translation>
+    </message>
+    <message>
+        <source>Accept connections from outside.</source>
+        <translation type="unfinished">Loyv inngangandi sambondum uttanífrá.</translation>
+    </message>
+    <message>
+        <source>Allow incomin&amp;g connections</source>
+        <translation type="unfinished">Loyv &amp;inngangandi sambondum</translation>
+    </message>
+    <message>
+        <source>Connect to the Bitcoin network through a SOCKS5 proxy.</source>
+        <translation type="unfinished">Sambind við Bitcoin netið umvegis ein SOCKS5 proxy.</translation>
+    </message>
+    <message>
+        <source>&amp;Connect through SOCKS5 proxy (default proxy):</source>
+        <translation type="unfinished">&amp;Sambind umvegis forsettan SOCKS5 proxy:</translation>
+    </message>
+    <message>
+        <source>&amp;Port:</source>
+        <translation type="unfinished">&amp;Portur:</translation>
+    </message>
+    <message>
+        <source>Port of the proxy (e.g. 9050)</source>
+        <translation type="unfinished">Proxy portur (t.d. 9050)</translation>
+    </message>
+    <message>
+        <source>Used for reaching peers via:</source>
+        <translation type="unfinished">Brúka proxy'in at røkka javningum umvegis:</translation>
+    </message>
+    <message>
+        <source>&amp;Window</source>
+        <translation type="unfinished">&amp;Gluggi</translation>
+    </message>
+    <message>
+        <source>Show the icon in the system tray.</source>
+        <translation type="unfinished">Vís ímyndina í stýrikervistøðuteiginum.</translation>
+    </message>
+    <message>
+        <source>&amp;Show tray icon</source>
+        <translation type="unfinished">&amp;Vís ímynd í kervistøðuteiginum</translation>
+    </message>
+    <message>
+        <source>Show only a tray icon after minimizing the window.</source>
+        <translation type="unfinished">Vís bert ímynd í kervistøðuteiginum, eftir at gluggi er minstaður.</translation>
+    </message>
+    <message>
+        <source>&amp;Minimize to the tray instead of the taskbar</source>
+        <translation type="unfinished">&amp;Minsta til kervistøðuteigin heldur enn uppgávuteigin</translation>
+    </message>
+    <message>
+        <source>M&amp;inimize on close</source>
+        <translation type="unfinished">M&amp;insta ístaðin fyri at slókkja</translation>
+    </message>
+    <message>
+        <source>&amp;Display</source>
+        <translation type="unfinished">&amp;Sýning</translation>
+    </message>
+    <message>
+        <source>User Interface &amp;language:</source>
+        <translation type="unfinished">Nýtaramóts&amp;mál:</translation>
+    </message>
+    <message>
+        <source>The user interface language can be set here. This setting will take effect after restarting %1.</source>
+        <translation type="unfinished">Her kann nýtaramótsmál tilskilast. Stillingin fær virknað næstu ferð %1 byrjar.</translation>
+    </message>
+    <message>
+        <source>&amp;Unit to show amounts in:</source>
+        <translation type="unfinished">&amp;Eind, ið upphæddir verða vístar í:</translation>
+    </message>
+    <message>
+        <source>Choose the default subdivision unit to show in the interface and when sending coins.</source>
+        <translation type="unfinished">Vel forsettu eindina fyri upphæddir vístar í markamótinum, umframt tá myntir skulu sendast.</translation>
+    </message>
+    <message>
+        <source>Third-party URLs (e.g. a block explorer) that appear in the transactions tab as context menu items. %s in the URL is replaced by transaction hash. Multiple URLs are separated by vertical bar |.</source>
+        <translation type="unfinished">URL'ir, ið vísa til ytri skipanir, (t.d. blokk-sjóneykur), undir Flytingar-skiljiblaðnum, sum snarvegir á hvørjari flyting. %s í URL'inum verður skift út við flytingar hashið. Um fleiri URL'ar skulu tilskilast, skulu teir sundurskiljast við lodrøttu strikuni |.</translation>
+    </message>
+    <message>
+        <source>&amp;Third-party transaction URLs</source>
+        <translation type="unfinished">&amp;Triðjaparts flytingar-URLir</translation>
+    </message>
+    <message>
+        <source>Whether to show coin control features or not.</source>
+        <translation type="unfinished">Um mynt-val møgulleikin er sjónligur ella ikki.</translation>
+    </message>
+    <message>
+        <source>Connect to the Bitcoin network through a separate SOCKS5 proxy for Tor onion services.</source>
+        <translation type="unfinished">Sambind við Bitcoin netið umvegis ein serstakan SOCKS5 proxy, til at røkka Tor-onion-tænastum.</translation>
+    </message>
+    <message>
+        <source>Use separate SOCKS&amp;5 proxy to reach peers via Tor onion services:</source>
+        <translation type="unfinished">Nýt serstakan SOCKS&amp;5 proxy at røkka javningar á Tor onion tænastum:</translation>
+    </message>
+    <message>
+        <source>&amp;OK</source>
+        <translation type="unfinished">&amp;Góðkenn</translation>
+    </message>
+    <message>
+        <source>&amp;Cancel</source>
+        <translation type="unfinished">&amp;Ógilda</translation>
+    </message>
+    <message>
+        <source>Compiled without external signing support (required for external signing)</source>
+        <extracomment>"External signing" means using devices such as hardware wallets.</extracomment>
+        <translation type="unfinished">Týtt uttan ytri-undirritaranarfunku (neyðug fyri ytri-undirritan)</translation>
+    </message>
+    <message>
+        <source>default</source>
+        <translation type="unfinished">forsett</translation>
+    </message>
+    <message>
+        <source>none</source>
+        <translation type="unfinished">ongar</translation>
+    </message>
+    <message>
+        <source>Confirm options reset</source>
+        <extracomment>Window title text of pop-up window shown when the user has chosen to reset options.</extracomment>
+        <translation type="unfinished">Vátta endursetan av stillingum</translation>
+    </message>
+    <message>
+        <source>Client restart required to activate changes.</source>
+        <extracomment>Text explaining that the settings changed will not come into effect until the client is restarted.</extracomment>
+        <translation type="unfinished">Endurbyrjan av viðskiftara kravd fyri at virkja broyting(ar).</translation>
+    </message>
+    <message>
+        <source>Current settings will be backed up at "%1".</source>
+        <extracomment>Text explaining to the user that the client's current settings will be backed up at a specific location. %1 is a stand-in argument for the backup location's path.</extracomment>
+        <translation type="unfinished">Avrit av verandi stillingum verður lagt í "%1".</translation>
+    </message>
+    <message>
+        <source>Client will be shut down. Do you want to proceed?</source>
+        <extracomment>Text asking the user to confirm if they would like to proceed with a client shutdown.</extracomment>
+        <translation type="unfinished">Viðskiftari verður slóktur. Ynskir tú at halda áfram?</translation>
+    </message>
+    <message>
+        <source>Configuration options</source>
+        <extracomment>Window title text of pop-up box that allows opening up of configuration file.</extracomment>
+        <translation type="unfinished">Uppsetanarstillingar</translation>
+    </message>
+    <message>
+        <source>The configuration file is used to specify advanced user options which override GUI settings. Additionally, any command-line options will override this configuration file.</source>
+        <extracomment>Explanatory text about the priority order of instructions considered by client. The order from high to low being: command-line, configuration file, GUI settings.</extracomment>
+        <translation type="unfinished">Uppsetanarfílin tilskilar víðkaðar brúkarastillingar og hevur hæggri raðfesting enn stillingar ásettar í nýtslumarkamótinum. Harumframt hava stýriboð-linju ávirki hæggri raðfesting enn ein slík uppsetanarfíl.</translation>
+    </message>
+    <message>
+        <source>Continue</source>
+        <translation type="unfinished">Hald áfram</translation>
+    </message>
+    <message>
+        <source>Cancel</source>
+        <translation type="unfinished">Ógilda</translation>
+    </message>
+    <message>
+        <source>Error</source>
+        <translation type="unfinished">Villa</translation>
+    </message>
+    <message>
+        <source>The configuration file could not be opened.</source>
+        <translation type="unfinished">Innlesing av uppsetanarfílu miseydnaðist.</translation>
+    </message>
+    <message>
+        <source>This change would require a client restart.</source>
+        <translation type="unfinished">Broytingin krevur endurbyrjan av viðskiftaranum.</translation>
+    </message>
+    <message>
+        <source>The supplied proxy address is invalid.</source>
+        <translation type="unfinished">Inntøppaða proxy-atsetrið er ógildigt.</translation>
+    </message>
+</context>
+<context>
+    <name>OptionsModel</name>
+    <message>
+        <source>Could not read setting "%1", %2.</source>
+        <translation type="unfinished">Fekk ikki lisið stilling "%1", %2.</translation>
+    </message>
+</context>
+<context>
+    <name>OverviewPage</name>
+    <message>
+        <source>Form</source>
+        <translation type="unfinished">Formil</translation>
+    </message>
+    <message>
+        <source>The displayed information may be out of date. Your wallet automatically synchronizes with the Bitcoin network after a connection is established, but this process has not completed yet.</source>
+        <translation type="unfinished">Vísta kunningin kann vera ótíðarhóskandi. Tín knútur samstillar við Bitcoin netið, sjálvvirkandi, eftir at samband er fingið við tað; men tann tilgongdin er ikki liðug enn.</translation>
+    </message>
+    <message>
+        <source>Available:</source>
+        <translation type="unfinished">Tøk:</translation>
+    </message>
+    <message>
+        <source>Your current spendable balance</source>
+        <translation type="unfinished">Tín tøka salda</translation>
+    </message>
+    <message>
+        <source>Pending:</source>
+        <translation type="unfinished">Óváttað:</translation>
+    </message>
+    <message>
+        <source>Total of transactions that have yet to be confirmed, and do not yet count toward the spendable balance</source>
+        <translation type="unfinished">Samlað upphædd av óváttaðum flytingum, ið tí enn ikki verður roknað sum tøk saldo.</translation>
+    </message>
+    <message>
+        <source>Immature:</source>
+        <translation type="unfinished">Óbúgvin:</translation>
+    </message>
+    <message>
+        <source>Mined balance that has not yet matured</source>
+        <translation type="unfinished">Útvunnin upphædd ið ikki er búgvin enn</translation>
+    </message>
+    <message>
+        <source>Balances</source>
+        <translation type="unfinished">Saldur</translation>
+    </message>
+    <message>
+        <source>Total:</source>
+        <translation type="unfinished">Heildarupphædd:</translation>
+    </message>
+    <message>
+        <source>Your current total balance</source>
+        <translation type="unfinished">Tín samlaða salda</translation>
+    </message>
+    <message>
+        <source>Recent transactions</source>
+        <translation type="unfinished">Seinastu flytingar</translation>
+    </message>
+    <message>
+        <source>Privacy mode activated for the Overview tab. To unmask the values, uncheck Settings-&gt;Mask values.</source>
+        <translation type="unfinished">Loyndarstøða virkja fyri Yvirlit skiljiblaðið. Skift Stillingar-&gt;Fjal upphæddir fyri at avdúka upphæddirnar.</translation>
+    </message>
+</context>
+<context>
+    <name>PSBTOperationsDialog</name>
+    <message>
+        <source>PSBT Operations</source>
+        <translation type="unfinished">PSBT viðgerðir</translation>
+    </message>
+    <message>
+        <source>Sign Tx</source>
+        <translation type="unfinished">Undirrita flyting</translation>
+    </message>
+    <message>
+        <source>Broadcast Tx</source>
+        <translation type="unfinished">Útvarpa flyting</translation>
+    </message>
+    <message>
+        <source>Copy to Clipboard</source>
+        <translation type="unfinished">Avrita á setiborð</translation>
+    </message>
+    <message>
+        <source>Save…</source>
+        <translation type="unfinished">Goym...</translation>
+    </message>
+    <message>
+        <source>Close</source>
+        <translation type="unfinished">Lat aftur</translation>
+    </message>
+    <message>
+        <source>Failed to load transaction: %1</source>
+        <translation type="unfinished">Miseydnaðist at innlesa flyting: %1</translation>
+    </message>
+    <message>
+        <source>Failed to sign transaction: %1</source>
+        <translation type="unfinished">Flytingarundirritan miseydnaðist: %1</translation>
+    </message>
+    <message>
+        <source>Cannot sign inputs while wallet is locked.</source>
+        <translation type="unfinished">Fær ikki undirrita inntøk meðan mappan er løst.</translation>
+    </message>
+    <message>
+        <source>Could not sign any more inputs.</source>
+        <translation type="unfinished">Fekk ikki undirrita fleiri inntøk.</translation>
+    </message>
+    <message numerus="yes">
+        <source>Signed %n input(s), but more signatures are still required.</source>
+        <translation type="unfinished">
+            <numerusform>Undirritaði %n inntak, men tørvur er á fleiri undirskriftum.</numerusform>
+            <numerusform>Undirritaði %n inntøk, men tørvur er á fleiri undirskriftum.</numerusform>
+        </translation>
+    </message>
+    <message>
+        <source>Signed transaction successfully. Transaction is ready to broadcast.</source>
+        <translation type="unfinished">Undirritan av flyting eydnaðist. Flytingin er klár at útvarpa.</translation>
+    </message>
+    <message>
+        <source>Unknown error processing transaction.</source>
+        <translation type="unfinished">Ókend villa undir viðgerð av flyting.</translation>
+    </message>
+    <message>
+        <source>Transaction broadcast successfully! Transaction ID: %1</source>
+        <translation type="unfinished">Eydnaðist at útvarpa flytingina! Flytingareyðmerki: %1</translation>
+    </message>
+    <message>
+        <source>Transaction broadcast failed: %1</source>
+        <translation type="unfinished">Flytingarútvarping miseydnaðist: %1</translation>
+    </message>
+    <message>
+        <source>PSBT copied to clipboard.</source>
+        <translation type="unfinished">PSBT avritað á setiborð.</translation>
+    </message>
+    <message>
+        <source>Save Transaction Data</source>
+        <translation type="unfinished">Goym flytingardátur</translation>
+    </message>
+    <message>
+        <source>Partially Signed Transaction (Binary)</source>
+        <extracomment>Expanded name of the binary PSBT file format. See: BIP 174.</extracomment>
+        <translation type="unfinished">Partvís Undirritað Flyting (Tvítalskotað)</translation>
+    </message>
+    <message>
+        <source>PSBT saved to disk.</source>
+        <translation type="unfinished">PSBT goymt á diski.</translation>
+    </message>
+    <message>
+        <source>Sends %1 to %2</source>
+        <translation type="unfinished">Sendur %1 til %2</translation>
+    </message>
+    <message>
+        <source>own address</source>
+        <translation type="unfinished">egin adressa</translation>
+    </message>
+    <message>
+        <source>Unable to calculate transaction fee or total transaction amount.</source>
+        <translation type="unfinished">Bar ikki til at roknað avgjald ella samlaðu upphædd fyri flyting.</translation>
+    </message>
+    <message>
+        <source>Pays transaction fee: </source>
+        <translation type="unfinished">Rindar í flytingaravgjaldi:</translation>
+    </message>
+    <message>
+        <source>Total Amount</source>
+        <translation type="unfinished">Samlað upphædd</translation>
+    </message>
+    <message>
+        <source>or</source>
+        <translation type="unfinished">ella</translation>
+    </message>
+    <message numerus="yes">
+        <source>Transaction has %n unsigned input(s).</source>
+        <translation type="unfinished">
+            <numerusform>Flytingin hevur %n óundirritað inntak.</numerusform>
+            <numerusform>Flytingin hevur %n óundirritaði inntøk.</numerusform>
+        </translation>
+    </message>
+    <message>
+        <source>Transaction is missing some information about inputs.</source>
+        <translation type="unfinished">Upplýsingar um flytingar-inntøk vanta í flytingini.</translation>
+    </message>
+    <message>
+        <source>Transaction still needs signature(s).</source>
+        <translation type="unfinished">Enn vantar flytingin undirskrift(ir).</translation>
+    </message>
+    <message>
+        <source>(But no wallet is loaded.)</source>
+        <translation type="unfinished">(Men eingin mappa er innlisin.)</translation>
+    </message>
+    <message>
+        <source>(But this wallet cannot sign transactions.)</source>
+        <translation type="unfinished">(Men hendan mappan kann ikki undirrita flytingar.)</translation>
+    </message>
+    <message>
+        <source>(But this wallet does not have the right keys.)</source>
+        <translation type="unfinished">(Men hendan mappan hevur ikki røttu lyklarnar.)</translation>
+    </message>
+    <message>
+        <source>Transaction is fully signed and ready for broadcast.</source>
+        <translation type="unfinished">Flytingin er liðug undirrita og klár at útvarpa.</translation>
+    </message>
+    <message>
+        <source>Transaction status is unknown.</source>
+        <translation type="unfinished">Støðan á flytingini er ókend.</translation>
+    </message>
+</context>
+<context>
+    <name>PaymentServer</name>
+    <message>
+        <source>Payment request error</source>
+        <translation type="unfinished">Gjaldsumbøn villa</translation>
+    </message>
+    <message>
+        <source>Cannot start bitcoin: click-to-pay handler</source>
+        <translation type="unfinished">Bar ikki til at byrja bitcoin: click-to-pay handfaran</translation>
+    </message>
+    <message>
+        <source>URI handling</source>
+        <translation type="unfinished">URI handfaring</translation>
+    </message>
+    <message>
+        <source>'bitcoin://' is not a valid URI. Use 'bitcoin:' instead.</source>
+        <translation type="unfinished">"bitcoin://" er ikki eitt gildigt URI. Brúka ístaðin 'bitcoin:'.</translation>
+    </message>
+    <message>
+        <source>Cannot process payment request because BIP70 is not supported.
+Due to widespread security flaws in BIP70 it's strongly recommended that any merchant instructions to switch wallets be ignored.
+If you are receiving this error you should request the merchant provide a BIP21 compatible URI.</source>
+        <translation type="unfinished">Kann ikki viðgera gjaldsumbønina, tí at BIP70 ikki er møguligt við hesum forritinum.
+Vegnað væl kend trygdarhol í BIP70, er harðliga frámælt at fylgja boðum, frá seljarum, ella vinnurekandi, um at skifta mappuforrit.
+Fært tú hesi feilboð, skalt tú biðja seljaran, ella tann vinnurekandi, útflýggja tær eitt BIP21-sínamillumvirki URI.</translation>
+    </message>
+    <message>
+        <source>URI cannot be parsed! This can be caused by an invalid Bitcoin address or malformed URI parameters.</source>
+        <translation type="unfinished">Bar ikki til at tulkað URI! Tað kann standast av ógildigari Bitcoin adressu ella avskeplaðum URI ávirkjum.</translation>
+    </message>
+    <message>
+        <source>Payment request file handling</source>
+        <translation type="unfinished">Fílu-gjaldsumbøn handfaring</translation>
+    </message>
+</context>
+<context>
+    <name>PeerTableModel</name>
+    <message>
+        <source>User Agent</source>
+        <extracomment>Title of Peers Table column which contains the peer's User Agent string.</extracomment>
+        <translation type="unfinished">Viðskiftarastrongur</translation>
+    </message>
+    <message>
+        <source>Peer</source>
+        <extracomment>Title of Peers Table column which contains a unique number used to identify a connection.</extracomment>
+        <translation type="unfinished">Javningi</translation>
+    </message>
+    <message>
+        <source>Age</source>
+        <extracomment>Title of Peers Table column which indicates the duration (length of time) since the peer connection started.</extracomment>
+        <translation type="unfinished">Aldur</translation>
+    </message>
+    <message>
+        <source>Direction</source>
+        <extracomment>Title of Peers Table column which indicates the direction the peer connection was initiated from.</extracomment>
+        <translation type="unfinished">Kós</translation>
+    </message>
+    <message>
+        <source>Received</source>
+        <extracomment>Title of Peers Table column which indicates the total amount of network information we have received from the peer.</extracomment>
+        <translation type="unfinished">Móttikið</translation>
+    </message>
+    <message>
+        <source>Address</source>
+        <extracomment>Title of Peers Table column which contains the IP/Onion/I2P address of the connected peer.</extracomment>
+        <translation type="unfinished">Adressa</translation>
+    </message>
+    <message>
+        <source>Type</source>
+        <extracomment>Title of Peers Table column which describes the type of peer connection. The "type" describes why the connection exists.</extracomment>
+        <translation type="unfinished">Slag</translation>
+    </message>
+    <message>
+        <source>Network</source>
+        <extracomment>Title of Peers Table column which states the network the peer connected through.</extracomment>
+        <translation type="unfinished">Net</translation>
+    </message>
+    <message>
+        <source>Inbound</source>
+        <extracomment>An Inbound Connection from a Peer.</extracomment>
+        <translation type="unfinished">Inngangandi</translation>
+    </message>
+    <message>
+        <source>Outbound</source>
+        <extracomment>An Outbound Connection to a Peer.</extracomment>
+        <translation type="unfinished">Útgangandi</translation>
+    </message>
+</context>
+<context>
+    <name>QRImageWidget</name>
+    <message>
+        <source>&amp;Save Image…</source>
+        <translation type="unfinished">&amp;Goym mynd...</translation>
+    </message>
+    <message>
+        <source>&amp;Copy Image</source>
+        <translation type="unfinished">&amp;Avrita mynd</translation>
+    </message>
+    <message>
+        <source>Resulting URI too long, try to reduce the text for label / message.</source>
+        <translation type="unfinished">URI'ið, ið hettar hevur við sær, gerst ov langt. Royn at minka um spjaldurtekstin og/ella tekstboðini.</translation>
+    </message>
+    <message>
+        <source>Error encoding URI into QR Code.</source>
+        <translation type="unfinished">Miseydnaðist at (um)kota URI til QR kotu.</translation>
+    </message>
+    <message>
+        <source>QR code support not available.</source>
+        <translation type="unfinished">QR-kotufunka ikki tøk.</translation>
+    </message>
+    <message>
+        <source>Save QR Code</source>
+        <translation type="unfinished">Goym QR kotu</translation>
+    </message>
+    <message>
+        <source>PNG Image</source>
+        <extracomment>Expanded name of the PNG file format. See: https://en.wikipedia.org/wiki/Portable_Network_Graphics.</extracomment>
+        <translation type="unfinished">PNG mynd</translation>
+    </message>
+</context>
+<context>
+    <name>RPCConsole</name>
+    <message>
+        <source>N/A</source>
+        <translation type="unfinished">—</translation>
+    </message>
+    <message>
+        <source>Client version</source>
+        <translation type="unfinished">Viðskiftaraútgáva</translation>
+    </message>
+    <message>
+        <source>&amp;Information</source>
+        <translation type="unfinished">&amp;Upplýsingar</translation>
+    </message>
+    <message>
+        <source>General</source>
+        <translation type="unfinished">Yvirskipaðir</translation>
+    </message>
+    <message>
+        <source>Datadir</source>
+        <translation type="unfinished">Dátuskjátta</translation>
+    </message>
+    <message>
+        <source>To specify a non-default location of the data directory use the '%1' option.</source>
+        <translation type="unfinished">Tilskila eina ikki-forsetta leið til dátuskjáttuna við '%1' ávirkinum.</translation>
+    </message>
+    <message>
+        <source>Blocksdir</source>
+        <translation type="unfinished">Blokkskjátta</translation>
+    </message>
+    <message>
+        <source>To specify a non-default location of the blocks directory use the '%1' option.</source>
+        <translation type="unfinished">Tilskila eina ikki-forsetta leið til blokkskjáttuna við '%1' ávirkinum.</translation>
+    </message>
+    <message>
+        <source>Startup time</source>
+        <translation type="unfinished">Koyrt síðan</translation>
+    </message>
+    <message>
+        <source>Network</source>
+        <translation type="unfinished">Net</translation>
+    </message>
+    <message>
+        <source>Name</source>
+        <translation type="unfinished">Navn</translation>
+    </message>
+    <message>
+        <source>Number of connections</source>
+        <translation type="unfinished">Tal av sambondum</translation>
+    </message>
+    <message>
+        <source>Local Addresses</source>
+        <translation type="unfinished">Nærnetatsetur</translation>
+    </message>
+    <message>
+        <source>Network addresses that your Bitcoin node is currently using to communicate with other nodes.</source>
+        <translation type="unfinished">Tín Bitcoin knútur brúkar fylgjandi net-atsetur at samskifta við aðrar knútar.</translation>
+    </message>
+    <message>
+        <source>Block chain</source>
+        <translation type="unfinished">Blokkketa</translation>
+    </message>
+    <message>
+        <source>Memory Pool</source>
+        <translation type="unfinished">Minnispulja</translation>
+    </message>
+    <message>
+        <source>Current number of transactions</source>
+        <translation type="unfinished">Tal av flytingum</translation>
+    </message>
+    <message>
+        <source>Memory usage</source>
+        <translation type="unfinished">Minnisnýtsla</translation>
+    </message>
+    <message>
+        <source>Wallet: </source>
+        <translation type="unfinished">Mappa:</translation>
+    </message>
+    <message>
+        <source>(none)</source>
+        <translation type="unfinished">(onga)</translation>
+    </message>
+    <message>
+        <source>&amp;Reset</source>
+        <translation type="unfinished">&amp;Tómstilla</translation>
+    </message>
+    <message>
+        <source>Received</source>
+        <translation type="unfinished">Móttikið</translation>
+    </message>
+    <message>
+        <source>&amp;Peers</source>
+        <translation type="unfinished">&amp;Javningar</translation>
+    </message>
+    <message>
+        <source>Banned peers</source>
+        <translation type="unfinished">Svartalistaðir javningar</translation>
+    </message>
+    <message>
+        <source>Select a peer to view detailed information.</source>
+        <translation type="unfinished">Vel ein javninga fyri at síggja smálutir.</translation>
+    </message>
+    <message>
+        <source>Hide Peers Detail</source>
+        <translation type="unfinished">Fjal smálutir javningans</translation>
+    </message>
+    <message>
+        <source>The transport layer version: %1</source>
+        <translation type="unfinished">Útgáva av fjarskiftislagnum: %1</translation>
+    </message>
+    <message>
+        <source>Transport</source>
+        <translation type="unfinished">Fjarskifti</translation>
+    </message>
+    <message>
+        <source>Session ID</source>
+        <translation type="unfinished">Setu-eymerki</translation>
+    </message>
+    <message>
+        <source>Version</source>
+        <translation type="unfinished">Útgáva</translation>
+    </message>
+    <message>
+        <source>Whether we relay transactions to this peer.</source>
+        <translation type="unfinished">Um vit framsenda flytingar til javningan.</translation>
+    </message>
+    <message>
+        <source>Transaction Relay</source>
+        <translation type="unfinished">Flytingar-framsendan</translation>
+    </message>
+    <message>
+        <source>Synced Headers</source>
+        <translation type="unfinished">Samstillaði blokkhøvd</translation>
+    </message>
+    <message>
+        <source>Synced Blocks</source>
+        <translation type="unfinished">Samstillaðir Blokkar</translation>
+    </message>
+    <message>
+        <source>Last Transaction</source>
+        <translation type="unfinished">Seinasta flyting</translation>
+    </message>
+    <message>
+        <source>The mapped Autonomous System used for diversifying peer selection.</source>
+        <translation type="unfinished">Samsvarandi Sjálvstýrandi Kervi (Autonomous System). Brúkt til at fáa fjølbroytni í javningaval.</translation>
+    </message>
+    <message>
+        <source>Mapped AS</source>
+        <translation type="unfinished">Samsvarandi AS</translation>
+    </message>
+    <message>
+        <source>Whether we relay addresses to this peer.</source>
+        <extracomment>Tooltip text for the Address Relay field in the peer details area, which displays whether we relay addresses to this peer (Yes/No).</extracomment>
+        <translation type="unfinished">Um vit framsenda atsetur til javningan.</translation>
+    </message>
+    <message>
+        <source>Address Relay</source>
+        <extracomment>Text title for the Address Relay field in the peer details area, which displays whether we relay addresses to this peer (Yes/No).</extracomment>
+        <translation type="unfinished">Atseturs-framsendan</translation>
+    </message>
+    <message>
+        <source>The total number of addresses received from this peer that were processed (excludes addresses that were dropped due to rate-limiting).</source>
+        <extracomment>Tooltip text for the Addresses Processed field in the peer details area, which displays the total number of addresses received from this peer that were processed (excludes addresses that were dropped due to rate-limiting).</extracomment>
+        <translation type="unfinished">Tal av teldaðum atsetrum móttikin frá javninganum (atsetur slept vegnað ferðavmarking eru ikki íroknaði).</translation>
+    </message>
+    <message>
+        <source>The total number of addresses received from this peer that were dropped (not processed) due to rate-limiting.</source>
+        <extracomment>Tooltip text for the Addresses Rate-Limited field in the peer details area, which displays the total number of addresses received from this peer that were dropped (not processed) due to rate-limiting.</extracomment>
+        <translation type="unfinished">Tal av atsetrum móttikin, frá javninganum, ið vóru slept (ikki teldaði) vegnað ferðavmarking.</translation>
+    </message>
+    <message>
+        <source>Addresses Processed</source>
+        <extracomment>Text title for the Addresses Processed field in the peer details area, which displays the total number of addresses received from this peer that were processed (excludes addresses that were dropped due to rate-limiting).</extracomment>
+        <translation type="unfinished">Teldaði atsetur</translation>
+    </message>
+    <message>
+        <source>Addresses Rate-Limited</source>
+        <extracomment>Text title for the Addresses Rate-Limited field in the peer details area, which displays the total number of addresses received from this peer that were dropped (not processed) due to rate-limiting.</extracomment>
+        <translation type="unfinished">Ferðavmarkaði/Slept atsetur</translation>
+    </message>
+    <message>
+        <source>User Agent</source>
+        <translation type="unfinished">Viðskiftarastrongur</translation>
+    </message>
+    <message>
+        <source>Node window</source>
+        <translation type="unfinished">Knútagluggi</translation>
+    </message>
+    <message>
+        <source>Current block height</source>
+        <translation type="unfinished">Núverandi blokkhædd</translation>
+    </message>
+    <message>
+        <source>Open the %1 debug log file from the current data directory. This can take a few seconds for large log files.</source>
+        <translation type="unfinished">Lat upp %1 gerðalistafíluna í dátuskjáttuni. Er gerðalistafílan stór kann tað takað nøkur sekund at lata hana upp.</translation>
+    </message>
+    <message>
+        <source>Decrease font size</source>
+        <translation type="unfinished">Minka um tekststøddina</translation>
+    </message>
+    <message>
+        <source>Increase font size</source>
+        <translation type="unfinished">Vaks um tekststøddina</translation>
+    </message>
+    <message>
+        <source>Permissions</source>
+        <translation type="unfinished">Loyvisásetingar</translation>
+    </message>
+    <message>
+        <source>The direction and type of peer connection: %1</source>
+        <translation type="unfinished">Kósin og slag av sambandi við javningin: %1</translation>
+    </message>
+    <message>
+        <source>Direction/Type</source>
+        <translation type="unfinished">Kós/Slag</translation>
+    </message>
+    <message>
+        <source>The BIP324 session ID string in hex.</source>
+        <translation type="unfinished">BIP324 setu-eymerki sum sekstandatal-strongur.</translation>
+    </message>
+    <message>
+        <source>The network protocol this peer is connected through: IPv4, IPv6, Onion, I2P, or CJDNS.</source>
+        <translation type="unfinished">Net-protokollin ið sambandið við hendan javningan byggir á: IPv4, IPv6, Onion, I2P, ella CJDNS.</translation>
+    </message>
+    <message>
+        <source>Services</source>
+        <translation type="unfinished">Tænastur</translation>
+    </message>
+    <message>
+        <source>High bandwidth BIP152 compact block relay: %1</source>
+        <translation type="unfinished">BIP152 stappa-blokk hábandbreidd-framsendan: %1</translation>
+    </message>
+    <message>
+        <source>High Bandwidth</source>
+        <translation type="unfinished">Hábandbreidd</translation>
+    </message>
+    <message>
+        <source>Connection Time</source>
+        <translation type="unfinished">Tíðarbil á sambandinum</translation>
+    </message>
+    <message>
+        <source>Elapsed time since a novel block passing initial validity checks was received from this peer.</source>
+        <translation type="unfinished">Tíð síðan seinasta nýggja blokk, ið stóð undangóðkenning, var móttikin frá javninganum.</translation>
+    </message>
+    <message>
+        <source>Last Block</source>
+        <translation type="unfinished">Seinasti blokkur</translation>
+    </message>
+    <message>
+        <source>Elapsed time since a novel transaction accepted into our mempool was received from this peer.</source>
+        <extracomment>Tooltip text for the Last Transaction field in the peer details area.</extracomment>
+        <translation type="unfinished">Tíð síðan seinastu nýggju flyting, ið var viðtikin í okkara minnispulju, var móttikin frá javninganum.</translation>
+    </message>
+    <message>
+        <source>Last Send</source>
+        <translation type="unfinished">Síðan sending</translation>
+    </message>
+    <message>
+        <source>Last Receive</source>
+        <translation type="unfinished">Síðan móttøku</translation>
+    </message>
+    <message>
+        <source>Ping Time</source>
+        <translation type="unfinished">Ping tíð</translation>
+    </message>
+    <message>
+        <source>The duration of a currently outstanding ping.</source>
+        <translation type="unfinished">Tíð fyri núverandi ping máting.</translation>
+    </message>
+    <message>
+        <source>Ping Wait</source>
+        <translation type="unfinished">Ping-bíðitíð</translation>
+    </message>
+    <message>
+        <source>Min Ping</source>
+        <translation type="unfinished">Lægsta ping tíð</translation>
+    </message>
+    <message>
+        <source>Time Offset</source>
+        <translation type="unfinished">Tíðarfrávik</translation>
+    </message>
+    <message>
+        <source>Last block time</source>
+        <translation type="unfinished">Tíð fyri seinasta blokk</translation>
+    </message>
+    <message>
+        <source>&amp;Open</source>
+        <translation type="unfinished">&amp;Lat upp</translation>
+    </message>
+    <message>
+        <source>&amp;Console</source>
+        <translation type="unfinished">&amp;Stýristøð</translation>
+    </message>
+    <message>
+        <source>&amp;Network Traffic</source>
+        <translation type="unfinished">&amp;Netferðsla</translation>
+    </message>
+    <message>
+        <source>Totals</source>
+        <translation type="unfinished">Í alt, síðan forritið startaði</translation>
+    </message>
+    <message>
+        <source>Debug log file</source>
+        <translation type="unfinished">Gerðalistafíla til villukemban</translation>
+    </message>
+    <message>
+        <source>Clear console</source>
+        <translation type="unfinished">Reinsa stýristøð</translation>
+    </message>
+    <message>
+        <source>In:</source>
+        <translation type="unfinished">Inngangandi:</translation>
+    </message>
+    <message>
+        <source>Out:</source>
+        <translation type="unfinished">Útgangandi:</translation>
+    </message>
+    <message>
+        <source>Inbound: initiated by peer</source>
+        <extracomment>Explanatory text for an inbound peer connection.</extracomment>
+        <translation type="unfinished">Inngangandi: javningin byrjaði sambandið</translation>
+    </message>
+    <message>
+        <source>Outbound Full Relay: default</source>
+        <extracomment>Explanatory text for an outbound peer connection that relays all network information. This is the default behavior for outbound connections.</extracomment>
+        <translation type="unfinished">Útgangandi óskerd framsendan: forsett</translation>
+    </message>
+    <message>
+        <source>Outbound Block Relay: does not relay transactions or addresses</source>
+        <extracomment>Explanatory text for an outbound peer connection that relays network information about blocks and not transactions or addresses.</extracomment>
+        <translation type="unfinished">Útgangandi blokk-framsendan: framsendur ikki (óváttaðar) flytingar ella atsetur</translation>
+    </message>
+    <message>
+        <source>Outbound Manual: added using RPC %1 or %2/%3 configuration options</source>
+        <extracomment>Explanatory text for an outbound peer connection that was established manually through one of several methods. The numbered arguments are stand-ins for the methods available to establish manual connections.</extracomment>
+        <translation type="unfinished">Nýtarstovnað útgangandi: innlagt við RPC %1, ella %2/%3 uppsetanarstillingum</translation>
+    </message>
+    <message>
+        <source>Outbound Feeler: short-lived, for testing addresses</source>
+        <extracomment>Explanatory text for a short-lived outbound peer connection that is used to test the aliveness of known addresses.</extracomment>
+        <translation type="unfinished">Útgangandi kanningarsamband: stokkut samband, at kanna atsetur</translation>
+    </message>
+    <message>
+        <source>Outbound Address Fetch: short-lived, for soliciting addresses</source>
+        <extracomment>Explanatory text for a short-lived outbound peer connection that is used to request addresses from a peer.</extracomment>
+        <translation type="unfinished">Útgangandi atsetursavnan: stokkut, at umbiðja atsetur</translation>
+    </message>
+    <message>
+        <source>Private broadcast: short-lived, for broadcasting privacy-sensitive transactions</source>
+        <extracomment>Explanatory text for a short-lived outbound peer connection that is used to broadcast privacy-sensitive data (like our transactions).</extracomment>
+        <translation type="unfinished">Loyniútvarping: stokkut, at útvarpa viðkvæmar flytingar</translation>
+    </message>
+    <message>
+        <source>detecting: peer could be v1 or v2</source>
+        <extracomment>Explanatory text for "detecting" transport type.</extracomment>
+        <translation type="unfinished">kannar: javningi kann vera v1 ella v2</translation>
+    </message>
+    <message>
+        <source>v1: unencrypted, plaintext transport protocol</source>
+        <extracomment>Explanatory text for v1 transport type.</extracomment>
+        <translation type="unfinished">v1: óbronglað, bersýnt fjarskiftisprotokoll</translation>
+    </message>
+    <message>
+        <source>v2: BIP324 encrypted transport protocol</source>
+        <extracomment>Explanatory text for v2 transport type.</extracomment>
+        <translation type="unfinished">v2: BIP324 bronglað fjarskiftisprotokoll</translation>
+    </message>
+    <message>
+        <source>we selected the peer for high bandwidth relay</source>
+        <translation type="unfinished">vit valdu javningan til hábandbreidd-framsendan</translation>
+    </message>
+    <message>
+        <source>the peer selected us for high bandwidth relay</source>
+        <translation type="unfinished">javningin valdi okkum til hábandbreidd-framsendan</translation>
+    </message>
+    <message>
+        <source>no high bandwidth relay selected</source>
+        <translation type="unfinished">eingin hábandbreidd framsendan vald</translation>
+    </message>
+    <message>
+        <source>&amp;Copy address</source>
+        <extracomment>Context menu action to copy the address of a peer.</extracomment>
+        <translation type="unfinished">&amp;Avrita atsetur</translation>
+    </message>
+    <message>
+        <source>&amp;Disconnect</source>
+        <translation type="unfinished">Av&amp;brót</translation>
+    </message>
+    <message>
+        <source>1 &amp;hour</source>
+        <translation type="unfinished">1 &amp;tíma</translation>
+    </message>
+    <message>
+        <source>1 d&amp;ay</source>
+        <translation type="unfinished">1 &amp;dag</translation>
+    </message>
+    <message>
+        <source>1 &amp;week</source>
+        <translation type="unfinished">1 &amp;viku</translation>
+    </message>
+    <message>
+        <source>1 &amp;year</source>
+        <translation type="unfinished">1 &amp;ár</translation>
+    </message>
+    <message>
+        <source>&amp;Copy IP/Netmask</source>
+        <extracomment>Context menu action to copy the IP/Netmask of a banned peer. IP/Netmask is the combination of a peer's IP address and its Netmask. For IP address, see: https://en.wikipedia.org/wiki/IP_address.</extracomment>
+        <translation type="unfinished">&amp;Avrita IP/Netsílu</translation>
+    </message>
+    <message>
+        <source>&amp;Unban</source>
+        <translation type="unfinished">&amp;Strika av svartalista</translation>
+    </message>
+    <message>
+        <source>Network activity disabled</source>
+        <translation type="unfinished">Net-virksemi óvirkt</translation>
+    </message>
+    <message>
+        <source>None</source>
+        <translation type="unfinished">Ongar</translation>
+    </message>
+    <message>
+        <source>Executing command without any wallet</source>
+        <translation type="unfinished">Koyrur stýriboð óheft av mappu</translation>
+    </message>
+    <message>
+        <source>Node window - [%1]</source>
+        <translation type="unfinished">Knútagluggi - [%1]</translation>
+    </message>
+    <message>
+        <source>Executing command using "%1" wallet</source>
+        <translation type="unfinished">Koyrur stýriboð við "%1" mappuni</translation>
+    </message>
+    <message>
+        <source>Welcome to the %1 RPC console.
+Use up and down arrows to navigate history, and %2 to clear screen.
+Use %3 and %4 to increase or decrease the font size.
+Type %5 for an overview of available commands.
+For more information on using this console, type %6.
+
+%7WARNING: 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.%8</source>
+        <extracomment>RPC console welcome message. Placeholders %7 and %8 are style tags for the warning content, and they are not space separated from the rest of the text intentionally.</extracomment>
+        <translation type="unfinished">Vælkomin til %1 RPC stýristøðina.
+Brúka upp- og niður knøttarnar fyri at blaða gjøgnum søguna, og %2 at reinsa stýristøðina.
+Brúka %3 og %4 fyri at vaksa og minka um skriftstødd.
+Skriva og send stýriboðið %5 fyri eitt yvirlit yvir møgulig stýriboð.
+Fyri meira upplýsingar um nýtslu av hesi stýristøð, skriva og send %6.
+
+%7GEV GÆTUR: Svikarir plaga at biðja brúkarir skriva stýriboð her, og harvið stjala innihaldið úr teirra mappum. Ikki nýta hesa stýristøð uttan so at tú fult og heilt skilur avleiðingarnar av einum stýriboðum.%8</translation>
+    </message>
+    <message>
+        <source>Executing…</source>
+        <extracomment>A console message indicating an entered command is currently being executed.</extracomment>
+        <translation type="unfinished">Innir…</translation>
+    </message>
+    <message>
+        <source>(peer: %1)</source>
+        <translation type="unfinished">(javningi: %1)</translation>
+    </message>
+    <message>
+        <source>via %1</source>
+        <translation type="unfinished">umvegis %1</translation>
+    </message>
+    <message>
+        <source>Yes</source>
+        <translation type="unfinished">Ja</translation>
+    </message>
+    <message>
+        <source>No</source>
+        <translation type="unfinished">Nei</translation>
+    </message>
+    <message>
+        <source>To</source>
+        <translation type="unfinished">Til</translation>
+    </message>
+    <message>
+        <source>From</source>
+        <translation type="unfinished">Frá</translation>
+    </message>
+    <message>
+        <source>Ban for</source>
+        <translation type="unfinished">Svartalistaður í</translation>
+    </message>
+    <message>
+        <source>Never</source>
+        <translation type="unfinished">Ongantíð</translation>
+    </message>
+    <message>
+        <source>Unknown</source>
+        <translation type="unfinished">Ókunnugt</translation>
+    </message>
+</context>
+<context>
+    <name>ReceiveCoinsDialog</name>
+    <message>
+        <source>&amp;Amount:</source>
+        <translation type="unfinished">&amp;Upphædd:</translation>
+    </message>
+    <message>
+        <source>&amp;Label:</source>
+        <translation type="unfinished">&amp;Spjaldur:</translation>
+    </message>
+    <message>
+        <source>&amp;Message:</source>
+        <translation type="unfinished">&amp;Boð:</translation>
+    </message>
+    <message>
+        <source>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.</source>
+        <translation type="unfinished">Eini valfríð boð at festa í gjaldsumbønina, ið kunnu verða víst, tá umbønin verður latin upp. Hav í huga: Boðini verða ikki send, við gjaldinum, umvegis Bitcoin netið.</translation>
+    </message>
+    <message>
+        <source>An optional label to associate with the new receiving address.</source>
+        <translation type="unfinished">Eitt valfrítt spjaldur at knýta at nýggju adressuni, ið hoyrur til hesa mappuna.</translation>
+    </message>
+    <message>
+        <source>Use this form to request payments. All fields are &lt;b&gt;optional&lt;/b&gt;.</source>
+        <translation type="unfinished">Nýt hendan formilin at umbiðja gjøld. Allir teigar eru &lt;b&gt;valfríir&lt;/b&gt;.</translation>
+    </message>
+    <message>
+        <source>An optional amount to request. Leave this empty or zero to not request a specific amount.</source>
+        <translation type="unfinished">Umbið eina valfríða upphædd. Lat teigin vera tóman, ella null, fyri ikki at umbiðja eina ávísa upphædd.</translation>
+    </message>
+    <message>
+        <source>An optional label to associate with the new receiving address (used by you to identify an invoice).  It is also attached to the payment request.</source>
+        <translation type="unfinished">Eitt valfrítt spjaldur tengt at tíni nýggju inngjaldsadressu (ið tú kann brúka at eyðmerkja eina rokning). Tað verður eisini knýtt í gjaldsumbønina.</translation>
+    </message>
+    <message>
+        <source>An optional message that is attached to the payment request and may be displayed to the sender.</source>
+        <translation type="unfinished">Eini valfríð boð ið verða knýtt í gjaldsumbønina og kunnu verða víst fyri sendaranum.</translation>
+    </message>
+    <message>
+        <source>&amp;Create new receiving address</source>
+        <translation type="unfinished">&amp;Framleið nýggja inngjaldsadressu</translation>
+    </message>
+    <message>
+        <source>Clear all fields of the form.</source>
+        <translation type="unfinished">Tómstilla allar teigar í formlinum.</translation>
+    </message>
+    <message>
+        <source>Clear</source>
+        <translation type="unfinished">Tómstilla</translation>
+    </message>
+    <message>
+        <source>Requested payments history</source>
+        <translation type="unfinished">Gjaldsumbønir</translation>
+    </message>
+    <message>
+        <source>Show the selected request (does the same as double clicking an entry)</source>
+        <translation type="unfinished">Vís valdu umbøn (júst sum tá tvíklikt verður á eina skráseting)</translation>
+    </message>
+    <message>
+        <source>Show</source>
+        <translation type="unfinished">Vís</translation>
+    </message>
+    <message>
+        <source>Remove the selected entries from the list</source>
+        <translation type="unfinished">Strika skrásetingina úr listanum</translation>
+    </message>
+    <message>
+        <source>Remove</source>
+        <translation type="unfinished">Strika</translation>
+    </message>
+    <message>
+        <source>Copy &amp;URI</source>
+        <translation type="unfinished">Avrita &amp;URI</translation>
+    </message>
+    <message>
+        <source>&amp;Copy address</source>
+        <translation type="unfinished">&amp;Avrita atsetur</translation>
+    </message>
+    <message>
+        <source>Copy &amp;label</source>
+        <translation type="unfinished">Avrita &amp;spjaldur</translation>
+    </message>
+    <message>
+        <source>Copy &amp;message</source>
+        <translation type="unfinished">Avrita &amp;boð</translation>
+    </message>
+    <message>
+        <source>Copy &amp;amount</source>
+        <translation type="unfinished">Avrita &amp;upphædd</translation>
+    </message>
+    <message>
+        <source>Base58 (Legacy)</source>
+        <translation type="unfinished">Base58 (Legacy / Eldri)</translation>
+    </message>
+    <message>
+        <source>Not recommended due to higher fees and less protection against typos.</source>
+        <translation type="unfinished">Frámælt vegna høgum avgjøldum og verri verju móti tøppivillum.</translation>
+    </message>
+    <message>
+        <source>Generates an address compatible with older wallets.</source>
+        <translation type="unfinished">Framleiður eina adressu ið er sínamillumvirkin við eldri mappur.</translation>
+    </message>
+    <message>
+        <source>Generates a native segwit address (BIP-173). Some old wallets don't support it.</source>
+        <translation type="unfinished">Framleiður eina reina (native) segwit adressu (BIP-173). Ikki er vist, at eldri mappuritbúnaður hentleika, og kunnleika, til slíkar adressur.</translation>
+    </message>
+    <message>
+        <source>Bech32m (BIP-350) is an upgrade to Bech32, wallet support is still limited.</source>
+        <translation type="unfinished">Bech32m (BIP-350) er ein uppstigan frá Bech32, men funkan er enn bert í avmarkaðum mappuforritum.</translation>
+    </message>
+    <message>
+        <source>Could not unlock wallet.</source>
+        <translation type="unfinished">Til bar ikki at lata mappu upp.</translation>
+    </message>
+    <message>
+        <source>Could not generate new %1 address</source>
+        <translation type="unfinished">Bar ikki til at framleiða nýggja %1 adressu</translation>
+    </message>
+</context>
+<context>
+    <name>ReceiveRequestDialog</name>
+    <message>
+        <source>Request payment to …</source>
+        <translation type="unfinished">Gjaldsumbøn til …</translation>
+    </message>
+    <message>
+        <source>Address:</source>
+        <translation type="unfinished">Adressu:</translation>
+    </message>
+    <message>
+        <source>Amount:</source>
+        <translation type="unfinished">Upphædd:</translation>
+    </message>
+    <message>
+        <source>Label:</source>
+        <translation type="unfinished">Spjaldur:</translation>
+    </message>
+    <message>
+        <source>Message:</source>
+        <translation type="unfinished">Boð:</translation>
+    </message>
+    <message>
+        <source>Wallet:</source>
+        <translation type="unfinished">Mappa:</translation>
+    </message>
+    <message>
+        <source>Copy &amp;URI</source>
+        <translation type="unfinished">Avrita &amp;URI</translation>
+    </message>
+    <message>
+        <source>Copy &amp;Address</source>
+        <translation type="unfinished">Avrita &amp;adressu</translation>
+    </message>
+    <message>
+        <source>&amp;Verify</source>
+        <translation type="unfinished">&amp;Vátta</translation>
+    </message>
+    <message>
+        <source>Verify this address on e.g. a hardware wallet screen</source>
+        <translation type="unfinished">Vátta hesa adressuna á t.d. skíggjanum á eini tólbúnaðarmappu</translation>
+    </message>
+    <message>
+        <source>&amp;Save Image…</source>
+        <translation type="unfinished">&amp;Goym mynd…</translation>
+    </message>
+    <message>
+        <source>Payment information</source>
+        <translation type="unfinished">Gjaldsupplýsingar</translation>
+    </message>
+    <message>
+        <source>Request payment to %1</source>
+        <translation type="unfinished">Gjaldsumbøn til %1</translation>
+    </message>
+</context>
+<context>
+    <name>RecentRequestsTableModel</name>
+    <message>
+        <source>Date</source>
+        <translation type="unfinished">Dagfesting</translation>
+    </message>
+    <message>
+        <source>Label</source>
+        <translation type="unfinished">Spjaldur</translation>
+    </message>
+    <message>
+        <source>Message</source>
+        <translation type="unfinished">Boð</translation>
+    </message>
+    <message>
+        <source>(no label)</source>
+        <translation type="unfinished">(einki spjaldur)</translation>
+    </message>
+    <message>
+        <source>(no message)</source>
+        <translation type="unfinished">(eingi boð)</translation>
+    </message>
+    <message>
+        <source>(no amount requested)</source>
+        <translation type="unfinished">(eingin ávís upphædd umbiðin)</translation>
+    </message>
+    <message>
+        <source>Requested</source>
+        <translation type="unfinished">Umbiði</translation>
+    </message>
+</context>
+<context>
+    <name>SendCoinsDialog</name>
+    <message>
+        <source>Send Coins</source>
+        <translation type="unfinished">Send mynt(ir)</translation>
+    </message>
+    <message>
+        <source>Coin Control Features</source>
+        <translation type="unfinished">Mynt-val møgulleikar</translation>
+    </message>
+    <message>
+        <source>automatically selected</source>
+        <translation type="unfinished">sjálvvirkandi mynt-val</translation>
+    </message>
+    <message>
+        <source>Insufficient funds!</source>
+        <translation type="unfinished">Ónøktandi salda!</translation>
+    </message>
+    <message>
+        <source>Quantity:</source>
+        <translation type="unfinished">Mongd:</translation>
+    </message>
+    <message>
+        <source>Bytes:</source>
+        <translation type="unfinished">Být:</translation>
+    </message>
+    <message>
+        <source>Amount:</source>
+        <translation type="unfinished">Upphædd:</translation>
+    </message>
+    <message>
+        <source>Fee:</source>
+        <translation type="unfinished">Avgjald:</translation>
+    </message>
+    <message>
+        <source>After Fee:</source>
+        <translation type="unfinished">Eftir avgjald:</translation>
+    </message>
+    <message>
+        <source>Change:</source>
+        <translation type="unfinished">Vekslipeningur:</translation>
+    </message>
+    <message>
+        <source>If this is activated, but the change address is empty or invalid, change will be sent to a newly generated address.</source>
+        <translation type="unfinished">Um hetta er virkja, men teigurin til adressu fyri vekslipening er tómur ella ógildigur, so verður vekslipeningurin sendur til eina ný-myndaða adressu.</translation>
+    </message>
+    <message>
+        <source>Custom change address</source>
+        <translation type="unfinished">Nýtaratillagað adressa til vekslipening</translation>
+    </message>
+    <message>
+        <source>Transaction Fee:</source>
+        <translation type="unfinished">Flytingaravgjald:</translation>
+    </message>
+    <message>
+        <source>Using the fallbackfee can result in sending a transaction that will take several hours or days (or never) to confirm. Consider choosing your fee manually or wait until you have validated the complete chain.</source>
+        <translation type="unfinished">Nýtsla av afturfallsavgjaldi kann elva til at gera útgjald, sum ikki verður váttað fyrr enn fleiri tímar ella dagar seinni - ella møguliga ongantíð. Hugsa um at sjálv(ur) áseta avgjald, ella at bíða til tú hevur váttað alla ketuna.</translation>
+    </message>
+    <message>
+        <source>Warning: Fee estimation is currently not possible.</source>
+        <translation type="unfinished">Gev gætur: Meting um avgjald er ikki møgulig í løtuni</translation>
+    </message>
+    <message>
+        <source>per kilobyte</source>
+        <translation type="unfinished">fyri kilobýt</translation>
+    </message>
+    <message>
+        <source>Hide</source>
+        <translation type="unfinished">Loka</translation>
+    </message>
+    <message>
+        <source>Recommended:</source>
+        <translation type="unfinished">Viðmælt:</translation>
+    </message>
+    <message>
+        <source>Custom:</source>
+        <translation type="unfinished">Nýtaraásett:</translation>
+    </message>
+    <message>
+        <source>Send to multiple recipients at once</source>
+        <translation type="unfinished">Send til fleiri móttakarar samstundis (við eini flyting)</translation>
+    </message>
+    <message>
+        <source>Add &amp;Recipient</source>
+        <translation type="unfinished">Legg &amp;móttakara afturat</translation>
+    </message>
+    <message>
+        <source>Clear all fields of the form.</source>
+        <translation type="unfinished">Tómstilla allar teigar í formlinum.</translation>
+    </message>
+    <message>
+        <source>Inputs…</source>
+        <translation type="unfinished">Inntøk…</translation>
+    </message>
+    <message>
+        <source>Choose…</source>
+        <translation type="unfinished">Vel…</translation>
+    </message>
+    <message>
+        <source>Hide transaction fee settings</source>
+        <translation type="unfinished">Fjal flytingaravgjaldsstillingar</translation>
+    </message>
+    <message>
+        <source>Specify a custom fee per kB (1,000 bytes) of the transaction's virtual size.
+
+Note:  Since the fee is calculated on a per-byte basis, a fee rate of "100 satoshis per kvB" for a transaction size of 500 virtual bytes (half of 1 kvB) would ultimately yield a fee of only 50 satoshis.</source>
+        <translation type="unfinished">Tilskila eitt nýtaraásett avgjald fyri hvørt kB (1.000 být) av tykisligu støddini av flytingini.
+
+Gev gætur: Av tí at avgjaldið verður roknað fyri hvørt být, fer ein avgjaldssatsur á "100 satoshis fyri ktB" fyri eina flyting, ið er 500 tykislig být (helvtin av 1 ktB), at elva til eitt avgjald á 50 satoshis.</translation>
+    </message>
+    <message>
+        <source>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.</source>
+        <translation type="unfinished">Tá nøgdin av flytingum er minni enn pláss er fyri teimum, í blokkunum, kunnu blokk-útvinnarar og framsendandi knútar hava lágmark fyri flytingaravgjald. Tað er í lagið at gjalda hesa minstu upphædd sum flytingaravgjald, men hav í huga at tað kann elva til at flytingin ongantíð verður váttað, tá eftirspurningurin, eftir bitcoin flytingum, er stórri enn netið kann útinna.</translation>
+    </message>
+    <message>
+        <source>A too low fee might result in a never confirming transaction (read the tooltip)</source>
+        <translation type="unfinished">Ov lítið avgjald kann elva til at flytiningin ongantíð verður váttað (les ábendingina)</translation>
+    </message>
+    <message>
+        <source>(Smart fee not initialized yet. This usually takes a few blocks…)</source>
+        <translation type="unfinished">(Smartavgjaldsfunka er ikki innleitt enn. Vanliga tekur hettar nakrar fáar blokkar…)</translation>
+    </message>
+    <message>
+        <source>Confirmation time target:</source>
+        <translation type="unfinished">Miðað váttanartíð:</translation>
+    </message>
+    <message>
+        <source>Enable Replace-By-Fee</source>
+        <translation type="unfinished">Virkja Replace-By-Fee</translation>
+    </message>
+    <message>
+        <source>With Replace-By-Fee (BIP-125) you can increase a transaction's fee after it is sent. Without this, a higher fee may be recommended to compensate for increased transaction delay risk.</source>
+        <translation type="unfinished">Við Replace-By-Fee (BIP-125) hevur tú møgulleikan at økja um flytingaravgjaldi eftir ein flyting er útvarpað. Er tað ikki virkja, er viðmælt at áseta hægri avgjald, fyri at lækka sannlíkindini fyri at flytinginin verður seinkað.</translation>
+    </message>
+    <message>
+        <source>Clear &amp;All</source>
+        <translation type="unfinished">&amp;Tómstilla teigar</translation>
+    </message>
+    <message>
+        <source>Balance:</source>
+        <translation type="unfinished">Salda:</translation>
+    </message>
+    <message>
+        <source>Confirm the send action</source>
+        <translation type="unfinished">Vátta flytingina</translation>
+    </message>
+    <message>
+        <source>Copy quantity</source>
+        <translation type="unfinished">Avrita mongd</translation>
+    </message>
+    <message>
+        <source>Copy amount</source>
+        <translation type="unfinished">Avrita upphædd</translation>
+    </message>
+    <message>
+        <source>Copy fee</source>
+        <translation type="unfinished">Avrita avgjald</translation>
+    </message>
+    <message>
+        <source>Copy after fee</source>
+        <translation type="unfinished">Avrita upphædd við avgjaldi</translation>
+    </message>
+    <message>
+        <source>Copy bytes</source>
+        <translation type="unfinished">Avrita být</translation>
+    </message>
+    <message>
+        <source>Copy change</source>
+        <translation type="unfinished">Avrita vekslipening</translation>
+    </message>
+    <message>
+        <source>%1 (%2 blocks)</source>
+        <translation type="unfinished">%1 (%2 blokkar)</translation>
+    </message>
+    <message>
+        <source>Sign on device</source>
+        <extracomment>"device" usually means a hardware wallet.</extracomment>
+        <translation type="unfinished">Undirrita á eind</translation>
+    </message>
+    <message>
+        <source>Connect your hardware wallet first.</source>
+        <translation type="unfinished">Sambind við tína tólbúnaðarmappu fyrst.</translation>
+    </message>
+    <message>
+        <source>Set external signer script path in Options -&gt; Wallet</source>
+        <extracomment>"External signer" means using devices such as hardware wallets.</extracomment>
+        <translation type="unfinished">Áset leiðina, til skeljarrit tilhoyrandi ytra undirritaran, undir Stillingar -&gt; Mappa</translation>
+    </message>
+    <message>
+        <source>Cr&amp;eate Unsigned</source>
+        <translation type="unfinished">Ger &amp;óundirritaða flyting</translation>
+    </message>
+    <message>
+        <source>Creates a Partially Signed Bitcoin Transaction (PSBT) for use with e.g. an offline %1 wallet, or a PSBT-compatible hardware wallet.</source>
+        <translation type="unfinished">Ger eina Partvís Undirritaða Bitcoin Flyting (PSBT) at nýta við t.d. einum avlinju-%1 mappu, ella eini tólbúnaðarmappu við PSBT hentleika.</translation>
+    </message>
+    <message>
+        <source>%1 to '%2'</source>
+        <translation type="unfinished">%1 til '%2'</translation>
+    </message>
+    <message>
+        <source>%1 to %2</source>
+        <translation type="unfinished">%1 til %2</translation>
+    </message>
+    <message>
+        <source>To review recipient list click "Show Details…"</source>
+        <translation type="unfinished">Trýst á "Vís smálutir…" fyri síggja móttakaralistan</translation>
+    </message>
+    <message>
+        <source>Sign failed</source>
+        <translation type="unfinished">Undirritan miseydnaðist</translation>
+    </message>
+    <message>
+        <source>External signer not found</source>
+        <extracomment>"External signer" means using devices such as hardware wallets.</extracomment>
+        <translation type="unfinished">Ytri undirritari ikki funnin</translation>
+    </message>
+    <message>
+        <source>External signer failure</source>
+        <extracomment>"External signer" means using devices such as hardware wallets.</extracomment>
+        <translation type="unfinished">Ytri undirritari miseydnaðist</translation>
+    </message>
+    <message>
+        <source>Save Transaction Data</source>
+        <translation type="unfinished">Goym flytingardátur</translation>
+    </message>
+    <message>
+        <source>Partially Signed Transaction (Binary)</source>
+        <extracomment>Expanded name of the binary PSBT file format. See: BIP 174.</extracomment>
+        <translation type="unfinished">Partvís Undirritað Flyting (Tvítalskotað)</translation>
+    </message>
+    <message>
+        <source>PSBT saved</source>
+        <extracomment>Popup message when a PSBT has been saved to a file</extracomment>
+        <translation type="unfinished">PSBT goymd</translation>
+    </message>
+    <message>
+        <source>External balance:</source>
+        <translation type="unfinished">Ytri salda:</translation>
+    </message>
+    <message>
+        <source>or</source>
+        <translation type="unfinished">ella</translation>
+    </message>
+    <message>
+        <source>You can increase the fee later (signals Replace-By-Fee, BIP-125).</source>
+        <translation type="unfinished">Tú hevur møgulleika at hækka avgjaldið seinni (signalerar Replace-By-Fee, BIP-125).</translation>
+    </message>
+    <message>
+        <source>Please, review your transaction proposal. This will produce a Partially Signed Bitcoin Transaction (PSBT) which you can save or copy and then sign with e.g. an offline %1 wallet, or a PSBT-compatible hardware wallet.</source>
+        <extracomment>Text to inform a user attempting to create a transaction of their current options. At this stage, a user can only create a PSBT. This string is displayed when private keys are disabled and an external signer is not available.</extracomment>
+        <translation type="unfinished">Vinaliga met um flytingaruppskotið. Hetta ger eina partvís undirritaða bitcoin flyting (PSBT), ið tú kanst goyma ella avrita og síðani undirrita við t.d. eini avlinju %1 mappu, ella eini tólbúnaðarmappu við PSBT hentleika.</translation>
+    </message>
+    <message>
+        <source>%1 from wallet '%2'</source>
+        <translation type="unfinished">%1 úr '%2' mappuni</translation>
+    </message>
+    <message>
+        <source>Do you want to create this transaction?</source>
+        <extracomment>Message displayed when attempting to create a transaction. Cautionary text to prompt the user to verify that the displayed transaction details represent the transaction the user intends to create.</extracomment>
+        <translation type="unfinished">Ynskir tú at fremja hesa flyting?</translation>
+    </message>
+    <message>
+        <source>Please, review your transaction. You can create and send this transaction or create a Partially Signed Bitcoin Transaction (PSBT), which you can save or copy and then sign with, e.g., an offline %1 wallet, or a PSBT-compatible hardware wallet.</source>
+        <extracomment>Text to inform a user attempting to create a transaction of their current options. At this stage, a user can send their transaction or create a PSBT. This string is displayed when both private keys and PSBT controls are enabled.</extracomment>
+        <translation type="unfinished">Vinaliga met um flytingina. Tú kanst gera og senda flytingina, ella gera eina partvís undirritaða bitcoin flyting (PSBT), ið tú kanst goyma ella avrita og síðani undirrita við t.d. eini avlinju %1 mappu, ella eini tólbúnaðarmappu við PSBT hentleika.</translation>
+    </message>
+    <message>
+        <source>Please, review your transaction.</source>
+        <extracomment>Text to prompt a user to review the details of the transaction they are attempting to send.</extracomment>
+        <translation type="unfinished">Vinaliga met um flytingarsmálutirnar.</translation>
+    </message>
+    <message>
+        <source>Transaction fee</source>
+        <translation type="unfinished">Flytingaravgjald</translation>
+    </message>
+    <message>
+        <source>%1 kvB</source>
+        <comment>PSBT transaction creation</comment>
+        <extracomment>When reviewing a newly created PSBT (via Send flow), the transaction fee is shown, with "virtual size" of the transaction displayed for context</extracomment>
+        <translation type="unfinished">%1 ktB</translation>
+    </message>
+    <message>
+        <source>Not signalling Replace-By-Fee, BIP-125.</source>
+        <translation type="unfinished">Signalerar ikki Replace-By-Fee, BIP-125.</translation>
+    </message>
+    <message>
+        <source>Total Amount</source>
+        <translation type="unfinished">Samlað upphædd</translation>
+    </message>
+    <message>
+        <source>Unsigned Transaction</source>
+        <comment>PSBT copied</comment>
+        <extracomment>Caption of "PSBT has been copied" messagebox</extracomment>
+        <translation type="unfinished">Óundirritað Flyting</translation>
+    </message>
+    <message>
+        <source>The PSBT has been copied to the clipboard. You can also save it.</source>
+        <translation type="unfinished">PSBT dátur eru avritaðar á setiborðið. Tú hevur eisini møgulleika at goyma tær.</translation>
+    </message>
+    <message>
+        <source>PSBT saved to disk</source>
+        <translation type="unfinished">PSBT goymd á diski</translation>
+    </message>
+    <message>
+        <source>Confirm send coins</source>
+        <translation type="unfinished">Vátta bitcoin flyting</translation>
+    </message>
+    <message>
+        <source>The recipient address is not valid. Please recheck.</source>
+        <translation type="unfinished">Móttakara adressan er ógildig. Vinaliga eftirkanna.</translation>
+    </message>
+    <message>
+        <source>The amount to pay must be larger than 0.</source>
+        <translation type="unfinished">Upphæddin, at gjalda, skal vera hægri enn 0.</translation>
+    </message>
+    <message>
+        <source>The amount exceeds your balance.</source>
+        <translation type="unfinished">Upphæddin er hægri enn tín salda.</translation>
+    </message>
+    <message>
+        <source>Duplicate address found: addresses should only be used once each.</source>
+        <translation type="unfinished">Endurtiknar adressur funnar: adressur eiga ikki at endurnýtast.</translation>
+    </message>
+    <message>
+        <source>Transaction creation failed!</source>
+        <translation type="unfinished">Miseydnaðist at gera flyting!</translation>
+    </message>
+    <message>
+        <source>A fee higher than %1 is considered an absurdly high fee.</source>
+        <translation type="unfinished">Eitt avgjald hægri enn %1 verður rokna sum eitt skilaleysa-høgt avgjald.</translation>
+    </message>
+    <message>
+        <source>%1/kvB</source>
+        <translation type="unfinished">%1/ktB</translation>
+    </message>
+    <message numerus="yes">
+        <source>Estimated to begin confirmation within %n block(s).</source>
+        <translation type="unfinished">
+            <numerusform>Fyrsta váttanin verður mett at verða um %n blokk.</numerusform>
+            <numerusform>Fyrsta váttanin verður mett at verða innan %n blokkar.</numerusform>
+        </translation>
+    </message>
+    <message>
+        <source>Warning: Invalid Bitcoin address</source>
+        <translation type="unfinished">Ávaring: Ógildig Bitcoin adressa</translation>
+    </message>
+    <message>
+        <source>Warning: Unknown change address</source>
+        <translation type="unfinished">Ávaring: Ókend adressa til vekslipening</translation>
+    </message>
+    <message>
+        <source>Confirm custom change address</source>
+        <translation type="unfinished">Váttað adressu til vekslipening</translation>
+    </message>
+    <message>
+        <source>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?</source>
+        <translation type="unfinished">Adressan tú valdi til vekslipengar hoyrur ikki til hesa mappuna. Peningurin í tíni mappu kann, partvís ella í síni heild, verða sendur til tað adressuna. Ynskir tú at halda áfram?</translation>
+    </message>
+    <message>
+        <source>(no label)</source>
+        <translation type="unfinished">(einki spjaldur)</translation>
+    </message>
+</context>
+<context>
+    <name>SendCoinsEntry</name>
+    <message>
+        <source>A&amp;mount:</source>
+        <translation type="unfinished">&amp;Upphædd:</translation>
+    </message>
+    <message>
+        <source>Pay &amp;To:</source>
+        <translation type="unfinished">Rinda &amp;til:</translation>
+    </message>
+    <message>
+        <source>&amp;Label:</source>
+        <translation type="unfinished">&amp;Spjaldur:</translation>
+    </message>
+    <message>
+        <source>Choose previously used address</source>
+        <translation type="unfinished">Brúka adressuna ið frammanundan var brúkt</translation>
+    </message>
+    <message>
+        <source>The Bitcoin address to send the payment to</source>
+        <translation type="unfinished">Bitcoin adressan at rinda til</translation>
+    </message>
+    <message>
+        <source>Alt+A</source>
+        <translation type="unfinished">ALT+A</translation>
+    </message>
+    <message>
+        <source>Paste address from clipboard</source>
+        <translation type="unfinished">Innset adressu av setiborði</translation>
+    </message>
+    <message>
+        <source>Alt+P</source>
+        <translation type="unfinished">ALT+P</translation>
+    </message>
+    <message>
+        <source>Remove this entry</source>
+        <translation type="unfinished">Strika hesa skráseting</translation>
+    </message>
+    <message>
+        <source>The amount to send in the selected unit</source>
+        <translation type="unfinished">Upphædd at flyta, í valdu eindini</translation>
+    </message>
+    <message>
+        <source>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.</source>
+        <translation type="unfinished">Avgjaldið verður drigi frá sendu upphæddini. Móttakarin móttekur færri bitcoins enn tú ásetur í upphædd teigin. Um fleiri móttakaraadressur eru ásettar verður avgjaldið javnt býtt.</translation>
+    </message>
+    <message>
+        <source>S&amp;ubtract fee from amount</source>
+        <translation type="unfinished">&amp;Draga avgjald frá upphædd</translation>
+    </message>
+    <message>
+        <source>Use available balance</source>
+        <translation type="unfinished">Nýt tøku salduna</translation>
+    </message>
+    <message>
+        <source>Message:</source>
+        <translation type="unfinished">Boð:</translation>
+    </message>
+    <message>
+        <source>Enter a label for this address to add it to the list of used addresses</source>
+        <translation type="unfinished">Inntøppa eitt spjaldur ið verður knýtt at hesi adressuni í útgjaldsadressuskránni</translation>
+    </message>
+    <message>
+        <source>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.</source>
+        <translation type="unfinished">Eini boð, ið vóru partur at bitcoin: URI'inum, ið verða goymd saman við flytingini, og sum tú kann brúka sum tilvísing. Hav í huga: Boðini verða ikki send, við gjaldinum, umvegis Bitcoin netið.</translation>
+    </message>
+</context>
+<context>
+    <name>SendConfirmationDialog</name>
+    <message>
+        <source>Create Unsigned</source>
+        <translation type="unfinished">Ger óundirritaða flyting</translation>
+    </message>
+</context>
+<context>
+    <name>SignVerifyMessageDialog</name>
+    <message>
+        <source>Signatures - Sign / Verify a Message</source>
+        <translation type="unfinished">Undirskriftir - Undirrita / Vátta eini boð</translation>
+    </message>
+    <message>
+        <source>&amp;Sign Message</source>
+        <translation type="unfinished">&amp;Undirrita Boð</translation>
+    </message>
+    <message>
+        <source>You can sign messages/agreements with your legacy (P2PKH) 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.</source>
+        <translation type="unfinished">Tú kann undirrita boð/sáttmálar við tínum legacy/eldru (P2PKH) adressum, fyri at prógva at tú kann móttaka bitcoins, sendar til tær. Ver ansin so tú ikki skrivar undir nakað ógreitt ella tilvildarligt, tí fysking-álop kunnu royna at snýta teg til at latað tín samleika til tey. Undirrita bert nágreiniligar útsagnir sum tú tekur undir við.</translation>
+    </message>
+    <message>
+        <source>The Bitcoin address to sign the message with</source>
+        <translation type="unfinished">Bitcoin adressan at undirskriva boðini við</translation>
+    </message>
+    <message>
+        <source>Choose previously used address</source>
+        <translation type="unfinished">Brúka adressuna ið frammanundan var brúkt</translation>
+    </message>
+    <message>
+        <source>Alt+A</source>
+        <translation type="unfinished">ALT+A</translation>
+    </message>
+    <message>
+        <source>Paste address from clipboard</source>
+        <translation type="unfinished">Innset adressu av setiborði</translation>
+    </message>
+    <message>
+        <source>Alt+P</source>
+        <translation type="unfinished">ALT+P</translation>
+    </message>
+    <message>
+        <source>Enter the message you want to sign here</source>
+        <translation type="unfinished">Inntøppa boðini, tú ynskir at undirrita, her</translation>
+    </message>
+    <message>
+        <source>Signature</source>
+        <translation type="unfinished">Undirskrift</translation>
+    </message>
+    <message>
+        <source>Copy the current signature to the clipboard</source>
+        <translation type="unfinished">Avrita undirskriftina á setiborðið</translation>
+    </message>
+    <message>
+        <source>Sign the message to prove you own this Bitcoin address</source>
+        <translation type="unfinished">Undirskriva boðini fyri at prógva at Bitcoin-adressan er tín</translation>
+    </message>
+    <message>
+        <source>Sign &amp;Message</source>
+        <translation type="unfinished">&amp;Undirrita boð</translation>
+    </message>
+    <message>
+        <source>Reset all sign message fields</source>
+        <translation type="unfinished">Tómstilla allar "undirrita boð"-teigar.</translation>
+    </message>
+    <message>
+        <source>Clear &amp;All</source>
+        <translation type="unfinished">Tómstilla &amp;alt</translation>
+    </message>
+    <message>
+        <source>&amp;Verify Message</source>
+        <translation type="unfinished">&amp;Vátta boð</translation>
+    </message>
+    <message>
+        <source>Enter the receiver's address, message (ensure you copy line breaks, spaces, tabs, etc. exactly) and signature below to verify the message. Be careful not to read more into the signature than what is in the signed message itself, to avoid being tricked by a man-in-the-middle attack. Note that this only proves the signing party receives with the address, it cannot prove sendership of any transaction!</source>
+        <translation type="unfinished">Inntøppa undirritara-adressuna, boðið (syrg fyri neyvari varðveitslu av reglubrotum, millumrúmum, teigarum, o.s.fr.), og undirskrift niðanfyri fyri at vátta boðið. Ver varin við ikki at lesa meira inn í boðið enn hvat neyvt stendur í tí, fyri at umgangast svik av einum sokallaðum "man-in-the-middle" álopi. Hav í huga at hetta prógvar bert at undirritarin kann móttakað við adressuni; tað kann ikki prógva sendaraskap av flytingum!</translation>
+    </message>
+    <message>
+        <source>The Bitcoin address the message was signed with</source>
+        <translation type="unfinished">Bitcoin-adressan ið undirskrivaði boðini</translation>
+    </message>
+    <message>
+        <source>The signed message to verify</source>
+        <translation type="unfinished">Undirritað boð at vátta</translation>
+    </message>
+    <message>
+        <source>The signature given when the message was signed</source>
+        <translation type="unfinished">Givna undirskrift boðsins</translation>
+    </message>
+    <message>
+        <source>Verify the message to ensure it was signed with the specified Bitcoin address</source>
+        <translation type="unfinished">Vátta at boðini vóru undirritað av ásettu Bitcoin adressuni</translation>
+    </message>
+    <message>
+        <source>Verify &amp;Message</source>
+        <translation type="unfinished">Vátta &amp;boð</translation>
+    </message>
+    <message>
+        <source>Reset all verify message fields</source>
+        <translation type="unfinished">Tómstilla allar "Vátta boð"-teigar.</translation>
+    </message>
+    <message>
+        <source>Click "Sign Message" to generate signature</source>
+        <translation type="unfinished">Trýst á "Undirrita boð" fyri at gera eina undirskrift</translation>
+    </message>
+    <message>
+        <source>The entered address is invalid.</source>
+        <translation type="unfinished">Inntøppaða adressan er ógildig.</translation>
+    </message>
+    <message>
+        <source>Please check the address and try again.</source>
+        <translation type="unfinished">Vinaliga kanna adressuna og royn aftur.</translation>
+    </message>
+    <message>
+        <source>The entered address does not refer to a legacy (P2PKH) key. Message signing for SegWit and other non-P2PKH address types is not supported in this version of %1. Please check the address and try again.</source>
+        <translation type="unfinished">Inntøppaða adressan vísur ikki til ein legacy/eldri (P2PKH) lykil. Undirritan av boðum fyri SegWit og onnur ikki-P2PKH adressusløg er ikki møguligt við hesi útgávuni av %1. Vinaliga kanna adressuna og royn aftur.</translation>
+    </message>
+    <message>
+        <source>Wallet unlock was cancelled.</source>
+        <translation type="unfinished">Mappu-upplating varð avbrotin.</translation>
+    </message>
+    <message>
+        <source>No error</source>
+        <translation type="unfinished">Eingin villa</translation>
+    </message>
+    <message>
+        <source>Private key for the entered address is not available.</source>
+        <translation type="unfinished">Privati lykil adressunar er ikki tøkur.</translation>
+    </message>
+    <message>
+        <source>Message signing failed.</source>
+        <translation type="unfinished">Undirritan av boðum miseydnaðist.</translation>
+    </message>
+    <message>
+        <source>Message signed.</source>
+        <translation type="unfinished">Boð undirritað</translation>
+    </message>
+    <message>
+        <source>The signature could not be decoded.</source>
+        <translation type="unfinished">Bar ikki til at avkota undirskriftina.</translation>
+    </message>
+    <message>
+        <source>Please check the signature and try again.</source>
+        <translation type="unfinished">Vinaliga kanna undirskriftina og royn aftur.</translation>
+    </message>
+    <message>
+        <source>The signature did not match the message digest.</source>
+        <translation type="unfinished">Undirskriftin samsvaraði ikki við innihaldi í boðnum.</translation>
+    </message>
+    <message>
+        <source>Message verification failed.</source>
+        <translation type="unfinished">Miseydnaðist at váttað boðini.</translation>
+    </message>
+    <message>
+        <source>Message verified.</source>
+        <translation type="unfinished">Boð váttaði.</translation>
+    </message>
+</context>
+<context>
+    <name>SplashScreen</name>
+    <message>
+        <source>(press q to shutdown and continue later)</source>
+        <translation type="unfinished">(trýst á q fyri at slókkja forritið, og halda áfram seinni)</translation>
+    </message>
+    <message>
+        <source>press q to shutdown</source>
+        <translation type="unfinished">trýst á q fyri at slókkja forritið</translation>
+    </message>
+</context>
+<context>
+    <name>TransactionDesc</name>
+    <message>
+        <source>conflicted with a transaction with %1 confirmations</source>
+        <extracomment>Text explaining the current status of a transaction, shown in the status field of the details window for this transaction. This status represents an unconfirmed transaction that conflicts with a confirmed transaction.</extracomment>
+        <translation type="unfinished">Ósambærilig við eina flyting við %1 váttanum</translation>
+    </message>
+    <message>
+        <source>0/unconfirmed, in memory pool</source>
+        <extracomment>Text explaining the current status of a transaction, shown in the status field of the details window for this transaction. This status represents an unconfirmed transaction that is in the memory pool.</extracomment>
+        <translation type="unfinished">0/óváttað, í minnispulju</translation>
+    </message>
+    <message>
+        <source>0/unconfirmed, not in memory pool</source>
+        <extracomment>Text explaining the current status of a transaction, shown in the status field of the details window for this transaction. This status represents an unconfirmed transaction that is not in the memory pool.</extracomment>
+        <translation type="unfinished">0/óvattað, ikki í minnispulju</translation>
+    </message>
+    <message>
+        <source>abandoned</source>
+        <extracomment>Text explaining the current status of a transaction, shown in the status field of the details window for this transaction. This status represents an abandoned transaction.</extracomment>
+        <translation type="unfinished">slept</translation>
+    </message>
+    <message>
+        <source>%1/unconfirmed</source>
+        <extracomment>Text explaining the current status of a transaction, shown in the status field of the details window for this transaction. This status represents a transaction confirmed in at least one block, but less than 6 blocks.</extracomment>
+        <translation type="unfinished">%1/óváttað</translation>
+    </message>
+    <message>
+        <source>%1 confirmations</source>
+        <extracomment>Text explaining the current status of a transaction, shown in the status field of the details window for this transaction. This status represents a transaction confirmed in 6 or more blocks.</extracomment>
+        <translation type="unfinished">%1 váttanir</translation>
+    </message>
+    <message>
+        <source>Status</source>
+        <translation type="unfinished">Støða</translation>
+    </message>
+    <message>
+        <source>Date</source>
+        <translation type="unfinished">Dagfesting</translation>
+    </message>
+    <message>
+        <source>Source</source>
+        <translation type="unfinished">Kelda</translation>
+    </message>
+    <message>
+        <source>Generated</source>
+        <translation type="unfinished">Útvunnin</translation>
+    </message>
+    <message>
+        <source>From</source>
+        <translation type="unfinished">Frá</translation>
+    </message>
+    <message>
+        <source>unknown</source>
+        <translation type="unfinished">ókend</translation>
+    </message>
+    <message>
+        <source>To</source>
+        <translation type="unfinished">Til</translation>
+    </message>
+    <message>
+        <source>own address</source>
+        <translation type="unfinished">egin adressa</translation>
+    </message>
+    <message>
+        <source>label</source>
+        <translation type="unfinished">spjaldur</translation>
+    </message>
+    <message>
+        <source>Credit</source>
+        <translation type="unfinished">Ognskrivað</translation>
+    </message>
+    <message numerus="yes">
+        <source>matures in %n more block(s)</source>
+        <translation type="unfinished">
+            <numerusform>Búnast um %n blokk</numerusform>
+            <numerusform>Búnast um %n blokkar</numerusform>
+        </translation>
+    </message>
+    <message>
+        <source>not accepted</source>
+        <translation type="unfinished">ósamtyktur</translation>
+    </message>
+    <message>
+        <source>Debit</source>
+        <translation type="unfinished">Skuldskrivað</translation>
+    </message>
+    <message>
+        <source>Total debit</source>
+        <translation type="unfinished">Samlað skuldskrivað</translation>
+    </message>
+    <message>
+        <source>Total credit</source>
+        <translation type="unfinished">Ognskrivað tilsamans</translation>
+    </message>
+    <message>
+        <source>Transaction fee</source>
+        <translation type="unfinished">Avgjald fyri flyting</translation>
+    </message>
+    <message>
+        <source>Net amount</source>
+        <translation type="unfinished">Netto upphædd</translation>
+    </message>
+    <message>
+        <source>Message</source>
+        <translation type="unfinished">Boð</translation>
+    </message>
+    <message>
+        <source>Comment</source>
+        <translation type="unfinished">Viðmerking</translation>
+    </message>
+    <message>
+        <source>Transaction ID</source>
+        <translation type="unfinished">Flytingar eyðmerki</translation>
+    </message>
+    <message>
+        <source>Transaction total size</source>
+        <translation type="unfinished">Samlað stødd á flyting</translation>
+    </message>
+    <message>
+        <source>Transaction virtual size</source>
+        <translation type="unfinished">Tykislig stødd á flyting</translation>
+    </message>
+    <message>
+        <source>Output index</source>
+        <translation type="unfinished">Úttak nummar</translation>
+    </message>
+    <message>
+        <source>%1 (Certificate was not verified)</source>
+        <translation type="unfinished">%1 (Sertifikat var ikki váttað)</translation>
+    </message>
+    <message>
+        <source>Merchant</source>
+        <translation type="unfinished">Seljari/Vinnurekandi</translation>
+    </message>
+    <message>
+        <source>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.</source>
+        <translation type="unfinished">Útvunnar myntir skulu búnast í %1 blokkar áðrenn tær kunnu brúkast. Tá tú útvann hendan blokkin var hann útvarpaður til netið at festa í blokkketuna. Miseydnast honum at sleppa í ketuna, broytist støðan til "ósamtyktur", og myntin verður ónýtilig. Hetta kann hissini koma fyri, um ein annar knútur útvinnur ein blokk fá sekund innan tín.</translation>
+    </message>
+    <message>
+        <source>Debug information</source>
+        <translation type="unfinished">Villukembanarupplýsingar</translation>
+    </message>
+    <message>
+        <source>Transaction</source>
+        <translation type="unfinished">Flyting</translation>
+    </message>
+    <message>
+        <source>Inputs</source>
+        <translation type="unfinished">Ískoytir</translation>
+    </message>
+    <message>
+        <source>Amount</source>
+        <translation type="unfinished">Upphædd</translation>
+    </message>
+    <message>
+        <source>true</source>
+        <translation type="unfinished">satt</translation>
+    </message>
+    <message>
+        <source>false</source>
+        <translation type="unfinished">ósatt</translation>
+    </message>
+</context>
+<context>
+    <name>TransactionDescDialog</name>
+    <message>
+        <source>This pane shows a detailed description of the transaction</source>
+        <translation type="unfinished">Hesin teigur vísur eina nágreinliga lýsing av flytingini</translation>
+    </message>
+    <message>
+        <source>Details for %1</source>
+        <translation type="unfinished">Nágreinilig lýsing um %1</translation>
+    </message>
+</context>
+<context>
+    <name>TransactionTableModel</name>
+    <message>
+        <source>Date</source>
+        <translation type="unfinished">Dagfesting</translation>
+    </message>
+    <message>
+        <source>Type</source>
+        <translation type="unfinished">Slag</translation>
+    </message>
+    <message>
+        <source>Label</source>
+        <translation type="unfinished">Spjaldur</translation>
+    </message>
+    <message>
+        <source>Unconfirmed</source>
+        <translation type="unfinished">Óváttað</translation>
+    </message>
+    <message>
+        <source>Abandoned</source>
+        <translation type="unfinished">Fúnað</translation>
+    </message>
+    <message>
+        <source>Confirming (%1 of %2 recommended confirmations)</source>
+        <translation type="unfinished">Váttar (%1 av %2 viðmældum váttanum)</translation>
+    </message>
+    <message>
+        <source>Confirmed (%1 confirmations)</source>
+        <translation type="unfinished">Váttað (%1 váttanir)</translation>
+    </message>
+    <message>
+        <source>Conflicted</source>
+        <translation type="unfinished">Ósambærilig</translation>
+    </message>
+    <message>
+        <source>Immature (%1 confirmations, will be available after %2)</source>
+        <translation type="unfinished">Óbúgvin (%1 váttanir, verður tøk eftir %2)</translation>
+    </message>
+    <message>
+        <source>Generated but not accepted</source>
+        <translation type="unfinished">Útvunnin men ikki samtykt</translation>
+    </message>
+    <message>
+        <source>Received with</source>
+        <translation type="unfinished">Inngjøld</translation>
+    </message>
+    <message>
+        <source>Received from</source>
+        <translation type="unfinished">Móttikin frá</translation>
+    </message>
+    <message>
+        <source>Sent to</source>
+        <translation type="unfinished">Sent til</translation>
+    </message>
+    <message>
+        <source>Mined</source>
+        <translation type="unfinished">Útvunnin</translation>
+    </message>
+    <message>
+        <source>(n/a)</source>
+        <translation type="unfinished">—</translation>
+    </message>
+    <message>
+        <source>(no label)</source>
+        <translation type="unfinished">(einki spjaldur)</translation>
+    </message>
+    <message>
+        <source>Transaction status. Hover over this field to show number of confirmations.</source>
+        <translation type="unfinished">Flytingarstøða. Halt músina yvir teiginum fyri at vísa tal av váttanum.</translation>
+    </message>
+    <message>
+        <source>Date and time that the transaction was received.</source>
+        <translation type="unfinished">Dagfesting og tíð fyri móttøku av flytingini.</translation>
+    </message>
+    <message>
+        <source>Type of transaction.</source>
+        <translation type="unfinished">Slag av flyting</translation>
+    </message>
+    <message>
+        <source>User-defined intent/purpose of the transaction.</source>
+        <translation type="unfinished">Nýtaraásett endamál við flytingini.</translation>
+    </message>
+    <message>
+        <source>Amount removed from or added to balance.</source>
+        <translation type="unfinished">Upphædd drigin frá ella løgd afturat salduni.</translation>
+    </message>
+</context>
+<context>
+    <name>TransactionView</name>
+    <message>
+        <source>All</source>
+        <translation type="unfinished">Øll</translation>
+    </message>
+    <message>
+        <source>Today</source>
+        <translation type="unfinished">Í dag</translation>
+    </message>
+    <message>
+        <source>This week</source>
+        <translation type="unfinished">Hesa vikuna</translation>
+    </message>
+    <message>
+        <source>This month</source>
+        <translation type="unfinished">Hendan mánaðin</translation>
+    </message>
+    <message>
+        <source>Last month</source>
+        <translation type="unfinished">Síðsta mánað</translation>
+    </message>
+    <message>
+        <source>This year</source>
+        <translation type="unfinished">Í ár</translation>
+    </message>
+    <message>
+        <source>Received with</source>
+        <translation type="unfinished">Inngjøld</translation>
+    </message>
+    <message>
+        <source>Sent to</source>
+        <translation type="unfinished">Sent til</translation>
+    </message>
+    <message>
+        <source>Mined</source>
+        <translation type="unfinished">Útvunnar</translation>
+    </message>
+    <message>
+        <source>Other</source>
+        <translation type="unfinished">Aðrar</translation>
+    </message>
+    <message>
+        <source>Enter address, transaction id, or label to search</source>
+        <translation type="unfinished">Inntøppa adressu, flytingareyðmerki, ella spjaldur at leita eftir</translation>
+    </message>
+    <message>
+        <source>Min amount</source>
+        <translation type="unfinished">Minstaupphædd</translation>
+    </message>
+    <message>
+        <source>Range…</source>
+        <translation type="unfinished">Talstrekki...</translation>
+    </message>
+    <message>
+        <source>&amp;Copy address</source>
+        <translation type="unfinished">&amp;Avrita adressu</translation>
+    </message>
+    <message>
+        <source>Copy &amp;label</source>
+        <translation type="unfinished">Avrita &amp;spjaldur</translation>
+    </message>
+    <message>
+        <source>Copy &amp;amount</source>
+        <translation type="unfinished">Avrita &amp;upphædd</translation>
+    </message>
+    <message>
+        <source>Copy transaction &amp;ID</source>
+        <translation type="unfinished">Avrita flytingar&amp;eyðmerki</translation>
+    </message>
+    <message>
+        <source>Copy &amp;raw transaction</source>
+        <translation type="unfinished">Avrita flytingar&amp;rádátur</translation>
+    </message>
+    <message>
+        <source>Copy full transaction &amp;details</source>
+        <translation type="unfinished">Avrita allar flytingar&amp;smálutir</translation>
+    </message>
+    <message>
+        <source>&amp;Show transaction details</source>
+        <translation type="unfinished">&amp;Vís flytingarsmálutir</translation>
+    </message>
+    <message>
+        <source>Increase transaction &amp;fee</source>
+        <translation type="unfinished">Hækka flytingar&amp;avgjald</translation>
+    </message>
+    <message>
+        <source>A&amp;bandon transaction</source>
+        <translation type="unfinished">S&amp;lepp flyting</translation>
+    </message>
+    <message>
+        <source>&amp;Edit address label</source>
+        <translation type="unfinished">&amp;Broyt adressuspjaldur</translation>
+    </message>
+    <message>
+        <source>Show in %1</source>
+        <extracomment>Transactions table context menu action to show the selected transaction in a third-party block explorer. %1 is a stand-in argument for the URL of the explorer.</extracomment>
+        <translation type="unfinished">Vís í %1</translation>
+    </message>
+    <message>
+        <source>Export Transaction History</source>
+        <translation type="unfinished">Tak flytingaryvirlit út</translation>
+    </message>
+    <message>
+        <source>Comma separated file</source>
+        <extracomment>Expanded name of the CSV file format. See: https://en.wikipedia.org/wiki/Comma-separated_values.</extracomment>
+        <translation type="unfinished">Kommaskilt fíla</translation>
+    </message>
+    <message>
+        <source>Confirmed</source>
+        <translation type="unfinished">Váttað</translation>
+    </message>
+    <message>
+        <source>Date</source>
+        <translation type="unfinished">Dagfesting</translation>
+    </message>
+    <message>
+        <source>Type</source>
+        <translation type="unfinished">Slag</translation>
+    </message>
+    <message>
+        <source>Label</source>
+        <translation type="unfinished">Spjaldur</translation>
+    </message>
+    <message>
+        <source>Address</source>
+        <translation type="unfinished">Adressa</translation>
+    </message>
+    <message>
+        <source>Exporting Failed</source>
+        <translation type="unfinished">Úttøka miseydnaðist</translation>
+    </message>
+    <message>
+        <source>There was an error trying to save the transaction history to %1.</source>
+        <translation type="unfinished">Ein villa kom fyri, tá roynt var at goyma flytingaryvirlitið í %1.</translation>
+    </message>
+    <message>
+        <source>Exporting Successful</source>
+        <translation type="unfinished">Úttøka eydnaðist</translation>
+    </message>
+    <message>
+        <source>The transaction history was successfully saved to %1.</source>
+        <translation type="unfinished">Tað eydnaðist at goyma flytingaryvirlitið í %1.</translation>
+    </message>
+    <message>
+        <source>Range:</source>
+        <translation type="unfinished">Talstrekki:</translation>
+    </message>
+    <message>
+        <source>to</source>
+        <translation type="unfinished">til</translation>
+    </message>
+</context>
 <context>
-    <name>CreateWalletDialog</name>
+    <name>WalletFrame</name>
     <message>
-        <source>Advanced Options</source>
-        <translation type="unfinished">Víðkaðar stillingar</translation>
+        <source>No wallet has been loaded.
+Go to File &gt; Open Wallet to load a wallet.
+- OR -</source>
+        <translation type="unfinished">Eingin mappa er innlisin.
+Vel Fíla -&gt; Innles Mappu fyri at innlesa eina mappu.
+- ELLA -</translation>
+    </message>
+    <message>
+        <source>Create a new wallet</source>
+        <translation type="unfinished">Ger nýggja mappu</translation>
+    </message>
+    <message>
+        <source>Error</source>
+        <translation type="unfinished">Villa</translation>
+    </message>
+    <message>
+        <source>Unable to decode PSBT from clipboard (invalid base64)</source>
+        <translation type="unfinished">Bar ikki til at avkota PSBT av setiborði (ikki gildigt base64)</translation>
+    </message>
+    <message>
+        <source>Load Transaction Data</source>
+        <translation type="unfinished">Innles flytingardátur</translation>
+    </message>
+    <message>
+        <source>Partially Signed Transaction (*.psbt)</source>
+        <translation type="unfinished">Partvís Undirritað Flyting (*.psbt)</translation>
+    </message>
+    <message>
+        <source>PSBT file must be smaller than 100 MiB</source>
+        <translation type="unfinished">PSBT fíla skal fylla minni enn 100 MiB</translation>
+    </message>
+    <message>
+        <source>Unable to decode PSBT</source>
+        <translation type="unfinished">Bar ikki til at avkota PSBT</translation>
     </message>
-    </context>
+</context>
 <context>
-    <name>EditAddressDialog</name>
+    <name>WalletModel</name>
     <message>
-        <source>Edit Address</source>
-        <translation type="unfinished">Broyt adressu</translation>
+        <source>Send Coins</source>
+        <translation type="unfinished">Send mynt(ir)</translation>
     </message>
     <message>
-        <source>&amp;Label</source>
-        <translation type="unfinished">&amp;Spjaldur</translation>
+        <source>Fee bump error</source>
+        <translation type="unfinished">Avgjaldshækkanarvilla</translation>
+    </message>
+    <message>
+        <source>Increasing transaction fee failed</source>
+        <translation type="unfinished">Flytingar-avgjaldshækkan miseydnaðist</translation>
+    </message>
+    <message>
+        <source>Do you want to increase the fee?</source>
+        <extracomment>Asks a user if they would like to manually increase the fee of a transaction that has already been created.</extracomment>
+        <translation type="unfinished">Ynskir tú at hækka um avgjaldið?</translation>
+    </message>
+    <message>
+        <source>Current fee:</source>
+        <translation type="unfinished">Núverandi avgjald:</translation>
+    </message>
+    <message>
+        <source>Increase:</source>
+        <translation type="unfinished">Øking:</translation>
+    </message>
+    <message>
+        <source>New fee:</source>
+        <translation type="unfinished">Nýtt avgjald:</translation>
+    </message>
+    <message>
+        <source>Warning: This may pay the additional fee by reducing change outputs or adding inputs, when necessary. It may add a new change output if one does not already exist. These changes may potentially leak privacy.</source>
+        <translation type="unfinished">Gev gætur: Um neyðugt, kann tað vera møguligt at gjalda meira í avgjaldi, við at minka um mongdina av vekslipeningaúttøkum, ella við at økja um mongdina av inntøkum. Tað kann elva til at eitt veklipeningaúttak verður lagt afturat, ið fall eitt ikki longu finst. Hendan broytingin kann møguliga almannakungerða meira, um tínar adressur, enn tú ynskir.</translation>
+    </message>
+    <message>
+        <source>Confirm fee bump</source>
+        <translation type="unfinished">Vátta avgjaldshækkan</translation>
+    </message>
+    <message>
+        <source>Can't draft transaction.</source>
+        <translation type="unfinished">Fær ikki samansett flyting.</translation>
+    </message>
+    <message>
+        <source>PSBT copied</source>
+        <translation type="unfinished">PSBT avritað</translation>
+    </message>
+    <message>
+        <source>Fee-bump PSBT copied to clipboard</source>
+        <translation type="unfinished">Avgjaldshækkanar PSBT avritað á setiborð</translation>
+    </message>
+    <message>
+        <source>Can't sign transaction.</source>
+        <translation type="unfinished">Fær ikki undirrita flyting.</translation>
+    </message>
+    <message>
+        <source>Could not commit transaction</source>
+        <translation type="unfinished">Bar ikki til at fremja flyting</translation>
+    </message>
+    <message>
+        <source>Signer error</source>
+        <translation type="unfinished">Villa í undirritara</translation>
+    </message>
+    <message>
+        <source>Can't display address</source>
+        <translation type="unfinished">Fær ikki víst adressu</translation>
+    </message>
+</context>
+<context>
+    <name>WalletView</name>
+    <message>
+        <source>&amp;Export</source>
+        <translation type="unfinished">Tak &amp;út</translation>
+    </message>
+    <message>
+        <source>Export the data in the current tab to a file</source>
+        <translation type="unfinished">Tak dáturnar, í hesum glugganum, út til fílu</translation>
+    </message>
+    <message>
+        <source>Backup Wallet</source>
+        <translation type="unfinished">Trygdaravrita mappu</translation>
+    </message>
+    <message>
+        <source>Wallet Data</source>
+        <extracomment>Name of the wallet data file format.</extracomment>
+        <translation type="unfinished">Mappudátur</translation>
+    </message>
+    <message>
+        <source>Backup Failed</source>
+        <translation type="unfinished">Trygdaravritan miseydnaðist</translation>
+    </message>
+    <message>
+        <source>There was an error trying to save the wallet data to %1.</source>
+        <translation type="unfinished">Ein villa kom í tá roynt var at goyma mappudátur í %1.</translation>
+    </message>
+    <message>
+        <source>Backup Successful</source>
+        <translation type="unfinished">Trygdaravritan eydnaðist</translation>
+    </message>
+    <message>
+        <source>The wallet data was successfully saved to %1.</source>
+        <translation type="unfinished">Mappudáturnar vóru goymdar í %1.</translation>
+    </message>
+    <message>
+        <source>Cancel</source>
+        <translation type="unfinished">Ógilda</translation>
+    </message>
+</context>
+<context>
+    <name>bitcoin-core</name>
+    <message>
+        <source>The %s developers</source>
+        <translation type="unfinished">%s mennararnir</translation>
+    </message>
+    <message>
+        <source>%s failed to validate the -assumeutxo snapshot state. This indicates a hardware problem, or a bug in the software, or a bad software modification that allowed an invalid snapshot to be loaded. As a result of this, the node will shut down and stop using any state that was built on the snapshot, resetting the chain height from %d to %d. On the next restart, the node will resume syncing from %d without using any snapshot data. Please report this incident to %s, including how you obtained the snapshot. The invalid snapshot chainstate will be left on disk in case it is helpful in diagnosing the issue that caused this error.</source>
+        <translation type="unfinished">%s miseydnaðist at vátta -assumeutxo løtumyndstøðuna. Hetta kann verða tekin um ein tólbúnaðartrupulleika, eitt brek í ritbúnaðinum, ella eina illviljaða broyting í ritbúnaðinum, sum loyvur innlesing av ógildigari løtumynd. Sum avleiðing av hesum verður knúturin slóktur, og steðgar at brúka allar støður avleiddar av løtumyndini, og spolar aftur ketuhæddina frá %d til %d. Undir næstu koyring heldur knúturin fram at samstilla frá %d, uttan løtumynddátur. Vinaliga boða frá hesum tilburðinum á %s, og hvussu tú fekk løtumyndina. Ógildiga ketustøðu-løtumyndin verður verandi á diskinum, í fall tað kann hjálpa til brekfinning av trupulleikanum, ið elvdi til villuna.</translation>
+    </message>
+    <message>
+        <source>%s request to listen on port %u. This port is considered "bad" and thus it is unlikely that any peer will connect to it. See doc/p2p-bad-ports.md for details and a full list.</source>
+        <translation type="unfinished">%s umbøn at lurta á portur %u. Hetta portrið er tulkað "óhóskandi" og tí er ósannlíkt at nakar viðskiftari sambindur í tað. Sí lista yvir "óhóskandi" portur og nágreiniligari upplýsingar í doc/p2p-bad-ports.md.</translation>
+    </message>
+    <message>
+        <source>Disk space for %s may not accommodate the block files. Approximately %u GB of data will be stored in this directory.</source>
+        <translation type="unfinished">Tøka goymsluplássi í %s er møguliga ikki nokk. Umleið %u GB av dátum verða goymdar í hesi skjáttuni.</translation>
+    </message>
+    <message>
+        <source>Distributed under the MIT software license, see the accompanying file %s or %s</source>
+        <translation type="unfinished">Útbýtt sambært MIT loyvinum (licensinum). Sí %s, ið fylgir saman við frumforritinum, ella %s</translation>
+    </message>
+    <message>
+        <source>Error loading wallet. Wallet requires blocks to be downloaded, and software does not currently support loading wallets while blocks are being downloaded out of order when using assumeutxo snapshots. Wallet should be able to load successfully after node sync reaches height %s</source>
+        <translation type="unfinished">Villa undir innlesing av mappu. Mappan tørvar at blokkar eru tiknir niður. Og ritbúnaðurin kann ikki, sum er, innlesa mappur undir niðurtøku av blokkum, í ósamanhangandi raðfylgju, tá assumeutxo løtumynd verður brúkt. Eftir at knúturin hevur samstillað til hædd %s skuldi eydnast at innlesa mappuna.</translation>
+    </message>
+    <message>
+        <source>Error reading %s! Transaction data may be missing or incorrect. Rescanning wallet.</source>
+        <translation type="unfinished">Villa undir innlesing av mappuni %s! Flytingardátur kunnu vanta ella verða óeftirfarandi. Endurgreinar mappu.</translation>
+    </message>
+    <message>
+        <source>Error starting/committing db txn for wallet transactions removal process</source>
+        <translation type="unfinished">Villa undir dátugrunsger, sum lutur í tilgongd ið strikar flytingar tilhoyrandi mappuna</translation>
+    </message>
+    <message>
+        <source>Error: Dumpfile format record is incorrect. Got "%s", expected "format".</source>
+        <translation type="unfinished">Villa: Forsnið til teigarað, tilhoyrandi dumsfílu, er ikki rætt. Fekk "%s", væntaði "format".</translation>
+    </message>
+    <message>
+        <source>Error: Dumpfile identifier record is incorrect. Got "%s", expected "%s".</source>
+        <translation type="unfinished">Villa: Dátuheitis-dáta, tilhoyrandi dusmfílu, er ikki rætt. Fekk "%s", væntaði "%s".</translation>
+    </message>
+    <message>
+        <source>Error: Dumpfile version is not supported. This version of bitcoin-wallet only supports version 1 dumpfiles. Got dumpfile with version %s</source>
+        <translation type="unfinished">Villa: Hendan útgávan av bitcoin-mappuni kann bert innlesa útgávu 1 dumsufílur. Læs útgávu %s dumsufílu</translation>
+    </message>
+    <message>
+        <source>Error: Unable to produce descriptors for this legacy wallet. Make sure to provide the wallet's passphrase if it is encrypted.</source>
+        <translation type="unfinished">Villa: Bar ikki til at framleiða lyklalýsingar fyri hesa mappuna, ið er av eldra slagnum. Syrg fyri at veita loyniorðið, til mappuna, um hon er bronglað.</translation>
+    </message>
+    <message>
+        <source>File %s already exists. If you are sure this is what you want, move it out of the way first.</source>
+        <translation type="unfinished">Fílan %s finst longu. Flyt, strika ella nýnevn fíluna fyrst, um hetta er tað tú ynskir.</translation>
+    </message>
+    <message>
+        <source>Invalid or corrupt peers.dat (%s). If you believe this is a bug, please report it to %s. As a workaround, you can move the file (%s) out of the way (rename, move, or delete) to have a new one created on the next start.</source>
+        <translation type="unfinished">peers.dat er ógildig ella avskeplað (%s). Vinaliga boða frá á %s, um tú heldur at brek er við tí niðurstøðuni. Tú kanst flyta, nýnevna ella strika fíluna (%s), soleiðis at ein nýggj verður gjørd undir næstu koyring.</translation>
+    </message>
+    <message>
+        <source>Invalid value detected for '-wallet' or '-nowallet'. '-wallet' requires a string value, while '-nowallet' accepts only '1' to disable all wallets</source>
+        <translation type="unfinished">Varnaðist ógildigt virði á '-wallet' ella '-nowallet'. '-wallet' krevur eitt strong-virði, ímeðan '-nowallet' einans góðtekur '1' fyri at óvirkja allar mappur</translation>
+    </message>
+    <message>
+        <source>More than one onion bind address is provided. Using %s for the automatically created Tor onion service.</source>
+        <translation type="unfinished">Fleiri enn ein onion atseturbinding er ásett. Brúkar %s til sjálvvirkandi-gjørdu Tor onion-tænastuna.</translation>
+    </message>
+    <message>
+        <source>No dump file provided. To use createfromdump, -dumpfile=&lt;filename&gt; must be provided.</source>
+        <translation type="unfinished">Eingin dumsfíla ásett. Fyri at nýta createfromdump er neyðugt at áseta -dumpfile=&lt;filename&gt;.</translation>
+    </message>
+    <message>
+        <source>No dump file provided. To use dump, -dumpfile=&lt;filename&gt; must be provided.</source>
+        <translation type="unfinished">Eingin dumsfíla ásett. Fyri at nýta dums er neyðugt at áseta -dumpfile=&lt;filename&gt;.</translation>
+    </message>
+    <message>
+        <source>Please contribute if you find %s useful. Visit %s for further information about the software.</source>
+        <translation type="unfinished">Vinaliga gev títt ískoyti um tú fært nyttu úr %s. Sí meira kunning um ritbúnaðin á %s.</translation>
+    </message>
+    <message>
+        <source>Prune configured below the minimum of %d MiB.  Please use a higher number.</source>
+        <translation type="unfinished">Niðurskering er stilla undir lágmarkið ið er %d MiB. Vinaliga áset eitt hægri tal.</translation>
+    </message>
+    <message>
+        <source>Prune mode is incompatible with -reindex-chainstate. Use full -reindex instead.</source>
+        <translation type="unfinished">-reindex-chainstate kann ikki brúkast í niðurskerdari støðu. Nýt -reindex ístaðin.</translation>
+    </message>
+    <message>
+        <source>Rename of '%s' -&gt; '%s' failed. You should resolve this by manually moving or deleting the invalid snapshot directory %s, otherwise you will encounter the same error again on the next startup.</source>
+        <translation type="unfinished">Miseydnaðist at nýnevna '%s' -&gt; '%s'. Tú noyðist at loysa trupulleikan við at flyta ella strika trupulleikafongdu løtumynd-skjáttuna %s. Verður tað ikki gjørt rennur forritið seg í sama trupulleika við næstu koyring.</translation>
+    </message>
+    <message>
+        <source>SQLiteDatabase: Unknown sqlite wallet schema version %d. Only version %d is supported</source>
+        <translation type="unfinished">SQLiteDatabase: Ókend sqlite-mappuforsnið útgáva %d. Kennur bert til útgavu %d</translation>
+    </message>
+    <message>
+        <source>The block database contains a block which appears to be from the future. This may be due to your computer's date and time being set incorrectly. Only rebuild the block database if you are sure that your computer's date and time are correct</source>
+        <translation type="unfinished">Blokkdátugrunnurin inniheldur ein blokk ið tykist at hoyra til framtíðina. Tað er møguliga av tí at dagfesting ella klokkan, á tíni teldu, ikki er røtt. Endurbygg einans blokkdátugrunnin um tú ert vís/ur ið at dagfestingin og klokkan, á tíni teldu, er røtt.</translation>
+    </message>
+    <message>
+        <source>The transaction amount is too small to send after the fee has been deducted</source>
+        <translation type="unfinished">Eftir at avgjaldið er drigi frá er upphædin, í flytingini, ov lítil</translation>
+    </message>
+    <message>
+        <source>This is a pre-release test build - use at your own risk - do not use for mining or merchant applications</source>
+        <translation type="unfinished">Hetta er ein undansleppingarútgáva til nároynd - øll nýtlsa er undir egnari ábyrgd. Hetta eigur ikki at verða brúkt til blokk-útvinning ella vinnulig endamál</translation>
+    </message>
+    <message>
+        <source>This is the maximum transaction fee you pay (in addition to the normal fee) to prioritize partial spend avoidance over regular coin selection.</source>
+        <translation type="unfinished">Hetta er tað tú í mesta lagið rindar sum flytingaravgjald (omaná vanliga avgjaldið), fyri at sleppa undan at partvísari myntnýtslu.</translation>
+    </message>
+    <message>
+        <source>This is the transaction fee you may discard if change is smaller than dust at this level</source>
+        <translation type="unfinished">Vekslipeningur, ið er lægri enn dust (upphædd ið ikki loysir seg at brúka), kann verða strikaður og goldin sum avgjald ístaðin</translation>
+    </message>
+    <message>
+        <source>This is the transaction fee you may pay when fee estimates are not available.</source>
+        <translation type="unfinished">Hetta er flytingaravgjaldið, tú kann gjalda, tá avgjaldsmetingar ikki eru tøkar.</translation>
+    </message>
+    <message>
+        <source>Total length of network version string (%i) exceeds maximum length (%i). Reduce the number or size of uacomments.</source>
+        <translation type="unfinished">Samlaða longdin á net-útgávustronginum (%i) er longur enn hámarkið (%i). Lækka um talið ella støddina á uacomments.</translation>
+    </message>
+    <message>
+        <source>Unable to replay blocks. You will need to rebuild the database using -reindex-chainstate.</source>
+        <translation type="unfinished">Ikki møguligt at gjøgnumganga blokkar. Tú noyðist at endurbyggja dátugrunnin við -reindex-chainstate.</translation>
+    </message>
+    <message>
+        <source>Unsupported category-specific logging level %1$s=%2$s. Expected %1$s=&lt;category&gt;:&lt;loglevel&gt;. Valid categories: %3$s. Valid loglevels: %4$s.</source>
+        <translation type="unfinished">Ókent bólkanágreina-gerðalistastøði %1$s=%2$s. Væntaði %1$s=&lt;category&gt;:&lt;loglevel&gt;. Gildigir bólkar: %3$s. Gildig gerðalistastøði: %4$s.</translation>
+    </message>
+    <message>
+        <source>Unsupported chainstate database format found. Please restart with -reindex-chainstate. This will rebuild the chainstate database.</source>
+        <translation type="unfinished">Varnaðist ókent ketustøðu-dátugrunsforsnið. Vinaliga endurbyrja við -reindex-chainstate. Tað endurbyggur ketustøðudátugrunnin.</translation>
+    </message>
+    <message>
+        <source>Warning: Private keys detected in wallet {%s} with disabled private keys</source>
+        <translation type="unfinished">Gev gætur: Privatir lyklar funnir í {%s} mappuni har privatir lyklar eru óvirktir.</translation>
+    </message>
+    <message>
+        <source>Witness data for blocks after height %d requires validation. Please restart with -reindex.</source>
+        <translation type="unfinished">Vitnidátur fyri blokkar, eftir hædd %d, tørva váttan. Vinaliga endurbyrja við -reindex ávirkinum.</translation>
+    </message>
+    <message>
+        <source>You need to rebuild the database using -reindex to go back to unpruned mode.  This will redownload the entire blockchain</source>
+        <translation type="unfinished">Tú noyðist at endurbyggja dátugrunnin við -reindex, fyri at fara aftur til óniðurskorna støðu. Øll blokkketan verður niðurtikin umaftur.</translation>
+    </message>
+    <message>
+        <source>%s is set very high!</source>
+        <translation type="unfinished">%s ásetingin er sera høg!</translation>
+    </message>
+    <message>
+        <source>-maxmempool must be at least %d MB</source>
+        <translation type="unfinished">-maxmempool skal vera í minsta lagi %d MB</translation>
+    </message>
+    <message>
+        <source>Cannot obtain a lock on directory %s. %s is probably already running.</source>
+        <translation type="unfinished">Fær ikki ásett lás á skjáttuna %s. Møguliga koyrur %s longu.</translation>
+    </message>
+    <message>
+        <source>Cannot resolve -%s address: '%s'</source>
+        <translation type="unfinished">Fann ikki -%s atsetur: '%s'</translation>
+    </message>
+    <message>
+        <source>Cannot set -forcednsseed to true when setting -dnsseed to false.</source>
+        <translation type="unfinished">Til ber ikki at virkja -forcednsseed samstundis sum -dnsseed verður óvirkja.</translation>
+    </message>
+    <message>
+        <source>Cannot set -peerblockfilters without -blockfilterindex.</source>
+        <translation type="unfinished">Til ber ikki til at áseta -peerblockfilters uttan eisini at áseta -blockfilterindex.</translation>
+    </message>
+    <message>
+        <source>%s is set very high! Fees this large could be paid on a single transaction.</source>
+        <translation type="unfinished">Ásetingin fyri %s er sera høg! So nógv kanst tú enda við at gjalda, í avgjaldi, fyri eina flyting.</translation>
+    </message>
+    <message>
+        <source>Cannot provide specific connections and have addrman find outgoing connections at the same time.</source>
+        <translation type="unfinished">Til ber ikki at hava ásett nágreinilig sambond, samstundis sum addrman skal leita eftir útgangandi sambondum.</translation>
+    </message>
+    <message>
+        <source>Error loading %s: External signer wallet being loaded without external signer support compiled</source>
+        <translation type="unfinished">Villa undir innlesing av %s: Ytri undirritanarmappa innlisin hóast forritið er týtt uttan ytri-undirritaranarfunku</translation>
+    </message>
+    <message>
+        <source>Error reading %s! All keys read correctly, but transaction data or address metadata may be missing or incorrect.</source>
+        <translation type="unfinished">Villa við innlesing av %s! Allir lyklar vóru innlisnir rætt, men flytingardátur ella adressumetadátur kunnu vanta ella vera óeftirfarandi.</translation>
     </message>
     <message>
-        <source>The label associated with this address list entry</source>
-        <translation type="unfinished">Spjaldrið knýtt at hesi adressuni í adressuskránni</translation>
+        <source>Error: Address book data in wallet cannot be identified to belong to migrated wallets</source>
+        <translation type="unfinished">Villa: Bar ikki til at eyðmerkja adressubókdátur, í mappu, at hoyra til uppstigaðu mappu(r)</translation>
     </message>
     <message>
-        <source>&amp;Address</source>
-        <translation type="unfinished">&amp;Adressa</translation>
+        <source>Error: Duplicate descriptors created during migration. Your wallet may be corrupted.</source>
+        <translation type="unfinished">Villa: Endurtiknar lyklalýsingar framleiddar undir uppstigan. Tín mappa kann verða avskeplað.</translation>
     </message>
-    </context>
-<context>
-    <name>FreespaceChecker</name>
     <message>
-        <source>name</source>
-        <translation type="unfinished">navn</translation>
+        <source>Error: Transaction %s in wallet cannot be identified to belong to migrated wallets</source>
+        <translation type="unfinished">Villa: Bar ikki til at tengja flytingina, %s,  í mappuni, at eini av uppstigaðu mappunum</translation>
     </message>
-    </context>
-<context>
-    <name>HelpMessageDialog</name>
     <message>
-        <source>About %1</source>
-        <translation type="unfinished">Um %1</translation>
+        <source>Failed to remove snapshot chainstate dir (%s). Manually remove it before restarting.
+</source>
+        <translation type="unfinished">Miseydnaðist at strika ketustøðu-løtumynd skjáttuna (%s). Strika hana fyri endurbyrjan.
+</translation>
     </message>
-    </context>
-<context>
-    <name>ShutdownWindow</name>
     <message>
-        <source>%1 is shutting down…</source>
-        <translation type="unfinished">%1 letur aftur...</translation>
+        <source>Failed to rename invalid peers.dat file. Please move or delete it and try again.</source>
+        <translation type="unfinished">Miseydnaðist at nýnevna ógildiga peers.dat fílu. Vinaliga flyt ella strika hana og royn aftur.</translation>
     </message>
-    </context>
-<context>
-    <name>Intro</name>
     <message>
-        <source>Welcome</source>
-        <translation type="unfinished">Vælkomin</translation>
+        <source>Fee estimation failed. Fallbackfee is disabled. Wait a few blocks or enable %s.</source>
+        <translation type="unfinished">Avgjaldsmeting miseydnaðist. Afturfallsavgjald er óvirkt. Bíða nakrar blokkar ella virkja %s.</translation>
     </message>
     <message>
-        <source>Welcome to %1.</source>
-        <translation type="unfinished">Vælkomin til %1.</translation>
+        <source>Flushing block file to disk failed. This is likely the result of an I/O error.</source>
+        <translation type="unfinished">Blokkfíluavhandan til disk miseydnaðist. Sannlíkt orsaka av eini I/O villu.</translation>
     </message>
     <message>
-        <source> GB</source>
-        <translation type="unfinished">GB</translation>
+        <source>Flushing undo file to disk failed. This is likely the result of an I/O error.</source>
+        <translation type="unfinished">Angrifíluavhandan til disk miseydnaðist. Sannlíkt orsaka av eini I/O villu.</translation>
     </message>
     <message>
-        <source>This initial synchronisation is very demanding, and may expose hardware problems with your computer that had previously gone unnoticed. Each time you run %1, it will continue downloading where it left off.</source>
-        <translation type="unfinished">Hendan innleiðandi stevjavningin er sera krevjandi, og kann avdúka trupulleikar, við tólbúnaðinum í teldu tíni, ið tú annars ikki hevur varnast. %1 heldur á fram at takað niður, hvørja ferð %1 verður koyrt.</translation>
+        <source>Incompatible options: -dnsseed=1 was explicitly specified, but -onlynet forbids connections to IPv4/IPv6</source>
+        <translation type="unfinished">Ósambæriligar stillingar: -dnsseed=1 var nágreiniliga tilskila, men -onlynet noktar sambondum til IPv4/IPv6</translation>
     </message>
-    <message numerus="yes">
-        <source>%n GB of space available</source>
-        <translation type="unfinished">
-            <numerusform>%n GB av goymsluplássi tøkt</numerusform>
-            <numerusform>%n GB av goymsluplássi tøkt</numerusform>
-        </translation>
+    <message>
+        <source>Invalid amount for %s=&lt;amount&gt;: '%s' (must be at least the minrelay fee of %s to prevent stuck transactions)</source>
+        <translation type="unfinished">Ógildig upphædd ásett %s=&lt;amount&gt;: '%s' (fyri at fyribyrgja óváttaðar flytingar skal tað vera í minsta lagið %s)</translation>
     </message>
-    <message numerus="yes">
-        <source>(of %n GB needed)</source>
-        <translation type="unfinished">
-            <numerusform>(av %n GB ið tørvur er á)</numerusform>
-            <numerusform>(av %n GB ið tørvur er á)</numerusform>
-        </translation>
+    <message>
+        <source>Maximum transaction weight is less than transaction weight without inputs</source>
+        <translation type="unfinished">Hámarkið fyri flytingarstødd er lægri enn flytingarstødd uttan inntøk</translation>
     </message>
-    <message numerus="yes">
-        <source>(%n GB needed for full chain)</source>
-        <translation type="unfinished">
-            <numerusform />
-            <numerusform />
-        </translation>
+    <message>
+        <source>Maximum transaction weight is too low, can not accommodate change output</source>
+        <translation type="unfinished">Hámarkið, fyri flytingar-goymslustødd, er ov lágt, og pláss er tí ikki fyri vekslipeningaúttaki</translation>
     </message>
     <message>
-        <source>Approximately %1 GB of data will be stored in this directory.</source>
-        <translation type="unfinished">Á leið %1 GB av dátum verða goymd í hesi fíluskránni.</translation>
+        <source>Option '-checkpoints' is set but checkpoints were removed. This option has no effect.</source>
+        <translation type="unfinished">Stillingin '-checkpoints' er virkja men checkpoint vóru strikaði. Stillingin hevur ongan virknað.</translation>
     </message>
-    <message numerus="yes">
-        <source>(sufficient to restore backups %n day(s) old)</source>
-        <extracomment>Explanatory text on the capability of the current prune target.</extracomment>
-        <translation type="unfinished">
-            <numerusform />
-            <numerusform />
-        </translation>
+    <message>
+        <source>Outbound connections restricted to CJDNS (-onlynet=cjdns) but -cjdnsreachable is not provided</source>
+        <translation type="unfinished">Útgangandi sambond eru avmarkaði til CJDNS (-onlynet=cjdns) men -cjdnsreachable er ikki ásett.</translation>
     </message>
     <message>
-        <source>Error</source>
-        <translation type="unfinished">Villa</translation>
+        <source>Outbound connections restricted to Tor (-onlynet=onion) but the proxy for reaching the Tor network is explicitly forbidden: -onion=0</source>
+        <translation type="unfinished">Útgangandi sambond eru avmarkaði til Tor (-onlynet=onion) men proxy'in, at Tor netinum, er nágreiniliga noktaður: -onion=0</translation>
     </message>
-</context>
-<context>
-    <name>ModalOverlay</name>
     <message>
-        <source>Progress</source>
-        <translation type="unfinished">Gongd</translation>
+        <source>Outbound connections restricted to Tor (-onlynet=onion) but the proxy for reaching the Tor network is not provided: none of -proxy, -onion or -listenonion is given</source>
+        <translation type="unfinished">Útgangandi sambond eru avmarkaði til Tor (-onlynet=onion) men proxy'in, at Tor netinum, ikki ásettur: hvørki við -proxy, -onion ella -listenonion</translation>
     </message>
     <message>
-        <source>Progress increase per hour</source>
-        <translation type="unfinished">Framgongd um tíman</translation>
+        <source>Outbound connections restricted to i2p (-onlynet=i2p) but -i2psam is not provided</source>
+        <translation type="unfinished">Útgangandi sambond avmarkaði til i2p (-onlynet=i2p) men -i2psam er ikki ásett.</translation>
     </message>
     <message>
-        <source>Estimated time left until synced</source>
-        <translation type="unfinished">Mett tíð eftir til fulla stevjavnan</translation>
+        <source>Prune: last wallet synchronisation goes beyond pruned data. You need to -reindex (download the whole blockchain again in case of a pruned node)</source>
+        <translation type="unfinished">Niðurskering: seinasta mappusamstillan er uttanfyri niðurskerdu dáturnar. Tú noyðist at virkja -reindex (endurniðurtøka av allari ketuni, í fall tú koyrur ein niðurskerdan knút)</translation>
     </message>
     <message>
-        <source>Hide</source>
-        <translation type="unfinished">Loka</translation>
+        <source>Rename of '%s' -&gt; '%s' failed. Cannot clean up the background chainstate leveldb directory.</source>
+        <translation type="unfinished">Miseydnaðist at nýnevna '%s' -&gt; '%s'. Bar ikki til at rudda upp í ketustøðu leveldb skjáttuni.</translation>
     </message>
-    </context>
-<context>
-    <name>OptionsDialog</name>
     <message>
-        <source>Options</source>
-        <translation type="unfinished">Stillingar</translation>
+        <source>Specified -blockmaxweight (%d) exceeds consensus maximum block weight (%d)</source>
+        <translation type="unfinished">Ásetta -blockmaxweight (%d) er hægri enn hágmarki fyri blokkvekt (%d)  ið semja er um</translation>
     </message>
     <message>
-        <source>Automatically start %1 after logging in to the system.</source>
-        <translation type="unfinished">Koyr %1 sjálvvirkandi eftir innritan á stýrikervið</translation>
+        <source>Specified -blockreservedweight (%d) exceeds consensus maximum block weight (%d)</source>
+        <translation type="unfinished">Ásetta -blockreservedweight (%d) er hægri enn hágmarki fyri blokkvekt (%d) ið semja er um</translation>
     </message>
     <message>
-        <source>Full path to a %1 compatible script (e.g. C:\Downloads\hwi.exe or /Users/you/Downloads/hwi.py). Beware: malware can steal your coins!</source>
-        <translation type="unfinished">Fullfíggja leið til eitt %1 sambæriligt skeljarrit (t.d. C:\Downloads\hwi.exe ella /Users/you/Downloads/hwi.py). Gev gætur: Illbúnaður kann stjala tín pening!</translation>
+        <source>Specified -blockreservedweight (%d) is lower than minimum safety value of (%d)</source>
+        <translation type="unfinished">Ásetta -blockreservedweight (%d) er lægri enn trygga lágmarksvirðið (%d)</translation>
     </message>
     <message>
-        <source>Open Configuration File</source>
-        <translation type="unfinished">Lat upp uppsetanarfíl</translation>
+        <source>The combination of the pre-selected inputs and the wallet automatic inputs selection exceeds the transaction maximum weight. Please try sending a smaller amount or manually consolidating your wallet's UTXOs</source>
+        <translation type="unfinished">Samansetingin av undanvaldum inntøkum og mappu-sjálvvirkandi valdum inntøkum er hægri enn flytingarstøddarhámarkið. Vinaliga royn at senda eina minni upphædd ella samein ónýttu flytingarúttøkini í tíni mappu.</translation>
     </message>
     <message>
-        <source>Reset all client options to default.</source>
-        <translation type="unfinished">Endurstilla allar viðskiftarastillingar til sjálvsettar.</translation>
+        <source>The inputs size exceeds the maximum weight. Please try sending a smaller amount or manually consolidating your wallet's UTXOs</source>
+        <translation type="unfinished">Goymslustøddin á inntøkunum er størri enn hámarkið. Vinaliga royn at senda eina lægri upphædd, ella samein ónýttu flytingarúttøkini í tíni mappu.</translation>
     </message>
     <message>
-        <source>&amp;Reset Options</source>
-        <translation type="unfinished">&amp;Endurstilla stillingar</translation>
+        <source>The preselected coins total amount does not cover the transaction target. Please allow other inputs to be automatically selected or include more coins manually</source>
+        <translation type="unfinished">Valdu myntirnar eru ikki nøktandi til ásettu flytingarupphæddina. Vinaliga vel fleiri myntir, sum inntøk, ella loyv fleiri inntøkum at verða vald sjálvvirkandi.</translation>
     </message>
     <message>
-        <source>&amp;Port:</source>
-        <translation type="unfinished">&amp;Portur:</translation>
+        <source>UTXO snapshot failed to validate. Restart to resume normal initial block download, or try loading a different snapshot.</source>
+        <translation type="unfinished">Kundi ikki vátta UTXO løtumynd. Endurbyrja fyri at halda fram við vanligu blokk-niðurtøkuni, ella royn at innlesa eina aðra løtumynd.</translation>
     </message>
     <message>
-        <source>User Interface &amp;language:</source>
-        <translation type="unfinished">Mál á nýtaramóti:</translation>
+        <source>Unconfirmed UTXOs are available, but spending them creates a chain of transactions that will be rejected by the mempool</source>
+        <translation type="unfinished">Óvattaði ónýtt flytingarúttøk eru tøk, men nýtsla av teimum elvur til eina røð av flytingum, ið minnispuljan vrakar</translation>
     </message>
     <message>
-        <source>The user interface language can be set here. This setting will take effect after restarting %1.</source>
-        <translation type="unfinished">Her kann mál á nýtaramóti ásetast. Stillingin hevur virknað eftir at %1 er endurbyrja.</translation>
+        <source>Unexpected legacy entry in descriptor wallet found. Loading wallet %s
+
+The wallet might have been tampered with or created with malicious intent.
+</source>
+        <translation type="unfinished">Óvæntað skráseting, av eldri slagi, funnin undir innlesing av lyklalýsingar-mappuni %s
+
+Møguliga er lirka við mappuni ella er hon gjørd við illviljaðum endamáli.
+</translation>
     </message>
     <message>
-        <source>&amp;Cancel</source>
-        <translation type="unfinished">&amp;Avlýs</translation>
+        <source>Your computer's date and time appear to be more than %d minutes out of sync with the network, this may lead to consensus failure. After you've confirmed your computer's clock, this message should no longer appear when you restart your node. Without a restart, it should stop showing automatically after you've connected to a sufficient number of new outbound peers, which may take some time. You can inspect the `timeoffset` field of the `getpeerinfo` and `getnetworkinfo` RPC methods to get more info.</source>
+        <translation type="unfinished">Dagfesting og klokkan, á tíni teldu, tykjast at víkja meira enn %d minuttir frá netinum; tað kann elva til semjuslit. Tú eigur at kanna, og, um hon er skeiv, rættað klokkuna á telduni og síðan endurbyrja knútin; hareftir skuldu hesi boðini ikki verið sjónlig. Endurbyrjar tú ikki, so hvørva boðinið sjálvvirkandi, eftir eitt nøktandi tal av útgangandi sambindingum, til aðrar javningar. Tú kann brúka `getpeerinfo` og `getnetworkinfo` RPC stýriboðini og kanna `timeoffset` virðið.</translation>
     </message>
     <message>
-        <source>default</source>
-        <translation type="unfinished">sjálvsett</translation>
+        <source>
+Unable to cleanup failed migration</source>
+        <translation type="unfinished">
+Bar ikki til at rudda upp eftir miseydnaða uppstigan.</translation>
     </message>
     <message>
-        <source>Confirm options reset</source>
-        <extracomment>Window title text of pop-up window shown when the user has chosen to reset options.</extracomment>
-        <translation type="unfinished">Vátta endurstilling av stillingum</translation>
+        <source>
+Unable to restore backup of wallet.</source>
+        <translation type="unfinished">
+Bar ikki til at endurinnlesa mapputrygdaravrit.</translation>
     </message>
     <message>
-        <source>Client restart required to activate changes.</source>
-        <extracomment>Text explaining that the settings changed will not come into effect until the client is restarted.</extracomment>
-        <translation type="unfinished">Endurbyrjan av viðskiftara kravd fyri at virkja broyting(ar).</translation>
+        <source>default wallet</source>
+        <translation type="unfinished">forsett mappa</translation>
     </message>
     <message>
-        <source>Client will be shut down. Do you want to proceed?</source>
-        <extracomment>Text asking the user to confirm if they would like to proceed with a client shutdown.</extracomment>
-        <translation type="unfinished">Viðskiftari verður slóktur. Ynskir tú at halda áfram?</translation>
+        <source>whitebind may only be used for incoming connections ("out" was passed)</source>
+        <translation type="unfinished">whitebind kann bert brúkast til inngangandi sambond ("out" var ásett)</translation>
     </message>
     <message>
-        <source>Configuration options</source>
-        <extracomment>Window title text of pop-up box that allows opening up of configuration file.</extracomment>
-        <translation type="unfinished">Uppsetanarstillingar</translation>
+        <source>A fatal internal error occurred, see debug.log for details: </source>
+        <translation type="unfinished">Ein óbøtilig innankervis villa kom fyri. Sí smálutir í debug.log fíluni:</translation>
     </message>
     <message>
-        <source>Cancel</source>
-        <translation type="unfinished">Avlýs</translation>
+        <source>Assumeutxo data not found for the given blockhash '%s'.</source>
+        <translation type="unfinished">Fann ikki assumeutxo dátur fyri givna blokkhashið '%s'.</translation>
     </message>
     <message>
-        <source>Error</source>
-        <translation type="unfinished">Villa</translation>
+        <source>Block verification was interrupted</source>
+        <translation type="unfinished">Váttan av blokkum varð avbrotin</translation>
     </message>
     <message>
-        <source>The configuration file could not be opened.</source>
-        <translation type="unfinished">Innlesan av uppsetanarfílu miseydnaðist.</translation>
+        <source>Can't spend unconfirmed version %d pre-selected input with a version 3 tx</source>
+        <translation type="unfinished">Óváttaði útgávu %d undanvald inntøk kunnu ikki nýtast í eini útgávu 3 flyting</translation>
     </message>
     <message>
-        <source>This change would require a client restart.</source>
-        <translation type="unfinished">Broytingin krevur endurbyrjan av viðskiftaranum.</translation>
+        <source>Can't spend unconfirmed version 3 pre-selected input with a version %d tx</source>
+        <translation type="unfinished">Óváttaði útgávu 3 undanvald inntøk kunnu ikki nýtast í eini útgávu %d flyting</translation>
     </message>
-    </context>
-<context>
-    <name>OverviewPage</name>
     <message>
-        <source>Available:</source>
-        <translation type="unfinished">Tókt:</translation>
+        <source>Cannot write to directory '%s'; check permissions.</source>
+        <translation type="unfinished">Bar ikki til at skriva til skjáttuna '%s'; kanna rættindi.</translation>
     </message>
     <message>
-        <source>Pending:</source>
-        <translation type="unfinished">Óváttað:</translation>
+        <source>Config setting for %s only applied on %s network when in [%s] section.</source>
+        <translation type="unfinished">%s stillingin er einans virkin á %s netinum, tá hon er ásett í [%s] partinum.</translation>
     </message>
-    </context>
-<context>
-    <name>PSBTOperationsDialog</name>
     <message>
-        <source>Save…</source>
-        <translation type="unfinished">Goym...</translation>
+        <source>Copyright (C) %i-%i</source>
+        <translation type="unfinished">Upphavsrættindi (C) %i-%i</translation>
     </message>
     <message>
-        <source>own address</source>
-        <translation type="unfinished">egin adressa</translation>
+        <source>Corrupt block found indicating potential hardware failure.</source>
+        <translation type="unfinished">Avskeplaður blokkur funnin, ið er tekin um møguligt brek við tólbúnaðinum.</translation>
     </message>
     <message>
-        <source>Total Amount</source>
-        <translation type="unfinished">Samlað upphædd</translation>
+        <source>Corrupted block database detected</source>
+        <translation type="unfinished">Varnaðist avskeplaðan blokkdátugrun</translation>
     </message>
     <message>
-        <source>or</source>
-        <translation type="unfinished">ella</translation>
+        <source>Could not find asmap file %s</source>
+        <translation type="unfinished">Fann ikki asmap fílu %s</translation>
     </message>
-    </context>
-<context>
-    <name>PeerTableModel</name>
     <message>
-        <source>Age</source>
-        <extracomment>Title of Peers Table column which indicates the duration (length of time) since the peer connection started.</extracomment>
-        <translation type="unfinished">Aldur</translation>
+        <source>Could not generate scriptPubKeys (cache is empty)</source>
+        <translation type="unfinished">Bar ikki til at framleiða scriptPubKeys (tómur kovi)</translation>
     </message>
     <message>
-        <source>Received</source>
-        <extracomment>Title of Peers Table column which indicates the total amount of network information we have received from the peer.</extracomment>
-        <translation type="unfinished">Móttikið</translation>
+        <source>Could not parse asmap file %s</source>
+        <translation type="unfinished">Bar ikki til at tulkað asmap fílu %s</translation>
     </message>
     <message>
-        <source>Address</source>
-        <extracomment>Title of Peers Table column which contains the IP/Onion/I2P address of the connected peer.</extracomment>
-        <translation type="unfinished">Adressa</translation>
+        <source>Could not read embedded asmap data</source>
+        <translation type="unfinished">Bar ikki til at innlesa innankervis asmap dátur</translation>
     </message>
     <message>
-        <source>Type</source>
-        <extracomment>Title of Peers Table column which describes the type of peer connection. The "type" describes why the connection exists.</extracomment>
-        <translation type="unfinished">Slag</translation>
+        <source>Could not top up scriptPubKeys</source>
+        <translation type="unfinished">Bar ikki til at fylla á scriptPubKeys</translation>
     </message>
     <message>
-        <source>Network</source>
-        <extracomment>Title of Peers Table column which states the network the peer connected through.</extracomment>
-        <translation type="unfinished">Net</translation>
+        <source>Disk space is too low!</source>
+        <translation type="unfinished">Ov lítið tøkt goymslupláss!</translation>
     </message>
     <message>
-        <source>Inbound</source>
-        <extracomment>An Inbound Connection from a Peer.</extracomment>
-        <translation type="unfinished">Inngangandi</translation>
+        <source>Done loading</source>
+        <translation type="unfinished">Innlesing liðug</translation>
     </message>
     <message>
-        <source>Outbound</source>
-        <extracomment>An Outbound Connection to a Peer.</extracomment>
-        <translation type="unfinished">Útgangandi</translation>
+        <source>Dump file %s does not exist.</source>
+        <translation type="unfinished">Dumsfílan %s finst ikki.</translation>
     </message>
-</context>
-<context>
-    <name>QRImageWidget</name>
     <message>
-        <source>&amp;Save Image…</source>
-        <translation type="unfinished">&amp;Goym mynd...</translation>
+        <source>Elliptic curve cryptography sanity check failure. %s is shutting down.</source>
+        <translation type="unfinished">Heilskapskanning av elliptiskari-kurvu-dulmálsskrift (elliptic curve cryptography) miseydnaðist. %s letur aftur.</translation>
     </message>
     <message>
-        <source>&amp;Copy Image</source>
-        <translation type="unfinished">&amp;Avrita mynd</translation>
+        <source>Embedded asmap data not available</source>
+        <translation type="unfinished">Innankervis asmap dátur eru ikki tøkar</translation>
     </message>
     <message>
-        <source>Save QR Code</source>
-        <translation type="unfinished">Goym QR kotu</translation>
+        <source>Error initializing block database</source>
+        <translation type="unfinished">Villa undir innleiðslu av blokkdátugrunni</translation>
     </message>
     <message>
-        <source>PNG Image</source>
-        <extracomment>Expanded name of the PNG file format. See: https://en.wikipedia.org/wiki/Portable_Network_Graphics.</extracomment>
-        <translation type="unfinished">PNG mynd</translation>
+        <source>Error loading %s</source>
+        <translation type="unfinished">Villa undir innlesing av %s</translation>
     </message>
-</context>
-<context>
-    <name>RPCConsole</name>
     <message>
-        <source>Client version</source>
-        <translation type="unfinished">Viðskiftaraútgáva</translation>
+        <source>Error loading %s: Wallet corrupted</source>
+        <translation type="unfinished">Villa undir innlesing av %s: Mappa avskeplað</translation>
     </message>
     <message>
-        <source>Network</source>
-        <translation type="unfinished">Net</translation>
+        <source>Error loading %s: Wallet requires newer version of %s</source>
+        <translation type="unfinished">Villa undir innlesing av %s: Mappu tørvar nýggjari útgávu av %s</translation>
     </message>
     <message>
-        <source>Name</source>
-        <translation type="unfinished">Navn</translation>
+        <source>Error loading block database</source>
+        <translation type="unfinished">Villa undir innlesing av blokkdátugrunni</translation>
     </message>
     <message>
-        <source>Number of connections</source>
-        <translation type="unfinished">Tal av sambondum</translation>
+        <source>Error loading databases</source>
+        <translation type="unfinished">Villa undir innlesing av dátugrunnum</translation>
     </message>
     <message>
-        <source>Memory usage</source>
-        <translation type="unfinished">Minnisnýtsla</translation>
+        <source>Error opening block database</source>
+        <translation type="unfinished">Villa undir upplating av blokkdátugrunni</translation>
     </message>
     <message>
-        <source>&amp;Reset</source>
-        <translation type="unfinished">Tómstilla</translation>
+        <source>Error opening coins database</source>
+        <translation type="unfinished">Villa undir upplating av myntdátugrunni</translation>
     </message>
     <message>
-        <source>Received</source>
-        <translation type="unfinished">Móttikið</translation>
+        <source>Error reading configuration file: %s</source>
+        <translation type="unfinished">Villa undir innlesing av uppsetanarfílu: %s</translation>
     </message>
     <message>
-        <source>Version</source>
-        <translation type="unfinished">Útgáva</translation>
+        <source>Error reading from database, shutting down.</source>
+        <translation type="unfinished">Villa undir innlesing av dátugrunni. Letur aftur.</translation>
     </message>
     <message>
-        <source>Ping Time</source>
-        <translation type="unfinished">Ping tíð</translation>
+        <source>Error reading next record from wallet database</source>
+        <translation type="unfinished">Villa undir innlesing av komandi teigaraði úr mappudátugrunni</translation>
     </message>
     <message>
-        <source>Debug log file</source>
-        <translation type="unfinished">Gerðalistafíla til villukemban</translation>
+        <source>Error: Cannot extract destination from the generated scriptpubkey</source>
+        <translation type="unfinished">Villa: Bar ikki til at eyðmerkja mál frá framleidda scriptPubKey</translation>
     </message>
     <message>
-        <source>In:</source>
-        <translation type="unfinished">Niður:</translation>
+        <source>Error: Couldn't create cursor into database</source>
+        <translation type="unfinished">Villa: Bar ikki til at stovna vísa (cursor) í dátugrunni</translation>
     </message>
     <message>
-        <source>Out:</source>
-        <translation type="unfinished">Upp:</translation>
+        <source>Error: Disk space is low for %s</source>
+        <translation type="unfinished">Villa: Lítið tøkt goymslupláss til %s</translation>
     </message>
     <message>
-        <source>Ctrl++</source>
-        <extracomment>Main shortcut to increase the RPC console font size.</extracomment>
-        <translation type="unfinished">CTRL++</translation>
+        <source>Error: Dumpfile checksum does not match. Computed %s, expected %s</source>
+        <translation type="unfinished">Villa: Gátal á dumsfílu samsvarar ikki. Útroknaði %s, væntaði %s.</translation>
     </message>
     <message>
-        <source>Ctrl+=</source>
-        <extracomment>Secondary shortcut to increase the RPC console font size.</extracomment>
-        <translation type="unfinished">CTRL+=</translation>
+        <source>Error: Failed to create new watchonly wallet</source>
+        <translation type="unfinished">Villa: Miseydnaðist at gera nýggja eygleiðingarmappu</translation>
     </message>
     <message>
-        <source>Ctrl+-</source>
-        <extracomment>Main shortcut to decrease the RPC console font size.</extracomment>
-        <translation type="unfinished">CTRL+-</translation>
+        <source>Error: Got key that was not hex: %s</source>
+        <translation type="unfinished">Villa: Fekk lykil ið ikki er sekstandatal: %s</translation>
     </message>
     <message>
-        <source>Ctrl+_</source>
-        <extracomment>Secondary shortcut to decrease the RPC console font size.</extracomment>
-        <translation type="unfinished">CTRL+_</translation>
+        <source>Error: Got value that was not hex: %s</source>
+        <translation type="unfinished">Villa: Fekk virði ið ikki er sekstandatal: %s</translation>
     </message>
     <message>
-        <source>&amp;Copy address</source>
-        <extracomment>Context menu action to copy the address of a peer.</extracomment>
-        <translation type="unfinished">&amp;Avrita adressu</translation>
+        <source>Error: Keypool ran out, please call keypoolrefill first</source>
+        <translation type="unfinished">Villa: Lyklapulja tóm. Vinaliga kalla keypoolrefill fyrst</translation>
     </message>
     <message>
-        <source>1 &amp;hour</source>
-        <translation type="unfinished">1 &amp;tíma</translation>
+        <source>Error: Missing checksum</source>
+        <translation type="unfinished">Villa: Gátal vantar</translation>
     </message>
     <message>
-        <source>1 d&amp;ay</source>
-        <translation type="unfinished">1 &amp;dag</translation>
+        <source>Error: No %s addresses available.</source>
+        <translation type="unfinished">Villa: Ongar %s adressur tøkar.</translation>
     </message>
     <message>
-        <source>1 &amp;week</source>
-        <translation type="unfinished">1 &amp;viku</translation>
+        <source>Error: Not all address book records were migrated</source>
+        <translation type="unfinished">Villa: Ikki øll adressubók-teigarøð vóru uppstigað</translation>
     </message>
     <message>
-        <source>1 &amp;year</source>
-        <translation type="unfinished">1 &amp;ár</translation>
+        <source>Error: Not all transaction records were migrated</source>
+        <translation type="unfinished">Villa: Ikki øll flytingar-tegiarøð vóru uppstigað</translation>
     </message>
     <message>
-        <source>Ctrl+I</source>
-        <translation type="unfinished">CTRL+I</translation>
+        <source>Error: This wallet already uses SQLite</source>
+        <translation type="unfinished">Villa: Mappan brúkar longu SQLite</translation>
     </message>
     <message>
-        <source>Ctrl+T</source>
-        <translation type="unfinished">CTRL+T</translation>
+        <source>Error: This wallet is already a descriptor wallet</source>
+        <translation type="unfinished">Villa: Hendan mappan er longu ein lyklalýsingar-mappa</translation>
     </message>
     <message>
-        <source>Ctrl+N</source>
-        <translation type="unfinished">CTRL+N</translation>
+        <source>Error: Unable to begin reading all records in the database</source>
+        <translation type="unfinished">Villa: Bar ikki til at fara undir innlesing av teigarøðum í dátugrunninum</translation>
     </message>
     <message>
-        <source>Ctrl+P</source>
-        <translation type="unfinished">CTRL+P</translation>
+        <source>Error: Unable to make a backup of your wallet</source>
+        <translation type="unfinished">Villa: Bar ikki til at gera eitt trygdaravrit av tíni mappu</translation>
     </message>
     <message>
-        <source>Executing…</source>
-        <extracomment>A console message indicating an entered command is currently being executed.</extracomment>
-        <translation type="unfinished">Innir...</translation>
+        <source>Error: Unable to parse version %u as a uint32_t</source>
+        <translation type="unfinished">Villa: Bar ikki til at tulkað útgávu %u sum uint32_t</translation>
     </message>
     <message>
-        <source>via %1</source>
-        <translation type="unfinished">umvegis %1</translation>
+        <source>Error: Unable to read all records in the database</source>
+        <translation type="unfinished">Villa: Bar ikki til at innlesa øll teigarøð í dátugrunninum</translation>
     </message>
     <message>
-        <source>Yes</source>
-        <translation type="unfinished">Ja</translation>
+        <source>Error: Unable to read wallet's best block locator record</source>
+        <translation type="unfinished">Villa: Bar ikki til at lesa bestablokkvísa mappunnar</translation>
     </message>
     <message>
-        <source>No</source>
-        <translation type="unfinished">Nei</translation>
+        <source>Error: Unable to remove watchonly address book data</source>
+        <translation type="unfinished">Villa: Bar ikki til at strika eygleiðingaradressur úr adressubókini</translation>
     </message>
     <message>
-        <source>To</source>
-        <translation type="unfinished">Til</translation>
+        <source>Error: Unable to write data to disk for wallet %s</source>
+        <translation type="unfinished">Villa: Bar ikki til at skriva dátur, tilhoyrandi mappu %s, til disk</translation>
     </message>
     <message>
-        <source>From</source>
-        <translation type="unfinished">Frá</translation>
+        <source>Error: Unable to write record to new wallet</source>
+        <translation type="unfinished">Villa: Bar ikki til at skriva teigarað til nýggja mappu</translation>
     </message>
-    </context>
-<context>
-    <name>ReceiveCoinsDialog</name>
     <message>
-        <source>&amp;Label:</source>
-        <translation type="unfinished">&amp;Spjaldur:</translation>
+        <source>Error: Unable to write solvable wallet best block locator record</source>
+        <translation type="unfinished">Villa: Bar ikki til at skriva bestablokkvísa hjá loysiligu mappunni</translation>
     </message>
     <message>
-        <source>Clear</source>
-        <translation type="unfinished">Tómstilla</translation>
+        <source>Error: Unable to write watchonly wallet best block locator record</source>
+        <translation type="unfinished">Villa: Bar ikki til at skriva bestablokkvísa eygleiðingarmappunnar</translation>
     </message>
     <message>
-        <source>Show</source>
-        <translation type="unfinished">Vís</translation>
+        <source>Error: database transaction cannot be executed for wallet %s</source>
+        <translation type="unfinished">Villa: Bar ikki til at fremja dátugrunsger fyri mappuna %s</translation>
     </message>
     <message>
-        <source>&amp;Copy address</source>
-        <translation type="unfinished">&amp;Avrita adressu</translation>
+        <source>Failed to acquire rescan reserver during wallet initialization</source>
+        <translation type="unfinished">Umbøn av endurgreinara miseydnaðist, undir mappuinnleiðslu</translation>
     </message>
     <message>
-        <source>Copy &amp;label</source>
-        <translation type="unfinished">Avrita &amp;spjaldur</translation>
+        <source>Failed to close block undo file.</source>
+        <translation type="unfinished">Miseydnaðist at lata blokk-angrifílu aftur.</translation>
     </message>
     <message>
-        <source>Copy &amp;amount</source>
-        <translation type="unfinished">Avrita &amp;upphædd</translation>
+        <source>Failed to close file when writing block.</source>
+        <translation type="unfinished">Miseydnaðist at lata blokkfílu aftur, undir blokkfíluskriving.</translation>
     </message>
-    </context>
-<context>
-    <name>ReceiveRequestDialog</name>
     <message>
-        <source>Address:</source>
-        <translation type="unfinished">Adressu:</translation>
+        <source>Failed to disconnect block.</source>
+        <translation type="unfinished">Miseydnaðist at loysa frá blokki.</translation>
     </message>
     <message>
-        <source>Amount:</source>
-        <translation type="unfinished">Upphædd:</translation>
+        <source>Failed to listen on any port. Use -listen=0 if you want this.</source>
+        <translation type="unfinished">Miseydnaðist at lurta á nøkrum portri. Nýt -listen=0 um tú ikki ynskir at lurta á nøkrum portri.</translation>
     </message>
     <message>
-        <source>Label:</source>
-        <translation type="unfinished">Spjaldur:</translation>
+        <source>Failed to read block.</source>
+        <translation type="unfinished">Miseydnaðist at lesa blokk.</translation>
     </message>
     <message>
-        <source>Message:</source>
-        <translation type="unfinished">Boð:</translation>
+        <source>Failed to rescan the wallet during initialization</source>
+        <translation type="unfinished">Endurgreining av mappuni miseydnaðist, undir innleiðslu</translation>
     </message>
     <message>
-        <source>Copy &amp;Address</source>
-        <translation type="unfinished">Avrita &amp;adressu</translation>
+        <source>Failed to verify database</source>
+        <translation type="unfinished">Váttan av dátugrunni miseydnaðist</translation>
     </message>
     <message>
-        <source>&amp;Save Image…</source>
-        <translation type="unfinished">&amp;Goym mynd...</translation>
+        <source>Failed to write block.</source>
+        <translation type="unfinished">Miseydnaðist at skriva blokk.</translation>
     </message>
-    </context>
-<context>
-    <name>RecentRequestsTableModel</name>
     <message>
-        <source>Label</source>
-        <translation type="unfinished">Spjaldur</translation>
+        <source>Failed to write undo data.</source>
+        <translation type="unfinished">Miseydnaðist at skriva angridátu(r).</translation>
     </message>
     <message>
-        <source>Message</source>
-        <translation type="unfinished">Boð</translation>
+        <source>Failure removing transaction: %s</source>
+        <translation type="unfinished">Miseydnaðist at strika flyting: %s</translation>
     </message>
     <message>
-        <source>(no label)</source>
-        <translation type="unfinished">(einki spjaldur)</translation>
+        <source>Fee rate (%s) is lower than the minimum fee rate setting (%s)</source>
+        <translation type="unfinished">Avgjaldsstig (%s) er lægri enn lágmarksaavgjaldsstig stillingin (%s)</translation>
     </message>
     <message>
-        <source>(no message)</source>
-        <translation type="unfinished">(eingi boð)</translation>
+        <source>Ignoring duplicate -wallet %s.</source>
+        <translation type="unfinished">Tekur ikki hædd fyri endurtiknari -wallet %s.</translation>
     </message>
-    </context>
-<context>
-    <name>SendCoinsDialog</name>
     <message>
-        <source>Quantity:</source>
-        <translation type="unfinished">Mongd:</translation>
+        <source>Incorrect or no genesis block found. Wrong datadir for network?</source>
+        <translation type="unfinished">Eingin ella ógildigur byrjunarblokkur funnin. Skeiv dátuskjátta samsvarandi netið?</translation>
     </message>
     <message>
-        <source>Bytes:</source>
-        <translation type="unfinished">Být:</translation>
+        <source>Initialization sanity check failed. %s is shutting down.</source>
+        <translation type="unfinished">Heilskapskanning miseydnaðist, undir innleiðslu. %s letur aftur.</translation>
     </message>
     <message>
-        <source>Amount:</source>
-        <translation type="unfinished">Upphædd:</translation>
+        <source>Input not found or already spent</source>
+        <translation type="unfinished">Inntak varð ikki funnið ella longu nýtt</translation>
     </message>
     <message>
-        <source>Change:</source>
-        <translation type="unfinished">Vekslipeningur:</translation>
+        <source>Insufficient dbcache for block verification</source>
+        <translation type="unfinished">Ov lítil dbcache til blokkváttanir</translation>
     </message>
     <message>
-        <source>If this is activated, but the change address is empty or invalid, change will be sent to a newly generated address.</source>
-        <translation type="unfinished">Um hetta er virkja, men teigurin til adressu fyri vekslipening er tómur ella ógildigur, so verður vekslipeningurin sendur til eina ný-myndaða adressu.</translation>
+        <source>Insufficient funds</source>
+        <translation type="unfinished">Ónøktandi salda</translation>
     </message>
     <message>
-        <source>Custom change address</source>
-        <translation type="unfinished">Adressa til vekslipening</translation>
+        <source>Invalid -i2psam address or hostname: '%s'</source>
+        <translation type="unfinished">Ógildigt -i2psam atsetur ella vertsnavn: '%s'</translation>
     </message>
     <message>
-        <source>per kilobyte</source>
-        <translation type="unfinished">per kilobýt</translation>
+        <source>Invalid -onion address or hostname: '%s'</source>
+        <translation type="unfinished">Ógildigt -onion atsetur ella vertsnavn: '%s'</translation>
     </message>
     <message>
-        <source>Hide</source>
-        <translation type="unfinished">Loka</translation>
+        <source>Invalid -proxy address or hostname: '%s'</source>
+        <translation type="unfinished">Ógildigt -proxy atsetur ella vertsnavn: '%s'</translation>
     </message>
     <message>
-        <source>Recommended:</source>
-        <translation type="unfinished">Viðmælt:</translation>
+        <source>Invalid P2P permission: '%s'</source>
+        <translation type="unfinished">Ógildigt P2P loyvi: '%s'</translation>
     </message>
     <message>
-        <source>Send to multiple recipients at once</source>
-        <translation type="unfinished">Send til fleiri móttakarar í einum</translation>
+        <source>Invalid amount for %s=&lt;amount&gt;: '%s'</source>
+        <translation type="unfinished">Ógildig upphædd ásett %s=&lt;amount&gt;: '%s'</translation>
     </message>
     <message>
-        <source>Choose…</source>
-        <translation type="unfinished">Vel...</translation>
+        <source>A %zu MiB dbcache may be too large for a system memory of only %zu MiB.</source>
+        <translation type="unfinished">dbcache á %zu MiB kann verða ov stórur í stýrikervi við einans %zu MiB av ritminni.</translation>
     </message>
     <message>
-        <source>Clear &amp;All</source>
-        <translation type="unfinished">Tómstilla &amp;alt</translation>
+        <source>Creating wallet…</source>
+        <translation type="unfinished">Framleiður mappu…</translation>
     </message>
     <message>
-        <source>Copy quantity</source>
-        <translation type="unfinished">Avrita mongd</translation>
+        <source>Duplicate binding configuration for address %s. Please check your -bind, -bind=...=onion and -whitebind settings.</source>
+        <translation type="unfinished">Endurtikin bindingaruppsetan tilhoyrandi %s atsetrið. Vinnaliga kanna tíni -bind, -bind=...=onion og -whitebind ávirki.</translation>
     </message>
     <message>
-        <source>Copy amount</source>
-        <translation type="unfinished">Avrita mongd</translation>
+        <source>Error creating %s: Could not write version metadata.</source>
+        <translation type="unfinished">Villa undir ger av %s: Fekk ikki skriva útgávu metadáta.</translation>
     </message>
     <message>
-        <source>Copy bytes</source>
-        <translation type="unfinished">Avrita být</translation>
+        <source>Invalid amount for -%s=&lt;amount&gt;: '%s'</source>
+        <translation type="unfinished">Ógildig upphædd ásett -%s=&lt;amount&gt;: '%s'</translation>
     </message>
     <message>
-        <source>Copy change</source>
-        <translation type="unfinished">Avrita vekslipening</translation>
+        <source>Invalid netmask specified in -whitelist: '%s'</source>
+        <translation type="unfinished">Ógildig netsíla ásett í -whitelist: '%s'</translation>
     </message>
     <message>
-        <source>Sign on device</source>
-        <extracomment>"device" usually means a hardware wallet.</extracomment>
-        <translation type="unfinished">Undirrita á eind</translation>
+        <source>Invalid port specified in %s: '%s'</source>
+        <translation type="unfinished">Ógildigt portur ásett í %s: '%s'</translation>
     </message>
     <message>
-        <source>%1 to '%2'</source>
-        <translation type="unfinished">%1 til '%2'</translation>
+        <source>Listening for incoming connections failed (listen returned error %s)</source>
+        <translation type="unfinished">Lurtingin eftir inngangandi sambondum miseydnaðist (lurtingin gav villuna %s)</translation>
     </message>
     <message>
-        <source>%1 to %2</source>
-        <translation type="unfinished">%1 til %2</translation>
+        <source>Loading P2P addresses…</source>
+        <translation type="unfinished">Innlesur P2P atsetur…</translation>
     </message>
     <message>
-        <source>Sign failed</source>
-        <translation type="unfinished">Undirritan miseydnaðist</translation>
+        <source>Loading banlist…</source>
+        <translation type="unfinished">Innlesur svartalista…</translation>
     </message>
     <message>
-        <source>or</source>
-        <translation type="unfinished">ella</translation>
+        <source>Loading block index…</source>
+        <translation type="unfinished">Innlesur blokkskrá…</translation>
     </message>
     <message>
-        <source>Total Amount</source>
-        <translation type="unfinished">Samlað upphædd</translation>
+        <source>Loading wallet…</source>
+        <translation type="unfinished">Innlesur mappu…</translation>
     </message>
     <message>
-        <source>The recipient address is not valid. Please recheck.</source>
-        <translation type="unfinished">Móttakara adressan er ógildig. Vinaliga eftirkanna.</translation>
+        <source>Maximum transaction weight must be between %d and %d</source>
+        <translation type="unfinished">Hámarkið, fyri flytingar-goymslustødd, skal verða millum %d og %d</translation>
     </message>
-    <message numerus="yes">
-        <source>Estimated to begin confirmation within %n block(s).</source>
-        <translation type="unfinished">
-            <numerusform />
-            <numerusform />
-        </translation>
+    <message>
+        <source>Missing amount</source>
+        <translation type="unfinished">Upphædd vantar</translation>
     </message>
     <message>
-        <source>Warning: Invalid Bitcoin address</source>
-        <translation type="unfinished">Ávaring: Ógildig Bitcoin adressa</translation>
+        <source>Missing solving data for estimating transaction size</source>
+        <translation type="unfinished">Vantar loysiligardátur, til at meta um flytingarstødd</translation>
     </message>
     <message>
-        <source>Warning: Unknown change address</source>
-        <translation type="unfinished">Ávaring: Ókend adressa til vekslipening</translation>
+        <source>Need to specify a port with -whitebind: '%s'</source>
+        <translation type="unfinished">Neyðugt er at tilskila portur við -whitebind: '%s'</translation>
     </message>
     <message>
-        <source>Confirm custom change address</source>
-        <translation type="unfinished">Váttað adressu til vekslipening</translation>
+        <source>No addresses available</source>
+        <translation type="unfinished">Ongar adressur tøkar</translation>
     </message>
     <message>
-        <source>(no label)</source>
-        <translation type="unfinished">(einki spjaldur)</translation>
+        <source>Not found pre-selected input %s</source>
+        <translation type="unfinished">Undanvalt inntak ikki funnið %s</translation>
     </message>
-</context>
-<context>
-    <name>SendCoinsEntry</name>
     <message>
-        <source>&amp;Label:</source>
-        <translation type="unfinished">&amp;Spjaldur:</translation>
+        <source>Not solvable pre-selected input %s</source>
+        <translation type="unfinished">Óloysiligt undanvalt inntak %s</translation>
     </message>
     <message>
-        <source>Choose previously used address</source>
-        <translation type="unfinished">Brúka adressuna ið frammanundan var brúkt</translation>
+        <source>Only direction was set, no permissions: '%s'</source>
+        <translation type="unfinished">Einans kós var ásett, men eingi loyvir: '%s'</translation>
     </message>
     <message>
-        <source>Alt+A</source>
-        <translation type="unfinished">ALT+A</translation>
+        <source>Option '-limitancestorsize' is given but ancestor size limits have been replaced with cluster size limits (see -limitclustersize). This option has no effect.</source>
+        <translation type="unfinished">'-limitancestorsize' stillingin er ásett men hevur ongan virknað. Hon er skift út við -limitclustersize.</translation>
     </message>
     <message>
-        <source>Alt+P</source>
-        <translation type="unfinished">ALT+P</translation>
+        <source>Option '-limitdescendantsize' is given but descendant size limits have been replaced with cluster size limits (see -limitclustersize). This option has no effect.</source>
+        <translation type="unfinished">'-limitdescendantsize' stillingin er ásett men hevur ongan virknað. Hon er skift út við -limitclustersize.</translation>
     </message>
     <message>
-        <source>Message:</source>
-        <translation type="unfinished">Boð:</translation>
+        <source>Private broadcast of own transactions requested (-privatebroadcast) and -proxyrandomize is disabled. Tor circuits for private broadcast connections may be correlated to other connections over Tor. For maximum privacy set -proxyrandomize=1.</source>
+        <translation type="unfinished">Loyniútvarping, av egnum flytingum, er ásett (-privatebroadcast), samstundis sum -proxyrandomize er óvirkt. Tor sambond, ið verða brúktar til loyniútvarping, kunnu tí verða set í samband við onnur Tor sambond frá hesum viðskiftaranum. Áset -proxyrandomize=1 fyri bestu loynd.</translation>
     </message>
-    </context>
-<context>
-    <name>SignVerifyMessageDialog</name>
     <message>
-        <source>Signatures - Sign / Verify a Message</source>
-        <translation type="unfinished">Undirskriftir - Undirrita / Vátta eini boð</translation>
+        <source>Private broadcast of own transactions requested (-privatebroadcast), but -connect is also configured. They are incompatible because the private broadcast needs to open new connections to randomly chosen Tor or I2P peers. Consider using -maxconnections=0 -addnode=... instead</source>
+        <translation type="unfinished">Loyniútvarping, av egnum flytingum, er ásett (-privatebroadcast), samstundis sum -connect er ásett. Stillingarnar eru ósambæriligar tí loyniútvarping tørvar at sambinda til tilvildarligar Tor ella I2P javningar. Hugsa um at áseta -maxconnections=0 -addnode=... ístaðin.</translation>
     </message>
     <message>
-        <source>&amp;Sign Message</source>
-        <translation type="unfinished">&amp;Undirrita Boð</translation>
+        <source>Private broadcast of own transactions requested (-privatebroadcast), but none of Tor or I2P networks is reachable</source>
+        <translation type="unfinished">Loyniútvarping, av egnum flytingum, er ásett (-privatebroadcast), men hvørki Tor ella I2P netini kunnu røkkast.</translation>
     </message>
     <message>
-        <source>The Bitcoin address to sign the message with</source>
-        <translation type="unfinished">Bitcoin adressan at undirskriva boðini við</translation>
+        <source>Prune cannot be configured with a negative value.</source>
+        <translation type="unfinished">Til ber ikki at áseta niðurskering við negativum virði.</translation>
     </message>
     <message>
-        <source>Choose previously used address</source>
-        <translation type="unfinished">Brúka adressuna ið frammanundan var brúkt</translation>
+        <source>Prune mode is incompatible with -txindex.</source>
+        <translation type="unfinished">-txindex kann ikki brúkast í niðurskerdari støðu.</translation>
     </message>
     <message>
-        <source>Alt+A</source>
-        <translation type="unfinished">ALT+A</translation>
+        <source>Prune mode is incompatible with -txospenderindex.</source>
+        <translation type="unfinished">-txospenderindex kann ikki brúkast í niðurskerdari støðu.</translation>
     </message>
     <message>
-        <source>Alt+P</source>
-        <translation type="unfinished">ALT+P</translation>
+        <source>Pruning blockstore…</source>
+        <translation type="unfinished">Niðursker blokkgoymslu…</translation>
     </message>
     <message>
-        <source>Enter the message you want to sign here</source>
-        <translation type="unfinished">Inntøppa boðini, tú ynskir at undirrita, her</translation>
+        <source>Reducing -maxconnections from %d to %d, because of system limitations.</source>
+        <translation type="unfinished">Slakar -maxconnections frá %d til %d, vegna stýrikervisins avmarkingar.</translation>
     </message>
     <message>
-        <source>Signature</source>
-        <translation type="unfinished">Undirskrift</translation>
+        <source>Replaying blocks…</source>
+        <translation type="unfinished">Gjøgnumgongur blokkar…</translation>
     </message>
     <message>
-        <source>Sign the message to prove you own this Bitcoin address</source>
-        <translation type="unfinished">Undirskriva boðini fyri at prógva at Bitcoin-adressan er tín</translation>
+        <source>Rescanning…</source>
+        <translation type="unfinished">Endurgreinar…</translation>
     </message>
     <message>
-        <source>Sign &amp;Message</source>
-        <translation type="unfinished">&amp;Undirrita boð</translation>
+        <source>SQLiteDatabase: Failed to execute statement to verify database: %s</source>
+        <translation type="unfinished">SQLiteDatabase: Miseydnaðist at útinna setning fyri at váttað dátugrunn: %s</translation>
     </message>
     <message>
-        <source>Clear &amp;All</source>
-        <translation type="unfinished">Tómstilla &amp;alt</translation>
+        <source>SQLiteDatabase: Failed to prepare statement to verify database: %s</source>
+        <translation type="unfinished">SQLiteDatabase: Miseydnaðist at fyrireika setning fyri at váttað dátugrunn: %s</translation>
     </message>
     <message>
-        <source>The Bitcoin address the message was signed with</source>
-        <translation type="unfinished">Bitcoin-adressan ið undirskrivaði boðini</translation>
+        <source>SQLiteDatabase: Failed to read database verification error: %s</source>
+        <translation type="unfinished">SQLiteDatabase: Miseydnaðist at lesa dátugrunn-váttanarvillu: %s</translation>
     </message>
     <message>
-        <source>The signed message to verify</source>
-        <translation type="unfinished">Undirritað boð at vátta</translation>
+        <source>SQLiteDatabase: Unexpected application id. Expected %u, got %u</source>
+        <translation type="unfinished">SQLiteDatabase: Óvæntað nýstluskipanar-eyðmerki. Væntaði %u, fekk %u</translation>
     </message>
     <message>
-        <source>Click "Sign Message" to generate signature</source>
-        <translation type="unfinished">Trýst á "Undirrita boð" fyri at gera eina undirskrift</translation>
+        <source>Section [%s] is not recognized.</source>
+        <translation type="unfinished">Kennist ikki við [%s] partin.</translation>
     </message>
     <message>
-        <source>No error</source>
-        <translation type="unfinished">Eingin villa</translation>
+        <source>Signer did not echo address</source>
+        <translation type="unfinished">Ytri undirritari endurtók onga adressu</translation>
     </message>
     <message>
-        <source>Message signing failed.</source>
-        <translation type="unfinished">Undirritan av boðum miseydnaðist.</translation>
+        <source>Signer echoed unexpected address %s</source>
+        <translation type="unfinished">Ytri undirritari endurtók óvæntaða adressu %s</translation>
     </message>
     <message>
-        <source>Message signed.</source>
-        <translation type="unfinished">Boð undirritað</translation>
+        <source>Signer returned error: %s</source>
+        <translation type="unfinished">Villuboð frá ytri undirritara: %s</translation>
     </message>
     <message>
-        <source>The signature could not be decoded.</source>
-        <translation type="unfinished">Undirskriftin er ógildig.</translation>
+        <source>Signing transaction failed</source>
+        <translation type="unfinished">Flytingarundirritan miseydnaðist</translation>
     </message>
     <message>
-        <source>Please check the signature and try again.</source>
-        <translation type="unfinished">Vinaliga kanna undirskriftina og royn aftur.</translation>
+        <source>Specified -walletdir "%s" does not exist</source>
+        <translation type="unfinished">Ásetta -walletdir leiðin "%s" finst ikki</translation>
     </message>
     <message>
-        <source>The signature did not match the message digest.</source>
-        <translation type="unfinished">Undirskriftin samsvaraði ikki við innihaldi í boðnum.</translation>
+        <source>Specified -walletdir "%s" is a relative path</source>
+        <translation type="unfinished">Ásetta -walletdir "%s" er ein relativ leið</translation>
     </message>
-    </context>
-<context>
-    <name>TransactionDesc</name>
     <message>
-        <source>Source</source>
-        <translation type="unfinished">Kelda</translation>
+        <source>Specified -walletdir "%s" is not a directory</source>
+        <translation type="unfinished">Ásetta -walletdir leiðin "%s" er ikki ein skjátta</translation>
     </message>
     <message>
-        <source>From</source>
-        <translation type="unfinished">Frá</translation>
+        <source>Specified blocks directory "%s" does not exist.</source>
+        <translation type="unfinished">Ásetta blokkskjáttan "%s" finst ikki</translation>
     </message>
     <message>
-        <source>To</source>
-        <translation type="unfinished">Til</translation>
+        <source>Specified data directory "%s" does not exist.</source>
+        <translation type="unfinished">Ásetta dátuskjáttan "%s" finst ikki</translation>
     </message>
     <message>
-        <source>own address</source>
-        <translation type="unfinished">egin adressa</translation>
+        <source>Starting network threads…</source>
+        <translation type="unfinished">Byrjar nettræðrir…</translation>
     </message>
     <message>
-        <source>label</source>
-        <translation type="unfinished">spjaldur</translation>
+        <source>System error while flushing: %s</source>
+        <translation type="unfinished">Kervisvilla undir fíluavhandan: %s</translation>
     </message>
-    <message numerus="yes">
-        <source>matures in %n more block(s)</source>
-        <translation type="unfinished">
-            <numerusform />
-            <numerusform />
-        </translation>
+    <message>
+        <source>System error while loading external block file: %s</source>
+        <translation type="unfinished">Kervisvilla undir innlesing av ytri blokkfílu: %s</translation>
     </message>
     <message>
-        <source>Message</source>
-        <translation type="unfinished">Boð</translation>
+        <source>System error while saving block to disk: %s</source>
+        <translation type="unfinished">Kervisvilla undir goymslu av blokki á diski: %s</translation>
     </message>
     <message>
-        <source>Comment</source>
-        <translation type="unfinished">Viðmerking</translation>
+        <source>The %s path uses exFAT, which is known to have intermittent corruption problems on macOS. Move this directory to a different filesystem to avoid data loss.</source>
+        <translation type="unfinished">Leiðin %s er á exFAT fílukervi, ið hevur orð fyri at, óregluligani, elva til avskeplanartrupulleikar á macOS. Flyt skjáttuna á eitt annað fílukervi til tess at fyribyrgja dátumiss.</translation>
     </message>
     <message>
-        <source>Inputs</source>
-        <translation type="unfinished">Ískoytir</translation>
+        <source>The source code is available from %s.</source>
+        <translation type="unfinished">Keldukotan er tøk á %s.</translation>
     </message>
     <message>
-        <source>Amount</source>
-        <translation type="unfinished">Upphædd</translation>
+        <source>The specified config file %s does not exist</source>
+        <translation type="unfinished">Ásetta uppsetanarfílan %s finst ikki</translation>
     </message>
     <message>
-        <source>true</source>
-        <translation type="unfinished">satt</translation>
+        <source>The total exceeds your balance when the %s transaction fee is included.</source>
+        <translation type="unfinished">Útgjaldið er hægri enn tín tøka salda, tá avgjaldið á %s er íroknað.</translation>
     </message>
     <message>
-        <source>false</source>
-        <translation type="unfinished">ósatt</translation>
+        <source>The transaction amount is too small to pay the fee</source>
+        <translation type="unfinished">Upphæddin fyri flytingina er ov lítil til at gjalda avgjaldið</translation>
     </message>
-</context>
-<context>
-    <name>TransactionDescDialog</name>
     <message>
-        <source>Details for %1</source>
-        <translation type="unfinished">Nágreinilig lýsing um %1</translation>
+        <source>The transactions removal process can only be executed within a db txn</source>
+        <translation type="unfinished">Tilgongdin, at strika flytingar, kann einans útinnast í eini dátugrunsger</translation>
     </message>
-</context>
-<context>
-    <name>TransactionTableModel</name>
     <message>
-        <source>Type</source>
-        <translation type="unfinished">Slag</translation>
+        <source>The wallet will avoid paying less than the minimum relay fee.</source>
+        <translation type="unfinished">Mappan ber seg undan at gjalda minni enn framsendingaravgjalds lágmarkið.</translation>
     </message>
     <message>
-        <source>Label</source>
-        <translation type="unfinished">Spjaldur</translation>
+        <source>There is no ScriptPubKeyManager for this address</source>
+        <translation type="unfinished">Tað er eingin ScriptPubKeyManager fyri hesa adressuna</translation>
     </message>
     <message>
-        <source>Sent to</source>
-        <translation type="unfinished">Sent til</translation>
+        <source>This is experimental software.</source>
+        <translation type="unfinished">Hetta er royndar-ritbúnaður.</translation>
     </message>
     <message>
-        <source>(no label)</source>
-        <translation type="unfinished">(einki spjaldur)</translation>
+        <source>This is the minimum transaction fee you pay on every transaction.</source>
+        <translation type="unfinished">Hetta er lágmarkið fyri flytingaravgjald tú geldur fyri hvørja flyting.</translation>
     </message>
-    </context>
-<context>
-    <name>TransactionView</name>
     <message>
-        <source>Today</source>
-        <translation type="unfinished">Í dag</translation>
+        <source>Transaction %s does not belong to this wallet</source>
+        <translation type="unfinished">Flyting %s hoyrur ikki til hesa mappuna</translation>
     </message>
     <message>
-        <source>This week</source>
-        <translation type="unfinished">Hesa vikuna</translation>
+        <source>Transaction amount too small</source>
+        <translation type="unfinished">Flytingarupphædd ov lítil</translation>
     </message>
     <message>
-        <source>This month</source>
-        <translation type="unfinished">Hendan mánaðin</translation>
+        <source>Transaction amounts must not be negative</source>
+        <translation type="unfinished">Flytingarupphæddir skulu ikki vera negativar</translation>
     </message>
     <message>
-        <source>Last month</source>
-        <translation type="unfinished">Síðsta mánað</translation>
+        <source>Transaction change output index out of range</source>
+        <translation type="unfinished">Ógildigt raðtal, fyri vekslipeningaúttakið í flytingini</translation>
     </message>
     <message>
-        <source>This year</source>
-        <translation type="unfinished">Í ár</translation>
+        <source>Transaction must have at least one recipient</source>
+        <translation type="unfinished">Flytingin noyðist at hava minst ein móttakara</translation>
     </message>
     <message>
-        <source>Sent to</source>
-        <translation type="unfinished">Sent til</translation>
+        <source>Transaction needs a change address, but we can't generate it.</source>
+        <translation type="unfinished">Flytingin tørvar eina adressu til vekslipeningin, men tað eydnaðist ikki at framleiða hana.</translation>
     </message>
     <message>
-        <source>Min amount</source>
-        <translation type="unfinished">Minstaupphædd</translation>
+        <source>Transaction too large</source>
+        <translation type="unfinished">Flytingin er ov stór</translation>
     </message>
     <message>
-        <source>Range…</source>
-        <translation type="unfinished">Talstrekki...</translation>
+        <source>Unable to bind to %s on this computer (bind returned error %s)</source>
+        <translation type="unfinished">Bar ikki til at binda til %s á hesi telduni (binding elvdi til villu %s)</translation>
     </message>
     <message>
-        <source>&amp;Copy address</source>
-        <translation type="unfinished">&amp;Avrita adressu</translation>
+        <source>Unable to bind to %s on this computer. %s is probably already running.</source>
+        <translation type="unfinished">Bar ikki til at binda til %s á hesi telduni. Møguliga tí at %s longu koyrur.</translation>
     </message>
     <message>
-        <source>Copy &amp;label</source>
-        <translation type="unfinished">Avrita &amp;spjaldur</translation>
+        <source>Unable to create the PID file '%s': %s</source>
+        <translation type="unfinished">Bar ikki til at gera PID fíluna '%s': %s</translation>
     </message>
     <message>
-        <source>Copy &amp;amount</source>
-        <translation type="unfinished">Avrita &amp;upphædd</translation>
+        <source>Unable to find UTXO for external input</source>
+        <translation type="unfinished">Fann ikki ónýtt flytingarúttak til ytri inntak</translation>
     </message>
     <message>
-        <source>&amp;Edit address label</source>
-        <translation type="unfinished">&amp;Broyt adressuspjaldur</translation>
+        <source>Unable to open %s for writing</source>
+        <translation type="unfinished">Bar ikki til at lata %s upp við skrivirættindum</translation>
     </message>
     <message>
-        <source>Show in %1</source>
-        <extracomment>Transactions table context menu action to show the selected transaction in a third-party block explorer. %1 is a stand-in argument for the URL of the explorer.</extracomment>
-        <translation type="unfinished">Vís í %1</translation>
+        <source>Unable to parse -maxuploadtarget: '%s'</source>
+        <translation type="unfinished">Bar ikki til at tulkað -maxuploadtarget: '%s'</translation>
     </message>
     <message>
-        <source>Type</source>
-        <translation type="unfinished">Slag</translation>
+        <source>Unable to start HTTP server. See debug log for details.</source>
+        <translation type="unfinished">Bar ikki til at koyra HTTP ambætara. Sí smálutir í gerðalistanum.</translation>
     </message>
     <message>
-        <source>Label</source>
-        <translation type="unfinished">Spjaldur</translation>
+        <source>Unknown -blockfilterindex value %s.</source>
+        <translation type="unfinished">Ókent -blockfilterindex virði %s.</translation>
     </message>
     <message>
-        <source>Address</source>
-        <translation type="unfinished">Adressa</translation>
+        <source>Unknown address type '%s'</source>
+        <translation type="unfinished">Ókent adressuslag '%s'</translation>
     </message>
     <message>
-        <source>Range:</source>
-        <translation type="unfinished">Talstrekki:</translation>
+        <source>Unknown change type '%s'</source>
+        <translation type="unfinished">Ókent slag av vekslipeningi '%s'</translation>
     </message>
     <message>
-        <source>to</source>
-        <translation type="unfinished">til</translation>
+        <source>Unknown network specified in -onlynet: '%s'</source>
+        <translation type="unfinished">Ókent net tilskila í -onlynet: '%s'</translation>
     </message>
-</context>
-<context>
-    <name>WalletFrame</name>
     <message>
-        <source>Error</source>
-        <translation type="unfinished">Villa</translation>
+        <source>Unknown new rules activated (versionbit %i)</source>
+        <translation type="unfinished">Ókend nýggj reglugerð virkt (versionbit %i)</translation>
     </message>
-    </context>
-<context>
-    <name>WalletModel</name>
     <message>
-        <source>Increase:</source>
-        <translation type="unfinished">Øking:</translation>
+        <source>Unrecognised option "%s" provided in -test=&lt;option&gt;.</source>
+        <translation type="unfinished">Ókend áseting "%s" ásett -test=&lt;option&gt;.</translation>
     </message>
-    </context>
-<context>
-    <name>WalletView</name>
     <message>
-        <source>Cancel</source>
-        <translation type="unfinished">Avlýs</translation>
+        <source>Unsupported global logging level %s=%s. Valid values: %s.</source>
+        <translation type="unfinished">Ógildigur heiltøkugerðalistabólkur %s=%s. Gildigir bólkar: %s.</translation>
     </message>
-</context>
-<context>
-    <name>bitcoin-core</name>
     <message>
-        <source>The %s developers</source>
-        <translation type="unfinished">%smennararnir</translation>
+        <source>Wallet file creation failed: %s</source>
+        <translation type="unfinished">Miseydnaðist at gera mappufílu: %s</translation>
     </message>
     <message>
-        <source>%s request to listen on port %u. This port is considered "bad" and thus it is unlikely that any peer will connect to it. See doc/p2p-bad-ports.md for details and a full list.</source>
-        <translation type="unfinished">%s umbøn at lurta á portur %u. Hetta portrið er tulkað "óhóskandi" og tí er ósannlíkt at nakar viðskiftari sambindur í tað. Sí lista yvir "óhóskandi" portur og nágreiniligari upplýsingar í doc/p2p-bad-ports.md.</translation>
+        <source>Warning: Found invalid chain more than 6 blocks longer than our best chain. This could be due to database corruption or consensus incompatibility with peers.</source>
+        <translation type="unfinished">Gev gætur: Fann ógildiga ketu, ið er meira enn 6 blokkar longur enn okkara besta keta. Hetta kann vera orsaka av avskeplaðum dátugrunni ella vantandi semju við aðrar javningar.</translation>
     </message>
     <message>
-        <source>%s is set very high!</source>
-        <translation type="unfinished">Ásetingin %s er sera høgt!</translation>
+        <source>acceptstalefeeestimates is not supported on %s chain.</source>
+        <translation type="unfinished">acceptstalefeeestimates er ikki møguligt á %s ketuni.</translation>
     </message>
     <message>
-        <source>-maxmempool must be at least %d MB</source>
-        <translation type="unfinished">-maxmempool skal vera í minsta lagi %d MB</translation>
+        <source>Unsupported logging category %s=%s.</source>
+        <translation type="unfinished">Ógildigur gerðalistabólkur %s=%s.</translation>
     </message>
     <message>
-        <source>Outbound connections restricted to CJDNS (-onlynet=cjdns) but -cjdnsreachable is not provided</source>
-        <translation type="unfinished">Útgangandi sambond eru avmarkaði til CJDNS (-onlynet=cjdns) men -cjdnsreachable er ikki ásett.</translation>
+        <source>Error loading %s: Wallet is a legacy wallet. Please migrate to a descriptor wallet using the migration tool (migratewallet RPC).</source>
+        <translation type="unfinished">Villa undir innlesing av %s: Mappuforsniðið er av eldra slagnum. Vinaliga uppstiga til lyklalýsingar-mappu, við uppstiganaramboðnum (migratewallet RPC).</translation>
     </message>
     <message>
-        <source>Outbound connections restricted to i2p (-onlynet=i2p) but -i2psam is not provided</source>
-        <translation type="unfinished">Útgangandi sambond avmarkaði til i2p (-onlynet=i2p) men -i2psam er ikki ásett.</translation>
+        <source>Error: Dumpfile specifies an unsupported database format (%s). Only sqlite database dumps are supported</source>
+        <translation type="unfinished">Villa: Ókent dátugrunsforsnið (%s) í dumsfílu. Forritið hevur einans kunnleika til sqlite dátugrunnar</translation>
     </message>
     <message>
-        <source>Error loading %s</source>
-        <translation type="unfinished">Villa við innlesan %s</translation>
+        <source>Failed to calculate bump fees, because unconfirmed UTXOs depend on an enormous cluster of unconfirmed transactions.</source>
+        <translation type="unfinished">Miseydnaðist at rokna avgjald fyri avgjaldshækkan, av tí at óváttaðu ónýttu flytingarúttøkini eru treytað av eini stórari mongd av óváttaðum flytingum.</translation>
     </message>
     <message>
-        <source>Error reading configuration file: %s</source>
-        <translation type="unfinished">Villa við innlesing av uppsetanarfílu: %s</translation>
+        <source>Transaction requires one destination of non-zero value, a non-zero feerate, or a pre-selected input</source>
+        <translation type="unfinished">Ein flyting tørvar eitt útgjald ella ein avgjaldssats, ið er hægri enn null; ella eitt undanvalt inntak</translation>
     </message>
     <message>
-        <source>Error reading from database, shutting down.</source>
-        <translation type="unfinished">Villa við innlesan av dátugrunni. Letur aftur.</translation>
+        <source>Unrecognized descriptor found. Loading wallet %s
+
+The wallet might have been created on a newer version.
+Please try running the latest software version.
+</source>
+        <translation type="unfinished">Fann ókenda lyklalýsing undir innlesing av mappuni %s
+
+Møguligt er at mappan var gjørd við nýggjari útgávu av forritinum.
+Vinaliga royn við nýggjastu útgávu av forritinum.
+</translation>
     </message>
     <message>
-        <source>Error: Disk space is low for %s</source>
-        <translation type="unfinished">Villa: Tøkt disk goymslupláss og lítið til %s</translation>
+        <source>Do you want to rebuild the databases now?</source>
+        <translation type="unfinished">Ynskir tú at endurbyggja dátugrunnin nú?</translation>
     </message>
     <message>
-        <source>Error: Got key that was not hex: %s</source>
-        <translation type="unfinished">Villa: Fekk lykil ið ikki er sekstandatal: %s</translation>
+        <source>Error: Could not add watchonly tx %s to watchonly wallet</source>
+        <translation type="unfinished">Villa: Bar ikki til at knýta eygleidda flyting %s til eygleiðingarmappu</translation>
     </message>
     <message>
-        <source>Error: Got value that was not hex: %s</source>
-        <translation type="unfinished">Villa: Fekk virði ið ikki er sekstandatal: %s</translation>
+        <source>Error: Could not delete watchonly transactions. </source>
+        <translation type="unfinished">Villa: Bar ikki til at strikað eygleiddar flytingar.</translation>
     </message>
     <message>
-        <source>Error: No %s addresses available.</source>
-        <translation type="unfinished">Villa: Ongar %s adressur tøkar.</translation>
+        <source>Error: Wallet does not exist</source>
+        <translation type="unfinished">Villa: Mappa finst ikki</translation>
     </message>
     <message>
-        <source>Error: Unable to begin reading all records in the database</source>
-        <translation type="unfinished">Villa: Bar ikki til at byrja at innlesa skrásetingar í dátugrunninum</translation>
+        <source>Error: cannot remove legacy wallet records</source>
+        <translation type="unfinished">Villa: Bar ikki til at strika teigarað tilhoyrandi eldri mappu</translation>
     </message>
     <message>
-        <source>Error: Unable to parse version %u as a uint32_t</source>
-        <translation type="unfinished">Villa: Bar ikki til at tulkað útgávu %u sum uint32_t</translation>
+        <source>Failed to start indexes, shutting down…</source>
+        <translation type="unfinished">Miseydnaðist at seta skrásetingar í gongd. Letur aftur…</translation>
     </message>
     <message>
-        <source>Error: Unable to read all records in the database</source>
-        <translation type="unfinished">Villa: Bar ikki til at innlesa allar skrásetingar í dátugrunninum</translation>
+        <source>Invalid -proxy address or hostname, ends with '=': '%s'</source>
+        <translation type="unfinished">Ógildigt -proxy atsetur ella vertsnavn, endar við '=': '%s'</translation>
     </message>
     <message>
-        <source>Failed to listen on any port. Use -listen=0 if you want this.</source>
-        <translation type="unfinished">Miseydnaðist at lurta á nøkrum portri. Brúka -listen=0 um tú ikki ynskir at lurta á nøkrum portri.</translation>
+        <source>Not enough file descriptors available. %d available, %d required.</source>
+        <translation type="unfinished">Ov fá fílulýsiorð tøk. %d eru tøk, og tørvur er á %d.</translation>
     </message>
     <message>
-        <source>Listening for incoming connections failed (listen returned error %s)</source>
-        <translation type="unfinished">Lurtingin eftir inngangandi sambondum miseydnaðist (lurtingin gav villuna %s)</translation>
+        <source>Unrecognized network in -proxy='%s': '%s'</source>
+        <translation type="unfinished">Ókent net í -proxy='%s': '%s'</translation>
     </message>
     <message>
-        <source>No addresses available</source>
-        <translation type="unfinished">Ongar adressur tøkar</translation>
+        <source>User Agent comment (%s) contains unsafe characters.</source>
+        <translation type="unfinished">Óhóskandi stavur í viðmerking í viðskiftarastrongi (%s).</translation>
     </message>
     <message>
-        <source>The source code is available from %s.</source>
-        <translation type="unfinished">Keldukotan er tøk á %s.</translation>
+        <source>Verifying blocks…</source>
+        <translation type="unfinished">Sannroynir blokkar…</translation>
     </message>
     <message>
-        <source>The specified config file %s does not exist</source>
-        <translation type="unfinished">Ásetta uppsetanarfílan %s finst ikki</translation>
+        <source>Verifying wallet(s)…</source>
+        <translation type="unfinished">Sannroynir mappu(r)…</translation>
     </message>
     <message>
-        <source>This is experimental software.</source>
-        <translation type="unfinished">Hetta er royndar-ritbúnaður.</translation>
+        <source>Wallet needed to be rewritten: restart %s to complete</source>
+        <translation type="unfinished">Tørvur er at endurrita mappuna: avgreið tað við at endurbyrja %s</translation>
     </message>
     <message>
         <source>Settings file could not be read</source>
diff --git a/src/qt/locale/bitcoin_fr.ts b/src/qt/locale/bitcoin_fr.ts
index 6b27d1b21feb..2c081ddd2a6a 100644
--- a/src/qt/locale/bitcoin_fr.ts
+++ b/src/qt/locale/bitcoin_fr.ts
@@ -375,6 +375,11 @@ Il n’est possible de signer qu’avec les adresses de type « legacy ».</tr
         <extracomment>Short-lived peer connection type that solicits known addresses from a peer.</extracomment>
         <translation type="unfinished">Récupération d’adresses</translation>
     </message>
+    <message>
+        <source>Private Broadcast</source>
+        <extracomment>Short-lived peer connection type that is used for broadcasting privacy-sensitive data.</extracomment>
+        <translation type="unfinished">Diffusion privée</translation>
+    </message>
     <message>
         <source>%1 d</source>
         <translation type="unfinished">%1 j</translation>
@@ -593,6 +598,10 @@ Il n’est possible de signer qu’avec les adresses de type « legacy ».</tr
         <source>Close All Wallets…</source>
         <translation type="unfinished">Fermer tous les portefeuilles…</translation>
     </message>
+    <message>
+        <source>Restore and Migrate Wallet File…</source>
+        <translation type="unfinished">Restaurer et migrer le fichier du portefeuille…</translation>
+    </message>
     <message>
         <source>&amp;File</source>
         <translation type="unfinished">&amp;Fichier</translation>
@@ -648,7 +657,7 @@ Il n’est possible de signer qu’avec les adresses de type « legacy ».</tr
     <message numerus="yes">
         <source>Processed %n block(s) of transaction history.</source>
         <translation type="unfinished">
-            <numerusform>%n bloc d’historique transactionnel a été traité.</numerusform>
+            <numerusform>%n blocs d’historique transactionnel ont été traités.</numerusform>
             <numerusform>%n blocs d’historique transactionnel ont été traités.</numerusform>
         </translation>
     </message>
@@ -756,11 +765,11 @@ Il n’est possible de signer qu’avec les adresses de type « legacy ».</tr
     </message>
     <message>
         <source>&amp;Mask values</source>
-        <translation type="unfinished">&amp;Masquer les montants</translation>
+        <translation type="unfinished">&amp;Cacher les montants</translation>
     </message>
     <message>
         <source>Mask the values in the Overview tab</source>
-        <translation type="unfinished">Masquer les montants dans l’onglet Vue d’ensemble</translation>
+        <translation type="unfinished">Cacher les montants dans l’onglet Vue d’ensemble</translation>
     </message>
     <message>
         <source>No wallets available</source>
@@ -779,13 +788,30 @@ Il n’est possible de signer qu’avec les adresses de type « legacy ».</tr
     <message>
         <source>Restore Wallet</source>
         <extracomment>Title of pop-up window shown when the user is attempting to restore a wallet.</extracomment>
-        <translation type="unfinished">Restaurer le portefeuille</translation>
+        <translation type="unfinished">Restauration du portefeuille</translation>
     </message>
     <message>
         <source>Wallet Name</source>
         <extracomment>Label of the input field where the name of the wallet is entered.</extracomment>
         <translation type="unfinished">Nom du portefeuille</translation>
     </message>
+    <message>
+        <source>Invalid Wallet Name</source>
+        <translation type="unfinished">Le nom du portefeuille est invalide</translation>
+    </message>
+    <message>
+        <source>Wallet name cannot be empty</source>
+        <translation type="unfinished">Le nom du portefeuille ne peut pas être vide</translation>
+    </message>
+    <message>
+        <source>Restore and Migrate Wallet Backup</source>
+        <translation type="unfinished">Restaurer et migrer la sauvegarde du portefeuille</translation>
+    </message>
+    <message>
+        <source>Restore and Migrate Wallet</source>
+        <extracomment>Title of pop-up window shown when the user is attempting to restore a wallet.</extracomment>
+        <translation type="unfinished">Restaurer et migrer le portefeuille</translation>
+    </message>
     <message>
         <source>&amp;Window</source>
         <translation type="unfinished">&amp;Fenêtre</translation>
@@ -1058,7 +1084,7 @@ Il n’est possible de signer qu’avec les adresses de type « legacy ».</tr
     <message>
         <source>Create Wallet</source>
         <extracomment>Title of window indicating the progress of creation of a new wallet.</extracomment>
-        <translation type="unfinished">Créer un portefeuille</translation>
+        <translation type="unfinished">Création du portefeuille</translation>
     </message>
     <message>
         <source>Creating Wallet &lt;b&gt;%1&lt;/b&gt;…</source>
@@ -1087,7 +1113,7 @@ Il n’est possible de signer qu’avec les adresses de type « legacy ».</tr
     <message>
         <source>Load Wallets</source>
         <extracomment>Title of progress window which is displayed when wallets are being loaded.</extracomment>
-        <translation type="unfinished">Charger les portefeuilles</translation>
+        <translation type="unfinished">Chargement des portefeuilles</translation>
     </message>
     <message>
         <source>Loading wallets…</source>
@@ -1137,6 +1163,40 @@ Le processus de migration créera une sauvegarde du portefeuille avant migration
         <source>Solvable but not watched scripts have been migrated to a new wallet named '%1'.</source>
         <translation type="unfinished">Les scripts solubles, mais non surveillés ont été migrés vers un nouveau portefeuille nommé « %1 ».</translation>
     </message>
+    <message>
+        <source>Restore and Migrate wallet</source>
+        <translation type="unfinished">Restaurer et migrer le portefeuille</translation>
+    </message>
+    <message>
+        <source>Are you sure you wish to restore the wallet file &lt;i&gt;%1&lt;/i&gt; to &lt;i&gt;%2&lt;/i&gt; and migrate it?</source>
+        <translation type="unfinished">Confirmez-vous vouloir restaurer le fichier portefeuille &lt;i&gt;%1&lt;/i&gt; vers &lt;i&gt;%2&lt;/i&gt; et le migrer ?</translation>
+    </message>
+    <message>
+        <source>Restoring the wallet will copy the backup file to the wallets directory and place it in the standard wallet directory layout. The original file will not be modified.
+
+Migrating the wallet will convert the restored wallet to one or more descriptor wallets. A new wallet backup will need to be made.
+If this wallet contains any watchonly scripts, a new wallet will be created which contains those watchonly scripts.
+If this wallet contains any solvable but not watched scripts, a different and new wallet will be created which contains those scripts.
+
+The migration process will create a backup of the wallet before migrating. This backup file will be named &lt;wallet name&gt;-&lt;timestamp&gt;.legacy.bak and can be found in the directory for this wallet. In the event of an incorrect migration, the backup can be restored with the "Restore Wallet" functionality.</source>
+        <translation type="unfinished">La restauration du portefeuille copie le fichier de sauvegarde dans le dossier des portefeuilles et le place dans la structure habituelle du dossier des portefeuilles. Le fichier d’origine n’est pas modifié.
+
+La migration du portefeuille convertit le portefeuille restauré en un ou plusieurs portefeuilles de descripteurs. Une nouvelle sauvegarde du portefeuille devra être effectuée.
+Si ce portefeuille comprend des scripts en observation, un nouveau portefeuille est créé qui comprend ces scripts en observation. 
+Si ce portefeuille comprend des scripts dépensables, mais non observés, un nouveau portefeuille différent est créé qui comporte ces scripts.
+
+Le processus de migration crée une sauvegarde du portefeuille avant migration. Ce fichier de sauvegarde est nommé &lt;wallet name&gt;-&lt;timestamp&gt;.legacy.bak et se trouve dans le dossier de ce portefeuille. En cas de migration erronée, la sauvegarde peut être restaurée avec la fonction « Restaurer le portefeuille ».</translation>
+    </message>
+    <message>
+        <source>Restore Wallet</source>
+        <extracomment>Title of progress window which is displayed when wallets are being restored.</extracomment>
+        <translation type="unfinished">Restaurer le portefeuille</translation>
+    </message>
+    <message>
+        <source>Restoring Wallet &lt;b&gt;%1&lt;/b&gt;…</source>
+        <extracomment>Descriptive text of the restore wallets progress window which indicates to the user that wallets are currently being restored.</extracomment>
+        <translation type="unfinished">Restauration du portefeuille &lt;b&gt;%1&lt;/b&gt;…</translation>
+    </message>
     <message>
         <source>Migration failed</source>
         <translation type="unfinished">Échec de migration</translation>
@@ -1172,7 +1232,7 @@ Le processus de migration créera une sauvegarde du portefeuille avant migration
     <message>
         <source>Restore Wallet</source>
         <extracomment>Title of progress window which is displayed when wallets are being restored.</extracomment>
-        <translation type="unfinished">Restaurer le portefeuille</translation>
+        <translation type="unfinished">Restauration du portefeuille</translation>
     </message>
     <message>
         <source>Restoring Wallet &lt;b&gt;%1&lt;/b&gt;…</source>
@@ -1261,8 +1321,8 @@ Le processus de migration créera une sauvegarde du portefeuille avant migration
         <translation type="unfinished">Désactiver les clés privées</translation>
     </message>
     <message>
-        <source>Make a blank wallet. Blank wallets do not initially have private keys or scripts. Private keys and addresses can be imported, or an HD seed can be set, at a later time.</source>
-        <translation type="unfinished">Créer un portefeuilles vide. Les portefeuilles vides n’ont initialement ni clé privée ni script. Ultérieurement, des clés privées et des adresses peuvent être importées ou une graine HD peut être définie.</translation>
+        <source>Make a blank wallet. Blank wallets do not initially have private keys or scripts. Private keys and addresses can be imported using descriptors at a later time.</source>
+        <translation type="unfinished">Créer un portefeuille vide. Les portefeuilles vides n’ont initialement ni clé privée ni script. Ultérieurement, des clés privées et des adresses peuvent être importées en utilisant des descripteurs.</translation>
     </message>
     <message>
         <source>Make Blank Wallet</source>
@@ -1716,12 +1776,12 @@ Le processus de migration créera une sauvegarde du portefeuille avant migration
     <message>
         <source>Enable &amp;PSBT controls</source>
         <extracomment>An options window setting to enable PSBT controls.</extracomment>
-        <translation type="unfinished">Activer les contrôles &amp;TBPS</translation>
+        <translation type="unfinished">Activer les contrôles &amp;TBSP</translation>
     </message>
     <message>
         <source>Whether to show PSBT controls.</source>
         <extracomment>Tooltip text for options window setting that enables PSBT controls.</extracomment>
-        <translation type="unfinished">Afficher ou non les contrôles TBPS.</translation>
+        <translation type="unfinished">Afficher ou non les contrôles TBSP.</translation>
     </message>
     <message>
         <source>External Signer (e.g. hardware wallet)</source>
@@ -1962,7 +2022,7 @@ Le processus de migration créera une sauvegarde du portefeuille avant migration
     </message>
     <message>
         <source>Privacy mode activated for the Overview tab. To unmask the values, uncheck Settings-&gt;Mask values.</source>
-        <translation type="unfinished">Le mode privé est activé dans l’onglet Vue d’ensemble. Pour afficher les montants, décocher Paramètres &gt; Masquer les montants.</translation>
+        <translation type="unfinished">Le mode privé est activé dans l’onglet Vue d’ensemble. Pour afficher les montants, décocher Paramètres &gt; Cacher les montants.</translation>
     </message>
 </context>
 <context>
@@ -2007,9 +2067,12 @@ Le processus de migration créera une sauvegarde du portefeuille avant migration
         <source>Could not sign any more inputs.</source>
         <translation type="unfinished">Aucune autre entrée n’a pu être signée.</translation>
     </message>
-    <message>
-        <source>Signed %1 inputs, but more signatures are still required.</source>
-        <translation type="unfinished">%1 entrées ont été signées, mais il faut encore d’autres signatures.</translation>
+    <message numerus="yes">
+        <source>Signed %n input(s), but more signatures are still required.</source>
+        <translation type="unfinished">
+            <numerusform>%n entrée a été signée, mais d'autres signatures sont encore nécessaires.</numerusform>
+            <numerusform>%n entrées ont été signées, mais d'autres signatures sont encore nécessaires.</numerusform>
+        </translation>
     </message>
     <message>
         <source>Signed transaction successfully. Transaction is ready to broadcast.</source>
@@ -2068,9 +2131,12 @@ Le processus de migration créera une sauvegarde du portefeuille avant migration
         <source>or</source>
         <translation type="unfinished">ou</translation>
     </message>
-    <message>
-        <source>Transaction has %1 unsigned inputs.</source>
-        <translation type="unfinished">La transaction a %1 entrées non signées.</translation>
+    <message numerus="yes">
+        <source>Transaction has %n unsigned input(s).</source>
+        <translation type="unfinished">
+            <numerusform>La transaction a %n entrée non signée.</numerusform>
+            <numerusform>La transaction a %n entrées non signées.</numerusform>
+        </translation>
     </message>
     <message>
         <source>Transaction is missing some information about inputs.</source>
@@ -2340,10 +2406,6 @@ If you are receiving this error you should request the merchant provide a BIP21
         <source>Transaction Relay</source>
         <translation type="unfinished">Relais de transactions</translation>
     </message>
-    <message>
-        <source>Starting Block</source>
-        <translation type="unfinished">Bloc de départ</translation>
-    </message>
     <message>
         <source>Synced Headers</source>
         <translation type="unfinished">En-têtes synchronisés</translation>
@@ -2553,6 +2615,11 @@ If you are receiving this error you should request the merchant provide a BIP21
         <extracomment>Explanatory text for a short-lived outbound peer connection that is used to request addresses from a peer.</extracomment>
         <translation type="unfinished">Récupération d’adresse sortante : de courte durée, pour solliciter des adresses</translation>
     </message>
+    <message>
+        <source>Private broadcast: short-lived, for broadcasting privacy-sensitive transactions</source>
+        <extracomment>Explanatory text for a short-lived outbound peer connection that is used to broadcast privacy-sensitive data (like our transactions).</extracomment>
+        <translation type="unfinished">Diffusion privée : de courte durée, pour diffuser des transactions sensibles en termes de confidentialité</translation>
+    </message>
     <message>
         <source>detecting: peer could be v1 or v2</source>
         <extracomment>Explanatory text for "detecting" transport type.</extracomment>
@@ -3209,10 +3276,6 @@ Note : Les frais étant calculés par octet, un taux de frais de « 100 satoshi
         <source>The amount exceeds your balance.</source>
         <translation type="unfinished">Le montant dépasse votre solde.</translation>
     </message>
-    <message>
-        <source>The total exceeds your balance when the %1 transaction fee is included.</source>
-        <translation type="unfinished">Le montant dépasse votre solde quand les frais de transaction de %1 sont compris.</translation>
-    </message>
     <message>
         <source>Duplicate address found: addresses should only be used once each.</source>
         <translation type="unfinished">Une adresse identique a été trouvée : chaque adresse ne devrait être utilisée qu’une fois.</translation>
@@ -3228,8 +3291,8 @@ Note : Les frais étant calculés par octet, un taux de frais de « 100 satoshi
     <message numerus="yes">
         <source>Estimated to begin confirmation within %n block(s).</source>
         <translation type="unfinished">
-            <numerusform>Début de confirmation estimé à %n bloc.</numerusform>
-            <numerusform>Début de confirmation estimé à %n de blocs.</numerusform>
+            <numerusform>Début de confirmation estimé à %n blocs.</numerusform>
+            <numerusform>Début de confirmation estimé à %n blocs.</numerusform>
         </translation>
     </message>
     <message>
@@ -3542,8 +3605,8 @@ Note : Les frais étant calculés par octet, un taux de frais de « 100 satoshi
     <message numerus="yes">
         <source>matures in %n more block(s)</source>
         <translation type="unfinished">
-            <numerusform>arrivera à maturité dans %n bloc</numerusform>
-            <numerusform>arrivera à maturité dans %n de blocs</numerusform>
+            <numerusform>arrivera à maturité dans %n blocs</numerusform>
+            <numerusform>arrivera à maturité dans %n blocs</numerusform>
         </translation>
     </message>
     <message>
@@ -3942,7 +4005,7 @@ Accédez à Fichier &gt; Ouvrir un portefeuille pour en charger un.
     </message>
     <message>
         <source>PSBT copied</source>
-        <translation type="unfinished">La TBPS a été copiée</translation>
+        <translation type="unfinished">La TBSP a été copiée</translation>
     </message>
     <message>
         <source>Fee-bump PSBT copied to clipboard</source>
@@ -4143,10 +4206,6 @@ Accédez à Fichier &gt; Ouvrir un portefeuille pour en charger un.
         <source>Warning: Private keys detected in wallet {%s} with disabled private keys</source>
         <translation type="unfinished">Avertissement : Des clés privées ont été détectées dans le portefeuille {%s} avec des clés privées désactivées</translation>
     </message>
-    <message>
-        <source>Warning: We do not appear to fully agree with our peers! You may need to upgrade, or other nodes may need to upgrade.</source>
-        <translation type="unfinished">Avertissement : Nous ne semblons pas être en accord complet avec nos pairs. Une mise à niveau pourrait être nécessaire pour vous ou pour d’autres nœuds du réseau.</translation>
-    </message>
     <message>
         <source>Witness data for blocks after height %d requires validation. Please restart with -reindex.</source>
         <translation type="unfinished">Les données témoin pour les blocs postérieurs à la hauteur %d exigent une validation. Redémarrez avec -reindex.</translation>
@@ -4248,14 +4307,6 @@ Accédez à Fichier &gt; Ouvrir un portefeuille pour en charger un.
         <source>Option '-checkpoints' is set but checkpoints were removed. This option has no effect.</source>
         <translation type="unfinished">L’option « -checkpoints » est activée, mais les points de contrôle ont été supprimés. Cette option n’a aucun effet.</translation>
     </message>
-    <message>
-        <source>Option '-maxorphantx' is set but no longer has any effect (see release notes). Please remove it from your configuration.</source>
-        <translation type="unfinished">L’option « -maxorphantx » est définie, mais n’a plus aucun effet (voir les notes de mise à jour). Supprimez-la de votre configuration.</translation>
-    </message>
-    <message>
-        <source>Options '-datacarrier' or '-datacarriersize' are set but are marked as deprecated. They will be removed in a future version.</source>
-        <translation type="unfinished">Les options « -datacarrier » ou « -datacarriersize » sont définies, mais marquées comme obsolètes. Elles seront supprimées dans une version ultérieure.</translation>
-    </message>
     <message>
         <source>Outbound connections restricted to CJDNS (-onlynet=cjdns) but -cjdnsreachable is not provided</source>
         <translation type="unfinished">Les connexions sortantes sont limitées à CJDNS (-onlynet=cjdns), mais -cjdnsreachable n’est pas indiqué</translation>
@@ -4346,10 +4397,6 @@ Impossible de restaurer la sauvegarde du portefeuille</translation>
         <source>whitebind may only be used for incoming connections ("out" was passed)</source>
         <translation type="unfinished">« whitebind » ne peut être utilisé que pour les connexions entrantes (« out » a été passé)</translation>
     </message>
-    <message>
-        <source>-paytxfee is deprecated and will be fully removed in v31.0.</source>
-        <translation type="unfinished">« -paytxfee » est obsolète et sera complètement supprimé dans la version 31.0.</translation>
-    </message>
     <message>
         <source>A fatal internal error occurred, see debug.log for details: </source>
         <translation type="unfinished">Une erreur interne fatale est survenue. Pour plus de précisions, consultez debug.log :</translation>
@@ -4370,10 +4417,6 @@ Impossible de restaurer la sauvegarde du portefeuille</translation>
         <source>Can't spend unconfirmed version 3 pre-selected input with a version %d tx</source>
         <translation type="unfinished">Impossible de dépenser une entrée présélectionnée non confirmée de version 3 avec une transaction de version %d</translation>
     </message>
-    <message>
-        <source>Cannot add WalletDescriptor to a non-descriptor wallet</source>
-        <translation type="unfinished">Impossible d’ajouter WalletDescriptor à un portefeuille qui n’est pas à descripteurs</translation>
-    </message>
     <message>
         <source>Cannot write to directory '%s'; check permissions.</source>
         <translation type="unfinished">Impossible d’écrire dans le dossier « %s » ; vérifiez les droits.</translation>
@@ -4406,6 +4449,10 @@ Impossible de restaurer la sauvegarde du portefeuille</translation>
         <source>Could not parse asmap file %s</source>
         <translation type="unfinished">Impossible d’analyser le fichier asmap %s</translation>
     </message>
+    <message>
+        <source>Could not read embedded asmap data</source>
+        <translation type="unfinished">Impossible de lire les données asmap intégrées</translation>
+    </message>
     <message>
         <source>Could not top up scriptPubKeys</source>
         <translation type="unfinished">Impossible de remplir la réserve interne d’adresses (ScriptPubKey)</translation>
@@ -4427,8 +4474,8 @@ Impossible de restaurer la sauvegarde du portefeuille</translation>
         <translation type="unfinished">Échec du contrôle d’intégrité de la cryptographie à courbe elliptique. Fermeture de %s.</translation>
     </message>
     <message>
-        <source>Error creating %s</source>
-        <translation type="unfinished">Erreur de création de %s</translation>
+        <source>Embedded asmap data not available</source>
+        <translation type="unfinished">Les données asmap intégrées ne sont pas proposées</translation>
     </message>
     <message>
         <source>Error initializing block database</source>
@@ -4438,10 +4485,6 @@ Impossible de restaurer la sauvegarde du portefeuille</translation>
         <source>Error loading %s</source>
         <translation type="unfinished">Erreur de chargement de %s</translation>
     </message>
-    <message>
-        <source>Error loading %s: Private keys can only be disabled during creation</source>
-        <translation type="unfinished">Erreur de chargement de %s : les clés privées ne peuvent être désactivées qu’à la création</translation>
-    </message>
     <message>
         <source>Error loading %s: Wallet corrupted</source>
         <translation type="unfinished">Erreur de chargement de %s : le portefeuille est corrompu</translation>
@@ -4590,10 +4633,6 @@ Impossible de restaurer la sauvegarde du portefeuille</translation>
         <source>Failed to close file when writing block.</source>
         <translation type="unfinished">Échec de fermeture du fichier pendant l’écriture du bloc.</translation>
     </message>
-    <message>
-        <source>Failed to connect best block (%s).</source>
-        <translation type="unfinished">Échec de connexion du meilleur bloc (%s).</translation>
-    </message>
     <message>
         <source>Failed to disconnect block.</source>
         <translation type="unfinished">Échec de déconnexion du bloc.</translation>
@@ -4618,14 +4657,6 @@ Impossible de restaurer la sauvegarde du portefeuille</translation>
         <source>Failed to write block.</source>
         <translation type="unfinished">Échec d’écriture du bloc.</translation>
     </message>
-    <message>
-        <source>Failed to write to block index database.</source>
-        <translation type="unfinished">Échec d’écriture dans la base de données d’index des blocs.</translation>
-    </message>
-    <message>
-        <source>Failed to write to coin database.</source>
-        <translation type="unfinished">Échec d’écriture dans la base de données des pièces.</translation>
-    </message>
     <message>
         <source>Failed to write undo data.</source>
         <translation type="unfinished">Échec d’écriture des données d’annulation.</translation>
@@ -4678,14 +4709,26 @@ Impossible de restaurer la sauvegarde du portefeuille</translation>
         <source>Invalid P2P permission: '%s'</source>
         <translation type="unfinished">Autorisation P2P invalide : « %s »</translation>
     </message>
-    <message>
-        <source>Invalid amount for %s=&lt;amount&gt;: '%s' (must be at least %s)</source>
-        <translation type="unfinished">Le montant est invalide pour %s=&lt;amount&gt; : « %s » (doit être au moins %s)</translation>
-    </message>
     <message>
         <source>Invalid amount for %s=&lt;amount&gt;: '%s'</source>
         <translation type="unfinished">Le montant est invalide pour %s=&lt;amount&gt; : « %s »</translation>
     </message>
+    <message>
+        <source>A %zu MiB dbcache may be too large for a system memory of only %zu MiB.</source>
+        <translation type="unfinished">Un cache de base de données (dbcache) de %zu Mio peut être trop volumineux pour une mémoire système de seulement %zu Mio.</translation>
+    </message>
+    <message>
+        <source>Creating wallet…</source>
+        <translation type="unfinished">Création du portefeuille…</translation>
+    </message>
+    <message>
+        <source>Duplicate binding configuration for address %s. Please check your -bind, -bind=...=onion and -whitebind settings.</source>
+        <translation type="unfinished">Configuration de liaison en double pour l’adresse %s. Vérifiez vos paramètres -bind, -bind=...=onion et -whitebind.</translation>
+    </message>
+    <message>
+        <source>Error creating %s: Could not write version metadata.</source>
+        <translation type="unfinished">Erreur de création de %s : impossible d’écrire les métadonnées de la version.</translation>
+    </message>
     <message>
         <source>Invalid amount for -%s=&lt;amount&gt;: '%s'</source>
         <translation type="unfinished">Le montant est invalide pour -%s=&lt;amount&gt; : « %s »</translation>
@@ -4750,6 +4793,26 @@ Impossible de restaurer la sauvegarde du portefeuille</translation>
         <source>Only direction was set, no permissions: '%s'</source>
         <translation type="unfinished">Seule la direction a été définie, sans droits : « %s »</translation>
     </message>
+    <message>
+        <source>Option '-limitancestorsize' is given but ancestor size limits have been replaced with cluster size limits (see -limitclustersize). This option has no effect.</source>
+        <translation type="unfinished">L’option « -limitancestorsize » est indiquée, mais les limites de taille des ancêtres ont été remplacées par des limites de taille des grappes (voir -limitclustersize). Cette option n’a aucun effet.</translation>
+    </message>
+    <message>
+        <source>Option '-limitdescendantsize' is given but descendant size limits have been replaced with cluster size limits (see -limitclustersize). This option has no effect.</source>
+        <translation type="unfinished">L’option « -limitdescendantsize » est indiquée, mais les limites de taille des descendants ont été remplacées par des limites de taille des grappes (voir -limitclustersize). Cette option n’a aucun effet.</translation>
+    </message>
+    <message>
+        <source>Private broadcast of own transactions requested (-privatebroadcast) and -proxyrandomize is disabled. Tor circuits for private broadcast connections may be correlated to other connections over Tor. For maximum privacy set -proxyrandomize=1.</source>
+        <translation type="unfinished">La diffusion privée de vos propres transactions est demandée (-privatebroadcast) et -proxyrandomize est désactivé. Les circuits Tor pour les connexions de diffusion privée peuvent être mis en corrélation à d’autres connexions sur le réseau Tor. Pour une confidentialité maximale, définissez -proxyrandomize=1.</translation>
+    </message>
+    <message>
+        <source>Private broadcast of own transactions requested (-privatebroadcast), but -connect is also configured. They are incompatible because the private broadcast needs to open new connections to randomly chosen Tor or I2P peers. Consider using -maxconnections=0 -addnode=... instead</source>
+        <translation type="unfinished">Une diffusion privée des vos propres transactions a été demandée (-privatebroadcast), mais -connect est aussi configuré. Ces arguments sont incompatibles, car la diffusion privée nécessite d’ouvrir de nouvelles connexions vers des pairs Tor ou I2P choisis au hasard. Envisagez de plutôt utiliser -maxconnections=0 -addnode=...</translation>
+    </message>
+    <message>
+        <source>Private broadcast of own transactions requested (-privatebroadcast), but none of Tor or I2P networks is reachable</source>
+        <translation type="unfinished">La diffusion privée de vos propres transactions est demandée (-privatebroadcast), mais les réseaux Tor et I2P sont inaccessibles</translation>
+    </message>
     <message>
         <source>Prune cannot be configured with a negative value.</source>
         <translation type="unfinished">L’élagage ne peut pas être configuré avec une valeur négative</translation>
@@ -4758,6 +4821,10 @@ Impossible de restaurer la sauvegarde du portefeuille</translation>
         <source>Prune mode is incompatible with -txindex.</source>
         <translation type="unfinished">Le mode élagage n’est pas compatible avec -txindex</translation>
     </message>
+    <message>
+        <source>Prune mode is incompatible with -txospenderindex.</source>
+        <translation type="unfinished">Le mode élagage n’est pas compatible avec -txospenderindex.</translation>
+    </message>
     <message>
         <source>Pruning blockstore…</source>
         <translation type="unfinished">Élagage du magasin de blocs…</translation>
@@ -4858,6 +4925,10 @@ Impossible de restaurer la sauvegarde du portefeuille</translation>
         <source>The specified config file %s does not exist</source>
         <translation type="unfinished">Le fichier de configuration indiqué %s n’existe pas</translation>
     </message>
+    <message>
+        <source>The total exceeds your balance when the %s transaction fee is included.</source>
+        <translation type="unfinished">Le montant dépasse votre solde quand les frais de transaction de %s sont compris.</translation>
+    </message>
     <message>
         <source>The transaction amount is too small to pay the fee</source>
         <translation type="unfinished">Le montant de la transaction est trop bas pour que les frais soient payés</translation>
@@ -4882,10 +4953,6 @@ Impossible de restaurer la sauvegarde du portefeuille</translation>
         <source>This is the minimum transaction fee you pay on every transaction.</source>
         <translation type="unfinished">Il s’agit des frais minimaux que vous payez pour chaque transaction.</translation>
     </message>
-    <message>
-        <source>This is the transaction fee you will pay if you send a transaction.</source>
-        <translation type="unfinished">Les frais que vous payerez si vous envoyez une transaction.</translation>
-    </message>
     <message>
         <source>Transaction %s does not belong to this wallet</source>
         <translation type="unfinished">La transaction %s n’appartient pas à ce portefeuille</translation>
@@ -4974,6 +5041,10 @@ Impossible de restaurer la sauvegarde du portefeuille</translation>
         <source>Wallet file creation failed: %s</source>
         <translation type="unfinished">Échec de création du fichier du portefeuille : %s</translation>
     </message>
+    <message>
+        <source>Warning: Found invalid chain more than 6 blocks longer than our best chain. This could be due to database corruption or consensus incompatibility with peers.</source>
+        <translation type="unfinished">Avertissement : une chaîne invalide a été trouvée dépassant de plus de 6 blocs notre meilleure chaîne. Cela peut être causé par la corruption de la base de données ou à une incompatibilité de consensus avec les pairs.</translation>
+    </message>
     <message>
         <source>acceptstalefeeestimates is not supported on %s chain.</source>
         <translation type="unfinished">acceptstalefeeestimates n’est pas pris en charge sur la chaîne %s.</translation>
diff --git a/src/qt/locale/bitcoin_ga.ts b/src/qt/locale/bitcoin_ga.ts
index 7b1aa5a7be1e..c52083a3009a 100644
--- a/src/qt/locale/bitcoin_ga.ts
+++ b/src/qt/locale/bitcoin_ga.ts
@@ -371,6 +371,11 @@ Ní féidir síniú ach le seoltaí 'oidhreachta'.</translation>
         <extracomment>Short-lived peer connection type that solicits known addresses from a peer.</extracomment>
         <translation type="unfinished">Seoladh Fetch</translation>
     </message>
+    <message>
+        <source>Private Broadcast</source>
+        <extracomment>Short-lived peer connection type that is used for broadcasting privacy-sensitive data.</extracomment>
+        <translation type="unfinished">Craoladh Príobháideach</translation>
+    </message>
     <message>
         <source>%1 d</source>
         <translation type="unfinished">%1 l</translation>
@@ -591,6 +596,10 @@ Ní féidir síniú ach le seoltaí 'oidhreachta'.</translation>
         <source>Close All Wallets…</source>
         <translation type="unfinished">Dún Gach Sparán…</translation>
     </message>
+    <message>
+        <source>Restore and Migrate Wallet File…</source>
+        <translation type="unfinished">Athchóirigh agus Imircigh Comhad Sparán…</translation>
+    </message>
     <message>
         <source>&amp;File</source>
         <translation type="unfinished">&amp;Comhad</translation>
@@ -785,6 +794,23 @@ Ní féidir síniú ach le seoltaí 'oidhreachta'.</translation>
         <extracomment>Label of the input field where the name of the wallet is entered.</extracomment>
         <translation type="unfinished">Ainm Sparán</translation>
     </message>
+    <message>
+        <source>Invalid Wallet Name</source>
+        <translation type="unfinished">Ainm Sparáin Neamhbhailí</translation>
+    </message>
+    <message>
+        <source>Wallet name cannot be empty</source>
+        <translation type="unfinished">Ní féidir ainm an sparáin a fhágáil folamh</translation>
+    </message>
+    <message>
+        <source>Restore and Migrate Wallet Backup</source>
+        <translation type="unfinished">Athchóirigh agus Imircigh Cúltaca Sparán</translation>
+    </message>
+    <message>
+        <source>Restore and Migrate Wallet</source>
+        <extracomment>Title of pop-up window shown when the user is attempting to restore a wallet.</extracomment>
+        <translation type="unfinished">Athchóirigh agus Imirce Sparán</translation>
+    </message>
     <message>
         <source>&amp;Window</source>
         <translation type="unfinished">&amp;Fuinneog</translation>
@@ -1145,6 +1171,40 @@ Cruthóidh an próiseas imirce cúltaca den sparán roimh imirce. Ainmneofar an
         <source>Solvable but not watched scripts have been migrated to a new wallet named '%1'.</source>
         <translation type="unfinished">Aistríodh scripteanna intuaslagtha ach nach bhfuiltear ag faire orthu go sparán nua darb ainm '%1'.</translation>
     </message>
+    <message>
+        <source>Restore and Migrate wallet</source>
+        <translation type="unfinished">Athchóirigh agus Imirce an sparán</translation>
+    </message>
+    <message>
+        <source>Are you sure you wish to restore the wallet file &lt;i&gt;%1&lt;/i&gt; to &lt;i&gt;%2&lt;/i&gt; and migrate it?</source>
+        <translation type="unfinished">An bhfuil tú cinnte gur mian leat an comhad sparán &lt;i&gt;%1&lt;/i&gt; a athchóiriú go &lt;i&gt;%2&lt;/i&gt; agus é a aistriú?</translation>
+    </message>
+    <message>
+        <source>Restoring the wallet will copy the backup file to the wallets directory and place it in the standard wallet directory layout. The original file will not be modified.
+
+Migrating the wallet will convert the restored wallet to one or more descriptor wallets. A new wallet backup will need to be made.
+If this wallet contains any watchonly scripts, a new wallet will be created which contains those watchonly scripts.
+If this wallet contains any solvable but not watched scripts, a different and new wallet will be created which contains those scripts.
+
+The migration process will create a backup of the wallet before migrating. This backup file will be named &lt;wallet name&gt;-&lt;timestamp&gt;.legacy.bak and can be found in the directory for this wallet. In the event of an incorrect migration, the backup can be restored with the "Restore Wallet" functionality.</source>
+        <translation type="unfinished">Má athbhunaítear an sparán, cóipeálfar an comhad cúltaca chuig an eolaire sparán agus cuirfear é i leagan amach caighdeánach an eolaire sparán. Ní dhéanfar an comhad bunaidh a mhodhnú.
+
+Má aistrítear an sparán, tiontófar an sparán athchóirithe go sparán tuairisciúil amháin nó níos mó. Beidh gá le cúltaca nua sparán a dhéanamh.
+Má tá aon scripteanna faire amháin sa sparán seo, cruthófar sparán nua ina mbeidh na scripteanna faire amháin sin.
+Má tá aon scripteanna inréitithe ach nach bhfuil faire orthu sa sparán seo, cruthófar sparán difriúil agus nua ina mbeidh na scripteanna sin.
+
+Cruthófar cúltaca den sparán le linn an phróisis imirce sula ndéantar an t-imirce. Tabharfar &lt;wallet name&gt;-&lt;timestamp&gt;.legacy.bak ar an gcomhad cúltaca seo agus is féidir é a fháil san eolaire don sparán seo. I gcás imirce mhícheart, is féidir an cúltaca a athchóiriú leis an fheidhmiúlacht "Athchóirigh Sparán".</translation>
+    </message>
+    <message>
+        <source>Restore Wallet</source>
+        <extracomment>Title of progress window which is displayed when wallets are being restored.</extracomment>
+        <translation type="unfinished">Athchóirigh Sparán</translation>
+    </message>
+    <message>
+        <source>Restoring Wallet &lt;b&gt;%1&lt;/b&gt;…</source>
+        <extracomment>Descriptive text of the restore wallets progress window which indicates to the user that wallets are currently being restored.</extracomment>
+        <translation type="unfinished">Sparán á Athchóiriú&lt;b&gt;%1&lt;/b&gt;…</translation>
+    </message>
     <message>
         <source>Migration failed</source>
         <translation type="unfinished">Theip ar an imirce</translation>
@@ -1269,8 +1329,8 @@ Cruthóidh an próiseas imirce cúltaca den sparán roimh imirce. Ainmneofar an
         <translation type="unfinished">Díchumasaigh Eochracha Príobháideacha</translation>
     </message>
     <message>
-        <source>Make a blank wallet. Blank wallets do not initially have private keys or scripts. Private keys and addresses can be imported, or an HD seed can be set, at a later time.</source>
-        <translation type="unfinished">Déan sparán glan. Níl eochracha príobháideacha nó scripteanna ag sparán glan i dtosach. Is féidir eochracha agus seoltaí príobháideacha a iompórtáil, nó is féidir síol Cinnteachaíocha Ordlathach a shocrú níos déanaí.</translation>
+        <source>Make a blank wallet. Blank wallets do not initially have private keys or scripts. Private keys and addresses can be imported using descriptors at a later time.</source>
+        <translation type="unfinished">Cruthaigh sparán bán. Ní bhíonn eochracha príobháideacha ná scripteanna ag sparán bán ar dtús. Is féidir eochracha príobháideacha agus seoltaí a allmhairiú ag baint úsáide as tuairiscí ag tráth níos déanaí.</translation>
     </message>
     <message>
         <source>Make Blank Wallet</source>
@@ -2007,9 +2067,13 @@ Cruthóidh an próiseas imirce cúltaca den sparán roimh imirce. Ainmneofar an
         <source>Could not sign any more inputs.</source>
         <translation type="unfinished">Níorbh fhéidir níos mó ionchuir a shíniú.</translation>
     </message>
-    <message>
-        <source>Signed %1 inputs, but more signatures are still required.</source>
-        <translation type="unfinished">Ionchuir %1 sínithe, ach tá tuilleadh sínithe fós ag teastáil.</translation>
+    <message numerus="yes">
+        <source>Signed %n input(s), but more signatures are still required.</source>
+        <translation type="unfinished">
+            <numerusform>%n ionchur sínithe, ach tá níos mó sínithe fós ag teastáil.</numerusform>
+            <numerusform>%n ionchur sínithe, ach tá níos mó sínithe fós ag teastáil.</numerusform>
+            <numerusform>%n ionchur sínithe, ach tá níos mó sínithe fós ag teastáil.</numerusform>
+        </translation>
     </message>
     <message>
         <source>Signed transaction successfully. Transaction is ready to broadcast.</source>
@@ -2068,9 +2132,13 @@ Cruthóidh an próiseas imirce cúltaca den sparán roimh imirce. Ainmneofar an
         <source>or</source>
         <translation type="unfinished">nó</translation>
     </message>
-    <message>
-        <source>Transaction has %1 unsigned inputs.</source>
-        <translation type="unfinished">Tá %1 ionchur gan sín ag an idirbheart.</translation>
+    <message numerus="yes">
+        <source>Transaction has %n unsigned input(s).</source>
+        <translation type="unfinished">
+            <numerusform>Tá %n ionchur(anna) gan síniú san idirbheart.</numerusform>
+            <numerusform>Tá %n ionchur(anna) gan síniú san idirbheart.</numerusform>
+            <numerusform>Tá %n ionchur(anna) gan síniú san idirbheart.</numerusform>
+        </translation>
     </message>
     <message>
         <source>Transaction is missing some information about inputs.</source>
@@ -2360,10 +2428,6 @@ Má tá an earráid seo á fáil agat ba cheart duit iarraidh ar an díoltóir U
         <source>Transaction Relay</source>
         <translation type="unfinished">Leaschraolacháin Idirbheart</translation>
     </message>
-    <message>
-        <source>Starting Block</source>
-        <translation type="unfinished">Bloc Tosaigh</translation>
-    </message>
     <message>
         <source>Synced Headers</source>
         <translation type="unfinished">Ceanntásca Sioncronaithe</translation>
@@ -2581,6 +2645,11 @@ Má tá an earráid seo á fáil agat ba cheart duit iarraidh ar an díoltóir U
         <extracomment>Explanatory text for a short-lived outbound peer connection that is used to request addresses from a peer.</extracomment>
         <translation type="unfinished">Faigh Seoladh Amach: gearrthéarmach, chun seoltaí a lorg</translation>
     </message>
+    <message>
+        <source>Private broadcast: short-lived, for broadcasting privacy-sensitive transactions</source>
+        <extracomment>Explanatory text for a short-lived outbound peer connection that is used to broadcast privacy-sensitive data (like our transactions).</extracomment>
+        <translation type="unfinished">Craoladh príobháideach: gearrshaolach, le haghaidh craoladh idirbheart íogair ó thaobh príobháideachta de</translation>
+    </message>
     <message>
         <source>detecting: peer could be v1 or v2</source>
         <extracomment>Explanatory text for "detecting" transport type.</extracomment>
@@ -3248,10 +3317,6 @@ Nóta: Ós rud é go ríomhtar an táille ar bhonn in aghaidh an bheart, ní tha
         <source>The amount exceeds your balance.</source>
         <translation type="unfinished">Sáraíonn an méid d’iarmhéid.</translation>
     </message>
-    <message>
-        <source>The total exceeds your balance when the %1 transaction fee is included.</source>
-        <translation type="unfinished">Sáraíonn an t-iomlán d’iarmhéid nuair a chuirtear an táille idirbhirt %1 san áireamh.</translation>
-    </message>
     <message>
         <source>Duplicate address found: addresses should only be used once each.</source>
         <translation type="unfinished">Seoladh dúblach faighte: níor cheart seoltaí a úsáid ach uair amháin an ceann.</translation>
@@ -4218,10 +4283,6 @@ Téigh go Comhad &gt; Oscail Sparán chun sparán a lódáil.
         <source>Warning: Private keys detected in wallet {%s} with disabled private keys</source>
         <translation type="unfinished">Rabhadh: Eochracha príobháideacha braite i sparán {%s} le heochracha príobháideacha díchumasaithe</translation>
     </message>
-    <message>
-        <source>Warning: We do not appear to fully agree with our peers! You may need to upgrade, or other nodes may need to upgrade.</source>
-        <translation type="unfinished">Rabhadh: Is cosúil nach n-aontaímid go hiomlán lenár piaraí! B’fhéidir go mbeidh ort uasghrádú a dhéanamh, nó b’fhéidir go mbeidh ar nóid eile uasghrádú.</translation>
-    </message>
     <message>
         <source>Witness data for blocks after height %d requires validation. Please restart with -reindex.</source>
         <translation type="unfinished">Teastaíonn bailíochtú sonraí finné maidir le bloic tar éis airde %d. Atosaigh le -reindex le do thoil.</translation>
@@ -4323,14 +4384,6 @@ Téigh go Comhad &gt; Oscail Sparán chun sparán a lódáil.
         <source>Option '-checkpoints' is set but checkpoints were removed. This option has no effect.</source>
         <translation type="unfinished">Tá an rogha '-checkpoints' socraithe ach baineadh seicphointí. Níl aon éifeacht ag an rogha seo.</translation>
     </message>
-    <message>
-        <source>Option '-maxorphantx' is set but no longer has any effect (see release notes). Please remove it from your configuration.</source>
-        <translation type="unfinished">Tá an rogha '-maxorphantx' socraithe ach níl aon éifeacht aici a thuilleadh (féach nótaí scaoilte). Bain as do chumraíocht í le do thoil.</translation>
-    </message>
-    <message>
-        <source>Options '-datacarrier' or '-datacarriersize' are set but are marked as deprecated. They will be removed in a future version.</source>
-        <translation type="unfinished">Tá na roghanna '-datacarrier' nó '-datacarriersize' socraithe ach tá siad marcáilte mar as feidhm. Bainfear iad i leagan amach anseo.</translation>
-    </message>
     <message>
         <source>Outbound connections restricted to CJDNS (-onlynet=cjdns) but -cjdnsreachable is not provided</source>
         <translation type="unfinished">Naisc amach teoranta do CJDNS (-onlynet=cjdns) ach ní chuirtear -cjdnsreachable ar fáil</translation>
@@ -4420,10 +4473,6 @@ Ní féidir cúltaca an sparán a chur ar ais.</translation>
         <source>whitebind may only be used for incoming connections ("out" was passed)</source>
         <translation type="unfinished">ní féidir ceangaltán bán a úsáid ach amháin le haghaidh naisc isteach (ritheadh ​​​​"amach")</translation>
     </message>
-    <message>
-        <source>-paytxfee is deprecated and will be fully removed in v31.0.</source>
-        <translation type="unfinished">Tá -paytxfee imithe i léig agus bainfear go hiomlán é i leagan 31.0.</translation>
-    </message>
     <message>
         <source>A fatal internal error occurred, see debug.log for details: </source>
         <translation type="unfinished">Tharla earráid mharfach inmheánach, féach debug.log le haghaidh sonraí:</translation>
@@ -4437,8 +4486,12 @@ Ní féidir cúltaca an sparán a chur ar ais.</translation>
         <translation type="unfinished">Cuireadh isteach ar an bhfíorú blocála</translation>
     </message>
     <message>
-        <source>Cannot add WalletDescriptor to a non-descriptor wallet</source>
-        <translation type="unfinished">Ní féidir WalletDescriptor a chur le sparán neamh-thuairisciúil</translation>
+        <source>Can't spend unconfirmed version %d pre-selected input with a version 3 tx</source>
+        <translation type="unfinished">Ní féidir leagan %d ionchur réamhroghnaithe neamhdheimhnithe a chaitheamh le haistriú leagan 3</translation>
+    </message>
+    <message>
+        <source>Can't spend unconfirmed version 3 pre-selected input with a version %d tx</source>
+        <translation type="unfinished">Ní féidir ionchur réamhroghnaithe neamhdheimhnithe leagan 3 a chaitheamh le leagan %d tx</translation>
     </message>
     <message>
         <source>Cannot write to directory '%s'; check permissions.</source>
@@ -4472,6 +4525,10 @@ Ní féidir cúltaca an sparán a chur ar ais.</translation>
         <source>Could not parse asmap file %s</source>
         <translation type="unfinished">Níorbh fhéidir comhad asmap %s a pharsáil</translation>
     </message>
+    <message>
+        <source>Could not read embedded asmap data</source>
+        <translation type="unfinished">Níorbh fhéidir sonraí asmap leabaithe a léamh</translation>
+    </message>
     <message>
         <source>Could not top up scriptPubKeys</source>
         <translation type="unfinished">Níorbh fhéidir scriptPubKeys a athlánú</translation>
@@ -4493,8 +4550,8 @@ Ní féidir cúltaca an sparán a chur ar ais.</translation>
         <translation type="unfinished">Teip seiceála sláintíochta cripteagrafaíochta cuar éilipseach. Tá %s ag múchadh.</translation>
     </message>
     <message>
-        <source>Error creating %s</source>
-        <translation type="unfinished">Earráid cruthaithe %s</translation>
+        <source>Embedded asmap data not available</source>
+        <translation type="unfinished">Níl sonraí asmap leabaithe ar fáil</translation>
     </message>
     <message>
         <source>Error initializing block database</source>
@@ -4504,10 +4561,6 @@ Ní féidir cúltaca an sparán a chur ar ais.</translation>
         <source>Error loading %s</source>
         <translation type="unfinished">Earráid lódáil %s</translation>
     </message>
-    <message>
-        <source>Error loading %s: Private keys can only be disabled during creation</source>
-        <translation type="unfinished">Earráid lódáil %s: Ní féidir eochracha príobháideacha a dhíchumasú ach le linn cruthaithe</translation>
-    </message>
     <message>
         <source>Error loading %s: Wallet corrupted</source>
         <translation type="unfinished">Earráid lódáil %s: Sparán truaillithe</translation>
@@ -4656,10 +4709,6 @@ Ní féidir cúltaca an sparán a chur ar ais.</translation>
         <source>Failed to close file when writing block.</source>
         <translation type="unfinished">Theip ar an gcomhad a dhúnadh agus bloc á scríobh.</translation>
     </message>
-    <message>
-        <source>Failed to connect best block (%s).</source>
-        <translation type="unfinished">Theip ar nascadh an bhloc is fearr (%s).</translation>
-    </message>
     <message>
         <source>Failed to disconnect block.</source>
         <translation type="unfinished">Theip ar dhínascadh an bhloc.</translation>
@@ -4684,14 +4733,6 @@ Ní féidir cúltaca an sparán a chur ar ais.</translation>
         <source>Failed to write block.</source>
         <translation type="unfinished">Theip ar scríobh an bhloc.</translation>
     </message>
-    <message>
-        <source>Failed to write to block index database.</source>
-        <translation type="unfinished">Theip ar scríobh chuig an mbunachar sonraí innéacs bloc.</translation>
-    </message>
-    <message>
-        <source>Failed to write to coin database.</source>
-        <translation type="unfinished">Theip ar scríobh chuig an mbunachar sonraí boinn.</translation>
-    </message>
     <message>
         <source>Failed to write undo data.</source>
         <translation type="unfinished">Theip ar scríobh sonraí cealaigh.</translation>
@@ -4744,14 +4785,26 @@ Ní féidir cúltaca an sparán a chur ar ais.</translation>
         <source>Invalid P2P permission: '%s'</source>
         <translation type="unfinished">Cead neamhbhailí P2P: '%s'</translation>
     </message>
-    <message>
-        <source>Invalid amount for %s=&lt;amount&gt;: '%s' (must be at least %s)</source>
-        <translation type="unfinished">Méid neamhbhailí le haghaidh %s=1: '%s' (ar a laghad %s)</translation>
-    </message>
     <message>
         <source>Invalid amount for %s=&lt;amount&gt;: '%s'</source>
         <translation type="unfinished">Méid neamhbhailí le haghaidh %s=&lt;amount&gt;: '%s'</translation>
     </message>
+    <message>
+        <source>A %zu MiB dbcache may be too large for a system memory of only %zu MiB.</source>
+        <translation type="unfinished">B’fhéidir go bhfuil dbcache %zu MiB ró-mhór do chuimhne chórais de %zu MiB amháin.</translation>
+    </message>
+    <message>
+        <source>Creating wallet…</source>
+        <translation type="unfinished">Ag cruthú sparán…</translation>
+    </message>
+    <message>
+        <source>Duplicate binding configuration for address %s. Please check your -bind, -bind=...=onion and -whitebind settings.</source>
+        <translation type="unfinished">Cumraíocht cheangail dhúblach don seoladh %s. Seiceáil do shocruithe -bind, -bind=...=onion agus -whitebind le do thoil.</translation>
+    </message>
+    <message>
+        <source>Error creating %s: Could not write version metadata.</source>
+        <translation type="unfinished">Earráid ag cruthú %s: Níorbh fhéidir meiteashonraí an leagain a scríobh.</translation>
+    </message>
     <message>
         <source>Invalid amount for -%s=&lt;amount&gt;: '%s'</source>
         <translation type="unfinished">Suim neamhbhailí do -%s=&lt;amount&gt;: '%s'</translation>
@@ -4816,6 +4869,26 @@ Ní féidir cúltaca an sparán a chur ar ais.</translation>
         <source>Only direction was set, no permissions: '%s'</source>
         <translation type="unfinished">Níor socraíodh ach treo, gan cead: '%s'</translation>
     </message>
+    <message>
+        <source>Option '-limitancestorsize' is given but ancestor size limits have been replaced with cluster size limits (see -limitclustersize). This option has no effect.</source>
+        <translation type="unfinished">Tugtar an rogha '-limitancestorsize' ach tá teorainneacha méide braisle curtha in ionad teorainneacha méide sinsear (féach -limitclustersize). Níl aon éifeacht ag an rogha seo.</translation>
+    </message>
+    <message>
+        <source>Option '-limitdescendantsize' is given but descendant size limits have been replaced with cluster size limits (see -limitclustersize). This option has no effect.</source>
+        <translation type="unfinished">Tugtar an rogha '-limitdescendantsize' ach tá teorainneacha méide braisle curtha in ionad teorainneacha méide an tsliochtaigh (féach -limitclustersize). Níl aon éifeacht ag an rogha seo.</translation>
+    </message>
+    <message>
+        <source>Private broadcast of own transactions requested (-privatebroadcast) and -proxyrandomize is disabled. Tor circuits for private broadcast connections may be correlated to other connections over Tor. For maximum privacy set -proxyrandomize=1.</source>
+        <translation type="unfinished">Tá craoladh príobháideach d'idirbhearta féin a iarradh (-privatebroadcast) agus -proxyrandomize díchumasaithe. Féadfar ciorcaid Tor le haghaidh naisc chraolta príobháideacha a chomhghaolú le naisc eile thar Tor. Chun príobháideacht uasta a shocrú, socraítear -proxyrandomize=1.</translation>
+    </message>
+    <message>
+        <source>Private broadcast of own transactions requested (-privatebroadcast), but -connect is also configured. They are incompatible because the private broadcast needs to open new connections to randomly chosen Tor or I2P peers. Consider using -maxconnections=0 -addnode=... instead</source>
+        <translation type="unfinished">Iarradh craoladh príobháideach ar idirbhearta féin (-privatebroadcast), ach tá -connect cumraithe freisin. Níl siad comhoiriúnach mar ní mór don chraoladh príobháideach naisc nua a oscailt chuig piaraí Tor nó I2P a roghnaítear go randamach. Smaoinigh ar -maxconnections=0 -addnode=... a úsáid ina ionad.</translation>
+    </message>
+    <message>
+        <source>Private broadcast of own transactions requested (-privatebroadcast), but none of Tor or I2P networks is reachable</source>
+        <translation type="unfinished">Iarradh craoladh príobháideach ar idirbhearta féin (-privatebroadcast), ach níl aon cheann de líonraí Tor ná I2P inrochtana</translation>
+    </message>
     <message>
         <source>Prune cannot be configured with a negative value.</source>
         <translation type="unfinished">Ní féidir Bearradh a bheidh cumraithe le luach diúltach.</translation>
@@ -4824,6 +4897,10 @@ Ní féidir cúltaca an sparán a chur ar ais.</translation>
         <source>Prune mode is incompatible with -txindex.</source>
         <translation type="unfinished">Tá an mód bearrtha neamh-chomhoiriúnach le -txindex.</translation>
     </message>
+    <message>
+        <source>Prune mode is incompatible with -txospenderindex.</source>
+        <translation type="unfinished">Níl mód bearrtha comhoiriúnach le -txospenderindex.</translation>
+    </message>
     <message>
         <source>Pruning blockstore…</source>
         <translation type="unfinished">Blocsiopa á bhearradh…</translation>
@@ -4912,6 +4989,10 @@ Ní féidir cúltaca an sparán a chur ar ais.</translation>
         <source>System error while saving block to disk: %s</source>
         <translation type="unfinished">Earráid chórais agus an bloc á shábháil ar an diosca: %s</translation>
     </message>
+    <message>
+        <source>The %s path uses exFAT, which is known to have intermittent corruption problems on macOS. Move this directory to a different filesystem to avoid data loss.</source>
+        <translation type="unfinished">Úsáideann an cosán %s exFAT, a bhfuil aithne air go mbíonn fadhbanna truaillithe uaineacha aige ar macOS. Bog an t-eolaire seo go córas comhad difriúil chun cailliúint sonraí a sheachaint.</translation>
+    </message>
     <message>
         <source>The source code is available from %s.</source>
         <translation type="unfinished">Tá an cód foinseach ar fáil ó %s.</translation>
@@ -4920,6 +5001,10 @@ Ní féidir cúltaca an sparán a chur ar ais.</translation>
         <source>The specified config file %s does not exist</source>
         <translation type="unfinished">Níl an comhad cumraíochta sonraithe %s ann</translation>
     </message>
+    <message>
+        <source>The total exceeds your balance when the %s transaction fee is included.</source>
+        <translation type="unfinished">Sáraíonn an t-iomlán d’iarmhéid nuair a chuirtear an táille idirbhirt %s san áireamh.</translation>
+    </message>
     <message>
         <source>The transaction amount is too small to pay the fee</source>
         <translation type="unfinished">Tá suim an idirbhirt ró-bheag chun an táille a íoc</translation>
@@ -4944,10 +5029,6 @@ Ní féidir cúltaca an sparán a chur ar ais.</translation>
         <source>This is the minimum transaction fee you pay on every transaction.</source>
         <translation type="unfinished">Is é seo an táille idirbhirt íosta a íocann tú ar gach idirbheart.</translation>
     </message>
-    <message>
-        <source>This is the transaction fee you will pay if you send a transaction.</source>
-        <translation type="unfinished">Seo an táille idirbhirt a íocfaidh tú má sheolann tú idirbheart.</translation>
-    </message>
     <message>
         <source>Transaction %s does not belong to this wallet</source>
         <translation type="unfinished">Ní bhaineann an t-idirbheart %s leis an sparán seo</translation>
@@ -5036,6 +5117,10 @@ Ní féidir cúltaca an sparán a chur ar ais.</translation>
         <source>Wallet file creation failed: %s</source>
         <translation type="unfinished">Theip ar chruthú comhaid sparán: %s</translation>
     </message>
+    <message>
+        <source>Warning: Found invalid chain more than 6 blocks longer than our best chain. This could be due to database corruption or consensus incompatibility with peers.</source>
+        <translation type="unfinished">Rabhadh: Fuarthas slabhra neamhbhailí atá níos mó ná 6 bhloc níos faide ná ár slabhra is fearr. D’fhéadfadh sé seo a bheith mar gheall ar thruailliú bunachar sonraí nó neamh-chomhoiriúnacht chomhaontaithe le piaraí.</translation>
+    </message>
     <message>
         <source>acceptstalefeeestimates is not supported on %s chain.</source>
         <translation type="unfinished">ní thacaítear le acceptstalefeeestimates ar slabhra %s.</translation>
diff --git a/src/qt/locale/bitcoin_ga_IE.ts b/src/qt/locale/bitcoin_ga_IE.ts
index 7a9e57a96468..4f7d95fc42a4 100644
--- a/src/qt/locale/bitcoin_ga_IE.ts
+++ b/src/qt/locale/bitcoin_ga_IE.ts
@@ -375,6 +375,11 @@ Ní féidir síniú ach le seoltaí 'oidhreachta'.</translation>
         <extracomment>Short-lived peer connection type that solicits known addresses from a peer.</extracomment>
         <translation type="unfinished">Seoladh Fetch</translation>
     </message>
+    <message>
+        <source>Private Broadcast</source>
+        <extracomment>Short-lived peer connection type that is used for broadcasting privacy-sensitive data.</extracomment>
+        <translation type="unfinished">Craoladh Príobháideach</translation>
+    </message>
     <message>
         <source>%1 d</source>
         <translation type="unfinished">%1 l</translation>
@@ -595,6 +600,10 @@ Ní féidir síniú ach le seoltaí 'oidhreachta'.</translation>
         <source>Close All Wallets…</source>
         <translation type="unfinished">Dún Gach Sparán…</translation>
     </message>
+    <message>
+        <source>Restore and Migrate Wallet File…</source>
+        <translation type="unfinished">Athchóirigh agus Imircigh Comhad Sparán…</translation>
+    </message>
     <message>
         <source>&amp;File</source>
         <translation type="unfinished">&amp;Comhad</translation>
@@ -789,6 +798,23 @@ Ní féidir síniú ach le seoltaí 'oidhreachta'.</translation>
         <extracomment>Label of the input field where the name of the wallet is entered.</extracomment>
         <translation type="unfinished">Ainm Sparán</translation>
     </message>
+    <message>
+        <source>Invalid Wallet Name</source>
+        <translation type="unfinished">Ainm Sparáin Neamhbhailí</translation>
+    </message>
+    <message>
+        <source>Wallet name cannot be empty</source>
+        <translation type="unfinished">Ní féidir ainm an sparáin a fhágáil folamh</translation>
+    </message>
+    <message>
+        <source>Restore and Migrate Wallet Backup</source>
+        <translation type="unfinished">Athchóirigh agus Imircigh Cúltaca Sparán</translation>
+    </message>
+    <message>
+        <source>Restore and Migrate Wallet</source>
+        <extracomment>Title of pop-up window shown when the user is attempting to restore a wallet.</extracomment>
+        <translation type="unfinished">Athchóirigh agus Imirce Sparán</translation>
+    </message>
     <message>
         <source>&amp;Window</source>
         <translation type="unfinished">&amp;Fuinneog</translation>
@@ -1149,6 +1175,40 @@ Cruthóidh an próiseas imirce cúltaca den sparán roimh imirce. Ainmneofar an
         <source>Solvable but not watched scripts have been migrated to a new wallet named '%1'.</source>
         <translation type="unfinished">Aistríodh scripteanna intuaslagtha ach nach bhfuiltear ag faire orthu go sparán nua darb ainm '%1'.</translation>
     </message>
+    <message>
+        <source>Restore and Migrate wallet</source>
+        <translation type="unfinished">Athchóirigh agus Imirce an sparán</translation>
+    </message>
+    <message>
+        <source>Are you sure you wish to restore the wallet file &lt;i&gt;%1&lt;/i&gt; to &lt;i&gt;%2&lt;/i&gt; and migrate it?</source>
+        <translation type="unfinished">An bhfuil tú cinnte gur mian leat an comhad sparán &lt;i&gt;%1&lt;/i&gt; a athchóiriú go &lt;i&gt;%2&lt;/i&gt; agus é a aistriú?</translation>
+    </message>
+    <message>
+        <source>Restoring the wallet will copy the backup file to the wallets directory and place it in the standard wallet directory layout. The original file will not be modified.
+
+Migrating the wallet will convert the restored wallet to one or more descriptor wallets. A new wallet backup will need to be made.
+If this wallet contains any watchonly scripts, a new wallet will be created which contains those watchonly scripts.
+If this wallet contains any solvable but not watched scripts, a different and new wallet will be created which contains those scripts.
+
+The migration process will create a backup of the wallet before migrating. This backup file will be named &lt;wallet name&gt;-&lt;timestamp&gt;.legacy.bak and can be found in the directory for this wallet. In the event of an incorrect migration, the backup can be restored with the "Restore Wallet" functionality.</source>
+        <translation type="unfinished">Má athbhunaítear an sparán, cóipeálfar an comhad cúltaca chuig an eolaire sparán agus cuirfear é i leagan amach caighdeánach an eolaire sparán. Ní dhéanfar an comhad bunaidh a mhodhnú.
+
+Má aistrítear an sparán, tiontófar an sparán athchóirithe go sparán tuairisciúil amháin nó níos mó. Beidh gá le cúltaca nua sparán a dhéanamh.
+Má tá aon scripteanna faire amháin sa sparán seo, cruthófar sparán nua ina mbeidh na scripteanna faire amháin sin.
+Má tá aon scripteanna inréitithe ach nach bhfuil faire orthu sa sparán seo, cruthófar sparán difriúil agus nua ina mbeidh na scripteanna sin.
+
+Cruthófar cúltaca den sparán le linn an phróisis imirce sula ndéantar an t-imirce. Tabharfar &lt;wallet name&gt;-&lt;timestamp&gt;.legacy.bak ar an gcomhad cúltaca seo agus is féidir é a fháil san eolaire don sparán seo. I gcás imirce mhícheart, is féidir an cúltaca a athchóiriú leis an fheidhmiúlacht "Athchóirigh Sparán".</translation>
+    </message>
+    <message>
+        <source>Restore Wallet</source>
+        <extracomment>Title of progress window which is displayed when wallets are being restored.</extracomment>
+        <translation type="unfinished">Athchóirigh Sparán</translation>
+    </message>
+    <message>
+        <source>Restoring Wallet &lt;b&gt;%1&lt;/b&gt;…</source>
+        <extracomment>Descriptive text of the restore wallets progress window which indicates to the user that wallets are currently being restored.</extracomment>
+        <translation type="unfinished">Sparán á Athchóiriú&lt;b&gt;%1&lt;/b&gt;…</translation>
+    </message>
     <message>
         <source>Migration failed</source>
         <translation type="unfinished">Theip ar an imirce</translation>
@@ -1273,8 +1333,8 @@ Cruthóidh an próiseas imirce cúltaca den sparán roimh imirce. Ainmneofar an
         <translation type="unfinished">Díchumasaigh Eochracha Príobháideacha</translation>
     </message>
     <message>
-        <source>Make a blank wallet. Blank wallets do not initially have private keys or scripts. Private keys and addresses can be imported, or an HD seed can be set, at a later time.</source>
-        <translation type="unfinished">Déan sparán glan. Níl eochracha príobháideacha nó scripteanna ag sparán glan i dtosach. Is féidir eochracha agus seoltaí príobháideacha a iompórtáil, nó is féidir síol Cinnteachaíocha Ordlathach a shocrú níos déanaí.</translation>
+        <source>Make a blank wallet. Blank wallets do not initially have private keys or scripts. Private keys and addresses can be imported using descriptors at a later time.</source>
+        <translation type="unfinished">Cruthaigh sparán bán. Ní bhíonn eochracha príobháideacha ná scripteanna ag sparán bán ar dtús. Is féidir eochracha príobháideacha agus seoltaí a allmhairiú ag baint úsáide as tuairiscí ag tráth níos déanaí.</translation>
     </message>
     <message>
         <source>Make Blank Wallet</source>
@@ -2011,9 +2071,13 @@ Cruthóidh an próiseas imirce cúltaca den sparán roimh imirce. Ainmneofar an
         <source>Could not sign any more inputs.</source>
         <translation type="unfinished">Níorbh fhéidir níos mó ionchuir a shíniú.</translation>
     </message>
-    <message>
-        <source>Signed %1 inputs, but more signatures are still required.</source>
-        <translation type="unfinished">Ionchuir %1 sínithe, ach tá tuilleadh sínithe fós ag teastáil.</translation>
+    <message numerus="yes">
+        <source>Signed %n input(s), but more signatures are still required.</source>
+        <translation type="unfinished">
+            <numerusform>%n ionchur sínithe, ach tá níos mó sínithe fós ag teastáil.</numerusform>
+            <numerusform>%n ionchur sínithe, ach tá níos mó sínithe fós ag teastáil.</numerusform>
+            <numerusform>%n ionchur sínithe, ach tá níos mó sínithe fós ag teastáil.</numerusform>
+        </translation>
     </message>
     <message>
         <source>Signed transaction successfully. Transaction is ready to broadcast.</source>
@@ -2072,9 +2136,13 @@ Cruthóidh an próiseas imirce cúltaca den sparán roimh imirce. Ainmneofar an
         <source>or</source>
         <translation type="unfinished">nó</translation>
     </message>
-    <message>
-        <source>Transaction has %1 unsigned inputs.</source>
-        <translation type="unfinished">Tá %1 ionchur gan sín ag an idirbheart.</translation>
+    <message numerus="yes">
+        <source>Transaction has %n unsigned input(s).</source>
+        <translation type="unfinished">
+            <numerusform>Tá %n ionchur(anna) gan síniú san idirbheart.</numerusform>
+            <numerusform>Tá %n ionchur(anna) gan síniú san idirbheart.</numerusform>
+            <numerusform>Tá %n ionchur(anna) gan síniú san idirbheart.</numerusform>
+        </translation>
     </message>
     <message>
         <source>Transaction is missing some information about inputs.</source>
@@ -2364,10 +2432,6 @@ Má tá an earráid seo á fáil agat ba cheart duit iarraidh ar an díoltóir U
         <source>Transaction Relay</source>
         <translation type="unfinished">Leaschraolacháin Idirbheart</translation>
     </message>
-    <message>
-        <source>Starting Block</source>
-        <translation type="unfinished">Bloc Tosaigh</translation>
-    </message>
     <message>
         <source>Synced Headers</source>
         <translation type="unfinished">Ceanntásca Sioncronaithe</translation>
@@ -2585,6 +2649,11 @@ Má tá an earráid seo á fáil agat ba cheart duit iarraidh ar an díoltóir U
         <extracomment>Explanatory text for a short-lived outbound peer connection that is used to request addresses from a peer.</extracomment>
         <translation type="unfinished">Faigh Seoladh Amach: gearrthéarmach, chun seoltaí a lorg</translation>
     </message>
+    <message>
+        <source>Private broadcast: short-lived, for broadcasting privacy-sensitive transactions</source>
+        <extracomment>Explanatory text for a short-lived outbound peer connection that is used to broadcast privacy-sensitive data (like our transactions).</extracomment>
+        <translation type="unfinished">Craoladh príobháideach: gearrshaolach, le haghaidh craoladh idirbheart íogair ó thaobh príobháideachta de</translation>
+    </message>
     <message>
         <source>detecting: peer could be v1 or v2</source>
         <extracomment>Explanatory text for "detecting" transport type.</extracomment>
@@ -3252,10 +3321,6 @@ Nóta: Ós rud é go ríomhtar an táille ar bhonn in aghaidh an bheart, ní tha
         <source>The amount exceeds your balance.</source>
         <translation type="unfinished">Sáraíonn an méid d’iarmhéid.</translation>
     </message>
-    <message>
-        <source>The total exceeds your balance when the %1 transaction fee is included.</source>
-        <translation type="unfinished">Sáraíonn an t-iomlán d’iarmhéid nuair a chuirtear an táille idirbhirt %1 san áireamh.</translation>
-    </message>
     <message>
         <source>Duplicate address found: addresses should only be used once each.</source>
         <translation type="unfinished">Seoladh dúblach faighte: níor cheart seoltaí a úsáid ach uair amháin an ceann.</translation>
@@ -4156,7 +4221,7 @@ Téigh go Comhad &gt; Oscail Sparán chun sparán a lódáil.
     </message>
     <message>
         <source>No dump file provided. To use dump, -dumpfile=&lt;filename&gt; must be provided.</source>
-        <translation type="unfinished">Níor soláthraíodh aon chomhad dumpála. Chun Dumpáil a úsáid, ní mór -dumpfile=&lt;filename&gt;a sholáthar.</translation>
+        <translation type="unfinished">Níor soláthraíodh aon chomhad dumpála. Chun Dumpáil a úsáid, ní mór -dumpfile=&lt;filename&gt; a sholáthar.</translation>
     </message>
     <message>
         <source>Please contribute if you find %s useful. Visit %s for further information about the software.</source>
@@ -4222,10 +4287,6 @@ Téigh go Comhad &gt; Oscail Sparán chun sparán a lódáil.
         <source>Warning: Private keys detected in wallet {%s} with disabled private keys</source>
         <translation type="unfinished">Rabhadh: Eochracha príobháideacha braite i sparán {%s} le heochracha príobháideacha díchumasaithe</translation>
     </message>
-    <message>
-        <source>Warning: We do not appear to fully agree with our peers! You may need to upgrade, or other nodes may need to upgrade.</source>
-        <translation type="unfinished">Rabhadh: Is cosúil nach n-aontaímid go hiomlán lenár piaraí! B’fhéidir go mbeidh ort uasghrádú a dhéanamh, nó b’fhéidir go mbeidh ar nóid eile uasghrádú.</translation>
-    </message>
     <message>
         <source>Witness data for blocks after height %d requires validation. Please restart with -reindex.</source>
         <translation type="unfinished">Teastaíonn bailíochtú sonraí finné maidir le bloic tar éis airde %d. Atosaigh le -reindex le do thoil.</translation>
@@ -4328,14 +4389,6 @@ Téigh go Comhad &gt; Oscail Sparán chun sparán a lódáil.
         <source>Option '-checkpoints' is set but checkpoints were removed. This option has no effect.</source>
         <translation type="unfinished">Tá an rogha '-checkpoints' socraithe ach baineadh seicphointí. Níl aon éifeacht ag an rogha seo.</translation>
     </message>
-    <message>
-        <source>Option '-maxorphantx' is set but no longer has any effect (see release notes). Please remove it from your configuration.</source>
-        <translation type="unfinished">Tá an rogha '-maxorphantx' socraithe ach níl aon éifeacht aici a thuilleadh (féach nótaí scaoilte). Bain as do chumraíocht í le do thoil.</translation>
-    </message>
-    <message>
-        <source>Options '-datacarrier' or '-datacarriersize' are set but are marked as deprecated. They will be removed in a future version.</source>
-        <translation type="unfinished">Tá na roghanna '-datacarrier' nó '-datacarriersize' socraithe ach tá siad marcáilte mar as feidhm. Bainfear iad i leagan amach anseo.</translation>
-    </message>
     <message>
         <source>Outbound connections restricted to CJDNS (-onlynet=cjdns) but -cjdnsreachable is not provided</source>
         <translation type="unfinished">Naisc amach teoranta do CJDNS (-onlynet=cjdns) ach ní chuirtear -cjdnsreachable ar fáil</translation>
@@ -4399,8 +4452,7 @@ The wallet might have been tampered with or created with malicious intent.
 </source>
         <translation type="unfinished">Fuarthas iontráil oidhreachta gan choinne sa sparán tuairisceora. Sparán %s á lódáil
 
-Seans gur cuireadh isteach ar an sparán nó gur cruthaíodh é le hintinn mhailíseach.
-</translation>
+Seans gur cuireadh isteach ar an sparán nó gur cruthaíodh é le hintinn mhailíseach.</translation>
     </message>
     <message>
         <source>Your computer's date and time appear to be more than %d minutes out of sync with the network, this may lead to consensus failure. After you've confirmed your computer's clock, this message should no longer appear when you restart your node. Without a restart, it should stop showing automatically after you've connected to a sufficient number of new outbound peers, which may take some time. You can inspect the `timeoffset` field of the `getpeerinfo` and `getnetworkinfo` RPC methods to get more info.</source>
@@ -4426,10 +4478,6 @@ Ní féidir cúltaca an sparán a chur ar ais.</translation>
         <source>whitebind may only be used for incoming connections ("out" was passed)</source>
         <translation type="unfinished">ní féidir ceangaltán bán a úsáid ach amháin le haghaidh naisc isteach (ritheadh ​​​​"amach")</translation>
     </message>
-    <message>
-        <source>-paytxfee is deprecated and will be fully removed in v31.0.</source>
-        <translation type="unfinished">Tá -paytxfee imithe i léig agus bainfear go hiomlán é i leagan 31.0.</translation>
-    </message>
     <message>
         <source>A fatal internal error occurred, see debug.log for details: </source>
         <translation type="unfinished">Tharla earráid mharfach inmheánach, féach debug.log le haghaidh sonraí:</translation>
@@ -4443,8 +4491,12 @@ Ní féidir cúltaca an sparán a chur ar ais.</translation>
         <translation type="unfinished">Cuireadh isteach ar an bhfíorú blocála</translation>
     </message>
     <message>
-        <source>Cannot add WalletDescriptor to a non-descriptor wallet</source>
-        <translation type="unfinished">Ní féidir WalletDescriptor a chur le sparán neamh-thuairisciúil</translation>
+        <source>Can't spend unconfirmed version %d pre-selected input with a version 3 tx</source>
+        <translation type="unfinished">Ní féidir leagan %d ionchur réamhroghnaithe neamhdheimhnithe a chaitheamh le haistriú leagan 3</translation>
+    </message>
+    <message>
+        <source>Can't spend unconfirmed version 3 pre-selected input with a version %d tx</source>
+        <translation type="unfinished">Ní féidir ionchur réamhroghnaithe neamhdheimhnithe leagan 3 a chaitheamh le leagan %d tx</translation>
     </message>
     <message>
         <source>Cannot write to directory '%s'; check permissions.</source>
@@ -4478,6 +4530,10 @@ Ní féidir cúltaca an sparán a chur ar ais.</translation>
         <source>Could not parse asmap file %s</source>
         <translation type="unfinished">Níorbh fhéidir comhad asmap %s a pharsáil</translation>
     </message>
+    <message>
+        <source>Could not read embedded asmap data</source>
+        <translation type="unfinished">Níorbh fhéidir sonraí asmap leabaithe a léamh</translation>
+    </message>
     <message>
         <source>Could not top up scriptPubKeys</source>
         <translation type="unfinished">Níorbh fhéidir scriptPubKeys a athlánú</translation>
@@ -4499,8 +4555,8 @@ Ní féidir cúltaca an sparán a chur ar ais.</translation>
         <translation type="unfinished">Teip seiceála sláintíochta cripteagrafaíochta cuar éilipseach. Tá %s ag múchadh.</translation>
     </message>
     <message>
-        <source>Error creating %s</source>
-        <translation type="unfinished">Earráid cruthaithe %s</translation>
+        <source>Embedded asmap data not available</source>
+        <translation type="unfinished">Níl sonraí asmap leabaithe ar fáil</translation>
     </message>
     <message>
         <source>Error initializing block database</source>
@@ -4510,10 +4566,6 @@ Ní féidir cúltaca an sparán a chur ar ais.</translation>
         <source>Error loading %s</source>
         <translation type="unfinished">Earráid lódáil %s</translation>
     </message>
-    <message>
-        <source>Error loading %s: Private keys can only be disabled during creation</source>
-        <translation type="unfinished">Earráid lódáil %s: Ní féidir eochracha príobháideacha a dhíchumasú ach le linn cruthaithe</translation>
-    </message>
     <message>
         <source>Error loading %s: Wallet corrupted</source>
         <translation type="unfinished">Earráid lódáil %s: Sparán truaillithe</translation>
@@ -4662,10 +4714,6 @@ Ní féidir cúltaca an sparán a chur ar ais.</translation>
         <source>Failed to close file when writing block.</source>
         <translation type="unfinished">Theip ar an gcomhad a dhúnadh agus bloc á scríobh.</translation>
     </message>
-    <message>
-        <source>Failed to connect best block (%s).</source>
-        <translation type="unfinished">Theip ar nascadh an bhloc is fearr (%s).</translation>
-    </message>
     <message>
         <source>Failed to disconnect block.</source>
         <translation type="unfinished">Theip ar dhínascadh an bhloc.</translation>
@@ -4690,14 +4738,6 @@ Ní féidir cúltaca an sparán a chur ar ais.</translation>
         <source>Failed to write block.</source>
         <translation type="unfinished">Theip ar scríobh an bhloc.</translation>
     </message>
-    <message>
-        <source>Failed to write to block index database.</source>
-        <translation type="unfinished">Theip ar scríobh chuig an mbunachar sonraí innéacs bloc.</translation>
-    </message>
-    <message>
-        <source>Failed to write to coin database.</source>
-        <translation type="unfinished">Theip ar scríobh chuig an mbunachar sonraí boinn.</translation>
-    </message>
     <message>
         <source>Failed to write undo data.</source>
         <translation type="unfinished">Theip ar scríobh sonraí cealaigh.</translation>
@@ -4750,14 +4790,26 @@ Ní féidir cúltaca an sparán a chur ar ais.</translation>
         <source>Invalid P2P permission: '%s'</source>
         <translation type="unfinished">Cead neamhbhailí P2P: '%s'</translation>
     </message>
-    <message>
-        <source>Invalid amount for %s=&lt;amount&gt;: '%s' (must be at least %s)</source>
-        <translation type="unfinished">Méid neamhbhailí le haghaidh %s=&lt;amount&gt;: '%s' (ar a laghad %s)</translation>
-    </message>
     <message>
         <source>Invalid amount for %s=&lt;amount&gt;: '%s'</source>
         <translation type="unfinished">Méid neamhbhailí le haghaidh %s=&lt;amount&gt;: '%s'</translation>
     </message>
+    <message>
+        <source>A %zu MiB dbcache may be too large for a system memory of only %zu MiB.</source>
+        <translation type="unfinished">B’fhéidir go bhfuil dbcache %zu MiB ró-mhór do chuimhne chórais de %zu MiB amháin.</translation>
+    </message>
+    <message>
+        <source>Creating wallet…</source>
+        <translation type="unfinished">Ag cruthú sparán…</translation>
+    </message>
+    <message>
+        <source>Duplicate binding configuration for address %s. Please check your -bind, -bind=...=onion and -whitebind settings.</source>
+        <translation type="unfinished">Cumraíocht cheangail dhúblach don seoladh %s. Seiceáil do shocruithe -bind, -bind=...=onion agus -whitebind le do thoil.</translation>
+    </message>
+    <message>
+        <source>Error creating %s: Could not write version metadata.</source>
+        <translation type="unfinished">Earráid ag cruthú %s: Níorbh fhéidir meiteashonraí an leagain a scríobh.</translation>
+    </message>
     <message>
         <source>Invalid amount for -%s=&lt;amount&gt;: '%s'</source>
         <translation type="unfinished">Suim neamhbhailí do -%s=&lt;amount&gt;: '%s'</translation>
@@ -4822,6 +4874,26 @@ Ní féidir cúltaca an sparán a chur ar ais.</translation>
         <source>Only direction was set, no permissions: '%s'</source>
         <translation type="unfinished">Níor socraíodh ach treo, gan cead: '%s'</translation>
     </message>
+    <message>
+        <source>Option '-limitancestorsize' is given but ancestor size limits have been replaced with cluster size limits (see -limitclustersize). This option has no effect.</source>
+        <translation type="unfinished">Tugtar an rogha '-limitancestorsize' ach tá teorainneacha méide braisle curtha in ionad teorainneacha méide sinsear (féach -limitclustersize). Níl aon éifeacht ag an rogha seo.</translation>
+    </message>
+    <message>
+        <source>Option '-limitdescendantsize' is given but descendant size limits have been replaced with cluster size limits (see -limitclustersize). This option has no effect.</source>
+        <translation type="unfinished">Tugtar an rogha '-limitdescendantsize' ach tá teorainneacha méide braisle curtha in ionad teorainneacha méide an tsliochtaigh (féach -limitclustersize). Níl aon éifeacht ag an rogha seo.</translation>
+    </message>
+    <message>
+        <source>Private broadcast of own transactions requested (-privatebroadcast) and -proxyrandomize is disabled. Tor circuits for private broadcast connections may be correlated to other connections over Tor. For maximum privacy set -proxyrandomize=1.</source>
+        <translation type="unfinished">Tá craoladh príobháideach d'idirbhearta féin a iarradh (-privatebroadcast) agus -proxyrandomize díchumasaithe. Féadfar ciorcaid Tor le haghaidh naisc chraolta príobháideacha a chomhghaolú le naisc eile thar Tor. Chun príobháideacht uasta a shocrú, socraítear -proxyrandomize=1.</translation>
+    </message>
+    <message>
+        <source>Private broadcast of own transactions requested (-privatebroadcast), but -connect is also configured. They are incompatible because the private broadcast needs to open new connections to randomly chosen Tor or I2P peers. Consider using -maxconnections=0 -addnode=... instead</source>
+        <translation type="unfinished">Iarradh craoladh príobháideach ar idirbhearta féin (-privatebroadcast), ach tá -connect cumraithe freisin. Níl siad comhoiriúnach mar ní mór don chraoladh príobháideach naisc nua a oscailt chuig piaraí Tor nó I2P a roghnaítear go randamach. Smaoinigh ar -maxconnections=0 -addnode=... a úsáid ina ionad.</translation>
+    </message>
+    <message>
+        <source>Private broadcast of own transactions requested (-privatebroadcast), but none of Tor or I2P networks is reachable</source>
+        <translation type="unfinished">Iarradh craoladh príobháideach ar idirbhearta féin (-privatebroadcast), ach níl aon cheann de líonraí Tor ná I2P inrochtana</translation>
+    </message>
     <message>
         <source>Prune cannot be configured with a negative value.</source>
         <translation type="unfinished">Ní féidir Bearradh a bheidh cumraithe le luach diúltach.</translation>
@@ -4830,6 +4902,10 @@ Ní féidir cúltaca an sparán a chur ar ais.</translation>
         <source>Prune mode is incompatible with -txindex.</source>
         <translation type="unfinished">Tá an mód bearrtha neamh-chomhoiriúnach le -txindex.</translation>
     </message>
+    <message>
+        <source>Prune mode is incompatible with -txospenderindex.</source>
+        <translation type="unfinished">Níl mód bearrtha comhoiriúnach le -txospenderindex.</translation>
+    </message>
     <message>
         <source>Pruning blockstore…</source>
         <translation type="unfinished">Blocsiopa á bhearradh…</translation>
@@ -4918,6 +4994,10 @@ Ní féidir cúltaca an sparán a chur ar ais.</translation>
         <source>System error while saving block to disk: %s</source>
         <translation type="unfinished">Earráid chórais agus an bloc á shábháil ar an diosca: %s</translation>
     </message>
+    <message>
+        <source>The %s path uses exFAT, which is known to have intermittent corruption problems on macOS. Move this directory to a different filesystem to avoid data loss.</source>
+        <translation type="unfinished">Úsáideann an cosán %s exFAT, a bhfuil aithne air go mbíonn fadhbanna truaillithe uaineacha aige ar macOS. Bog an t-eolaire seo go córas comhad difriúil chun cailliúint sonraí a sheachaint.</translation>
+    </message>
     <message>
         <source>The source code is available from %s.</source>
         <translation type="unfinished">Tá an cód foinseach ar fáil ó %s.</translation>
@@ -4926,6 +5006,10 @@ Ní féidir cúltaca an sparán a chur ar ais.</translation>
         <source>The specified config file %s does not exist</source>
         <translation type="unfinished">Níl an comhad cumraíochta sonraithe %s ann</translation>
     </message>
+    <message>
+        <source>The total exceeds your balance when the %s transaction fee is included.</source>
+        <translation type="unfinished">Sáraíonn an t-iomlán d’iarmhéid nuair a chuirtear an táille idirbhirt %s san áireamh.</translation>
+    </message>
     <message>
         <source>The transaction amount is too small to pay the fee</source>
         <translation type="unfinished">Tá suim an idirbhirt ró-bheag chun an táille a íoc</translation>
@@ -4950,10 +5034,6 @@ Ní féidir cúltaca an sparán a chur ar ais.</translation>
         <source>This is the minimum transaction fee you pay on every transaction.</source>
         <translation type="unfinished">Is é seo an táille idirbhirt íosta a íocann tú ar gach idirbheart.</translation>
     </message>
-    <message>
-        <source>This is the transaction fee you will pay if you send a transaction.</source>
-        <translation type="unfinished">Seo an táille idirbhirt a íocfaidh tú má sheolann tú idirbheart.</translation>
-    </message>
     <message>
         <source>Transaction %s does not belong to this wallet</source>
         <translation type="unfinished">Ní bhaineann an t-idirbheart %s leis an sparán seo</translation>
@@ -5042,6 +5122,10 @@ Ní féidir cúltaca an sparán a chur ar ais.</translation>
         <source>Wallet file creation failed: %s</source>
         <translation type="unfinished">Theip ar chruthú comhaid sparán: %s</translation>
     </message>
+    <message>
+        <source>Warning: Found invalid chain more than 6 blocks longer than our best chain. This could be due to database corruption or consensus incompatibility with peers.</source>
+        <translation type="unfinished">Rabhadh: Fuarthas slabhra neamhbhailí atá níos mó ná 6 bhloc níos faide ná ár slabhra is fearr. D’fhéadfadh sé seo a bheith mar gheall ar thruailliú bunachar sonraí nó neamh-chomhoiriúnacht chomhaontaithe le piaraí.</translation>
+    </message>
     <message>
         <source>acceptstalefeeestimates is not supported on %s chain.</source>
         <translation type="unfinished">ní thacaítear le acceptstalefeeestimates ar slabhra %s.</translation>
diff --git a/src/qt/locale/bitcoin_gl.ts b/src/qt/locale/bitcoin_gl.ts
index dd67eb15f28e..2b9774380fe8 100644
--- a/src/qt/locale/bitcoin_gl.ts
+++ b/src/qt/locale/bitcoin_gl.ts
@@ -29,6 +29,10 @@
         <source>Enter address or label to search</source>
         <translation type="unfinished">Introduce enderezo ou etiqueta para buscar</translation>
     </message>
+    <message>
+        <source>Copy the currently selected address to the clipboard</source>
+        <translation type="unfinished">Copia o enderezo actualmente seleccionado ao portapapeis</translation>
+    </message>
     <message>
         <source>Export the data in the current tab to a file</source>
         <translation type="unfinished">Exportar os datos da pestaña actual a un arquivo.</translation>
@@ -502,6 +506,26 @@ Firmar é posible unicamente con enderezos de tipo 'legacy'.</translation>
         <source>Tabs toolbar</source>
         <translation type="unfinished">Barra de ferramentas</translation>
     </message>
+    <message>
+        <source>Syncing Headers (%1%)…</source>
+        <translation type="unfinished">Sincronizando Cabezeiras (%1%)...</translation>
+    </message>
+    <message>
+        <source>Synchronizing with network…</source>
+        <translation type="unfinished">Sincronizando coa rede...</translation>
+    </message>
+    <message>
+        <source>Indexing blocks on disk…</source>
+        <translation type="unfinished">Indexando bloques no disco...</translation>
+    </message>
+    <message>
+        <source>Processing blocks on disk…</source>
+        <translation type="unfinished">Procesando bloques no disco...</translation>
+    </message>
+    <message>
+        <source>Connecting to peers…</source>
+        <translation type="unfinished">Connectando con compañeiros...</translation>
+    </message>
     <message>
         <source>Request payments (generates QR codes and bitcoin: URIs)</source>
         <translation type="unfinished">Solicitar pagamentos (xera códigos QR e bitcoin: URIs)</translation>
@@ -521,14 +545,18 @@ Firmar é posible unicamente con enderezos de tipo 'legacy'.</translation>
     <message numerus="yes">
         <source>Processed %n block(s) of transaction history.</source>
         <translation type="unfinished">
-            <numerusform />
-            <numerusform />
+            <numerusform>Procesado %n bloque do historial de transaccións.</numerusform>
+            <numerusform>Procesados %n bloques do historial de transaccións.</numerusform>
         </translation>
     </message>
     <message>
         <source>%1 behind</source>
         <translation type="unfinished">%1 detrás</translation>
     </message>
+    <message>
+        <source>Catching up…</source>
+        <translation type="unfinished">Poñéndose ao día...</translation>
+    </message>
     <message>
         <source>Last received block was generated %1 ago.</source>
         <translation type="unfinished">O último bloque recibido foi xerado fai %1.</translation>
@@ -867,10 +895,6 @@ Firmar é posible unicamente con enderezos de tipo 'legacy'.</translation>
         <source>Disable Private Keys</source>
         <translation type="unfinished">Desactivar Claves Privadas</translation>
     </message>
-    <message>
-        <source>Make a blank wallet. Blank wallets do not initially have private keys or scripts. Private keys and addresses can be imported, or an HD seed can be set, at a later time.</source>
-        <translation type="unfinished">Crear unha Carteira en blanco. As carteiras en blanco non teñen inicialmente claves privadas ou scripts. As claves privadas poden ser importadas ou unha semente HD poder ser configurada, máis adiante.</translation>
-    </message>
     <message>
         <source>Make Blank Wallet</source>
         <translation type="unfinished">Crea unha Carteira en Blanco</translation>
@@ -1202,10 +1226,24 @@ Firmar é posible unicamente con enderezos de tipo 'legacy'.</translation>
         <source>Close</source>
         <translation type="unfinished">Pechar</translation>
     </message>
+    <message numerus="yes">
+        <source>Signed %n input(s), but more signatures are still required.</source>
+        <translation type="unfinished">
+            <numerusform />
+            <numerusform />
+        </translation>
+    </message>
     <message>
         <source>own address</source>
         <translation type="unfinished">dirección propia</translation>
     </message>
+    <message numerus="yes">
+        <source>Transaction has %n unsigned input(s).</source>
+        <translation type="unfinished">
+            <numerusform />
+            <numerusform />
+        </translation>
+    </message>
     </context>
 <context>
     <name>PaymentServer</name>
@@ -1534,10 +1572,6 @@ Firmar é posible unicamente con enderezos de tipo 'legacy'.</translation>
         <source>The amount exceeds your balance.</source>
         <translation type="unfinished">A cantidade sobrepasa o teu balance.</translation>
     </message>
-    <message>
-        <source>The total exceeds your balance when the %1 transaction fee is included.</source>
-        <translation type="unfinished">O total sobrepasa o teu balance cando se inclúe a tarifa de transacción %1.</translation>
-    </message>
     <message numerus="yes">
         <source>Estimated to begin confirmation within %n block(s).</source>
         <translation type="unfinished">
@@ -2045,10 +2079,6 @@ Firmar é posible unicamente con enderezos de tipo 'legacy'.</translation>
         <source>This is a pre-release test build - use at your own risk - do not use for mining or merchant applications</source>
         <translation type="unfinished">Esta é unha build de test pre-lanzamento - emprégaa baixo o teu propio risco - non empregar para minado ou aplicacións de comerciantes</translation>
     </message>
-    <message>
-        <source>Warning: We do not appear to fully agree with our peers! You may need to upgrade, or other nodes may need to upgrade.</source>
-        <translation type="unfinished">Precaución: Non parece que esteamos totalmente de acordo cos nosos pares! Pode que precises actualizar, ou outros nodos poden precisar actualizarse.</translation>
-    </message>
     <message>
         <source>default wallet</source>
         <translation type="unfinished">moedeiro por defecto</translation>
diff --git a/src/qt/locale/bitcoin_gl_ES.ts b/src/qt/locale/bitcoin_gl_ES.ts
index 6282020e613a..c578502e4d06 100644
--- a/src/qt/locale/bitcoin_gl_ES.ts
+++ b/src/qt/locale/bitcoin_gl_ES.ts
@@ -25,6 +25,10 @@
         <source>Enter address or label to search</source>
         <translation type="unfinished">Introduce un enderezo ou etiqueta para buscar</translation>
     </message>
+    <message>
+        <source>Copy the currently selected address to the clipboard</source>
+        <translation type="unfinished">Copia o enderezo actualmente seleccionado ao portapapeis</translation>
+    </message>
     <message>
         <source>Export the data in the current tab to a file</source>
         <translation type="unfinished">Exporta os datos na pestana actual a un ficheiro</translation>
@@ -490,9 +494,29 @@ Firmar é posible unicamente con enderezos de tipo 'legacy'.</translation>
         <source>Tabs toolbar</source>
         <translation type="unfinished">Barra de ferramentas das pestanas</translation>
     </message>
+    <message>
+        <source>Syncing Headers (%1%)…</source>
+        <translation type="unfinished">Sincronizando Cabezeiras (%1%)...</translation>
+    </message>
+    <message>
+        <source>Synchronizing with network…</source>
+        <translation type="unfinished">Sincronizando coa rede...</translation>
+    </message>
+    <message>
+        <source>Indexing blocks on disk…</source>
+        <translation type="unfinished">Indexando bloques no disco...</translation>
+    </message>
+    <message>
+        <source>Processing blocks on disk…</source>
+        <translation type="unfinished">Procesando bloques no disco...</translation>
+    </message>
+    <message>
+        <source>Connecting to peers…</source>
+        <translation type="unfinished">Connectando con compañeiros...</translation>
+    </message>
     <message>
         <source>Request payments (generates QR codes and bitcoin: URIs)</source>
-        <translation type="unfinished">Solicita pagamentos (xera un código QR e bitcoin : URIs)</translation>
+        <translation type="unfinished">Solicita pagamentos (xera un código QR e bitocin : URIs)</translation>
     </message>
     <message>
         <source>Show the list of used sending addresses and labels</source>
@@ -509,14 +533,18 @@ Firmar é posible unicamente con enderezos de tipo 'legacy'.</translation>
     <message numerus="yes">
         <source>Processed %n block(s) of transaction history.</source>
         <translation type="unfinished">
-            <numerusform />
-            <numerusform />
+            <numerusform>Procesado %n bloque do historial de transaccións.</numerusform>
+            <numerusform>Procesados %n bloques do historial de transaccións.</numerusform>
         </translation>
     </message>
     <message>
         <source>%1 behind</source>
         <translation type="unfinished">%1 tras</translation>
     </message>
+    <message>
+        <source>Catching up…</source>
+        <translation type="unfinished">Poñéndose ao día...</translation>
+    </message>
     <message>
         <source>Last received block was generated %1 ago.</source>
         <translation type="unfinished">O último bloque recibido foi xerado fai %1.</translation>
@@ -847,10 +875,6 @@ Firmar é posible unicamente con enderezos de tipo 'legacy'.</translation>
         <source>Disable Private Keys</source>
         <translation type="unfinished">Desactivar Claves Privadas</translation>
     </message>
-    <message>
-        <source>Make a blank wallet. Blank wallets do not initially have private keys or scripts. Private keys and addresses can be imported, or an HD seed can be set, at a later time.</source>
-        <translation type="unfinished">Crear unha Carteira en blanco. As carteiras en blanco non teñen inicialmente claves privadas ou scripts. As claves privadas poden ser importadas ou unha semente HD poder ser configurada, máis adiante.</translation>
-    </message>
     <message>
         <source>Make Blank Wallet</source>
         <translation type="unfinished">Crea unha Carteira en Blanco</translation>
@@ -971,6 +995,20 @@ Firmar é posible unicamente con enderezos de tipo 'legacy'.</translation>
         <source>Close</source>
         <translation type="unfinished">Pechar</translation>
     </message>
+    <message numerus="yes">
+        <source>Signed %n input(s), but more signatures are still required.</source>
+        <translation type="unfinished">
+            <numerusform />
+            <numerusform />
+        </translation>
+    </message>
+    <message numerus="yes">
+        <source>Transaction has %n unsigned input(s).</source>
+        <translation type="unfinished">
+            <numerusform />
+            <numerusform />
+        </translation>
+    </message>
     </context>
 <context>
     <name>PeerTableModel</name>
diff --git a/src/qt/locale/bitcoin_gu.ts b/src/qt/locale/bitcoin_gu.ts
index 7f9dd4f01c9c..32b2be5c04ee 100644
--- a/src/qt/locale/bitcoin_gu.ts
+++ b/src/qt/locale/bitcoin_gu.ts
@@ -183,6 +183,10 @@ Signing is only possible with addresses of the type 'legacy'.</source>
         <source>Continue</source>
         <translation type="unfinished">ચાલુ રાખો</translation>
     </message>
+    <message>
+        <source>Back</source>
+        <translation type="unfinished">પાછળ </translation>
+    </message>
     <message>
         <source>Remember that encrypting your wallet cannot fully protect your bitcoins from being stolen by malware infecting your computer.</source>
         <translation type="unfinished">યાદ રાખો કે તમારા વૉલેટને એન્ક્રિપ્ટ કરવાથી તમારા કમ્પ્યુટરને સંક્રમિત કરતા માલવેર દ્વારા ચોરાઈ જવાથી તમારા બિટકોઈનને સંપૂર્ણપણે સુરક્ષિત કરી શકાશે નહીં.</translation>
@@ -1117,6 +1121,16 @@ The migration process will create a backup of the wallet before migrating. This
         <source>Solvable but not watched scripts have been migrated to a new wallet named '%1'.</source>
         <translation type="unfinished">ઉકેલી શકાય તેવી પરંતુ જોયેલી સ્ક્રિપ્ટો '%1' નામના નવા વૉલેટમાં સ્થાનાંતરિત કરવામાં આવી છે.</translation>
     </message>
+    <message>
+        <source>Restore Wallet</source>
+        <extracomment>Title of progress window which is displayed when wallets are being restored.</extracomment>
+        <translation type="unfinished">વૉલેટ પુનઃસ્થાપિત કરો</translation>
+    </message>
+    <message>
+        <source>Restoring Wallet &lt;b&gt;%1&lt;/b&gt;…</source>
+        <extracomment>Descriptive text of the restore wallets progress window which indicates to the user that wallets are currently being restored.</extracomment>
+        <translation type="unfinished">વૉલેટ પુનઃસ્થાપિત કરી રહ્યાં છીએ &lt;b&gt;%1&lt;/b&gt;...</translation>
+    </message>
     <message>
         <source>Migration failed</source>
         <translation type="unfinished">સ્થળાંતર નિષ્ફળ થયું</translation>
@@ -1240,10 +1254,6 @@ The migration process will create a backup of the wallet before migrating. This
         <source>Disable Private Keys</source>
         <translation type="unfinished">ખાનગી ચાવીને અક્ષમ કરો</translation>
     </message>
-    <message>
-        <source>Make a blank wallet. Blank wallets do not initially have private keys or scripts. Private keys and addresses can be imported, or an HD seed can be set, at a later time.</source>
-        <translation type="unfinished">ખાલી પાકીટ બનાવો. ખાલી વોલેટ્સમાં શરૂઆતમાં ખાનગી કી અથવા સ્ક્રિપ્ટ હોતી નથી. ખાનગી કીઓ અને સરનામાંઓ આયાત કરી શકાય છે અથવા પછીના સમયે HD સીડ સેટ કરી શકાય છે.</translation>
-    </message>
     <message>
         <source>Make Blank Wallet</source>
         <translation type="unfinished">ખાલી વોલેટ બનાવો</translation>
@@ -1575,6 +1585,11 @@ The migration process will create a backup of the wallet before migrating. This
         <source>Enabling pruning significantly reduces the disk space required to store transactions. All blocks are still fully validated. Reverting this setting requires re-downloading the entire blockchain.</source>
         <translation type="unfinished">કાપણીને સક્ષમ કરવાથી વ્યવહારો સ્ટોર કરવા માટે જરૂરી ડિસ્ક જગ્યા નોંધપાત્ર રીતે ઘટાડે છે. બધા બ્લોક હજુ પણ સંપૂર્ણ રીતે માન્ય છે. આ સેટિંગને પાછું ફેરવવા માટે સમગ્ર બ્લોકચેનને ફરીથી ડાઉનલોડ કરવાની જરૂર છે.</translation>
     </message>
+    <message>
+        <source>Maximum database cache size. Make sure you have enough RAM. A larger cache can contribute to faster sync, after which the benefit is less pronounced for most use cases. Lowering the cache size will reduce memory usage. Unused mempool memory is shared for this cache.</source>
+        <extracomment>Tooltip text for Options window setting that sets the size of the database cache. Explains the corresponding effects of increasing/decreasing this value.</extracomment>
+        <translation type="unfinished">મહત્તમ ડેટાબેઝ કેશ કદ. ખાતરી કરો કે તમારી પાસે પૂરતી રેમ છે. મોટી કેશ ઝડપી સમન્વયનમાં ફાળો આપી શકે છે, જેના પછી મોટાભાગના ઉપયોગના કિસ્સાઓમાં ફાયદો ઓછો સ્પષ્ટ થાય છે. કેશ કદ ઘટાડવાથી મેમરી વપરાશ ઘટશે. આ કેશ માટે ન વપરાયેલ મેમ્પૂલ મેમરી શેર કરવામાં આવે છે.</translation>
+    </message>
     <message>
         <source>Size of &amp;database cache</source>
         <translation type="unfinished">&amp;ડેટાબેઝ કેશનું કદ</translation>
@@ -1978,9 +1993,12 @@ The migration process will create a backup of the wallet before migrating. This
         <source>Could not sign any more inputs.</source>
         <translation type="unfinished">કોઈપણ વધુ ઇનપુટ્સ પર સહી કરી શકાઈ નથી.</translation>
     </message>
-    <message>
-        <source>Signed %1 inputs, but more signatures are still required.</source>
-        <translation type="unfinished">સહી કરેલ %1 ઇનપુટ્સ, પરંતુ હજુ વધુ સહીઓ જરૂરી છે.</translation>
+    <message numerus="yes">
+        <source>Signed %n input(s), but more signatures are still required.</source>
+        <translation type="unfinished">
+            <numerusform />
+            <numerusform />
+        </translation>
     </message>
     <message>
         <source>Signed transaction successfully. Transaction is ready to broadcast.</source>
@@ -2039,9 +2057,12 @@ The migration process will create a backup of the wallet before migrating. This
         <source>or</source>
         <translation type="unfinished">અથવા</translation>
     </message>
-    <message>
-        <source>Transaction has %1 unsigned inputs.</source>
-        <translation type="unfinished">વ્યવહારમાં સહી વગરના %1 ઇનપુટ્સ છે.</translation>
+    <message numerus="yes">
+        <source>Transaction has %n unsigned input(s).</source>
+        <translation type="unfinished">
+            <numerusform />
+            <numerusform />
+        </translation>
     </message>
     <message>
         <source>Transaction is missing some information about inputs.</source>
@@ -2252,6 +2273,14 @@ BIP70 માં વ્યાપક સુરક્ષા ખામીઓને 
         <source>Number of connections</source>
         <translation type="unfinished">જોડાણોની સંખ્યા</translation>
     </message>
+    <message>
+        <source>Local Addresses</source>
+        <translation type="unfinished">સ્થાનિક સરનામું</translation>
+    </message>
+    <message>
+        <source>Network addresses that your Bitcoin node is currently using to communicate with other nodes.</source>
+        <translation type="unfinished">નેટવર્ક સરનામાં જેનો ઉપયોગ તમારા બિટકોઇન નોડ હાલમાં અન્ય નોડ્સ સાથે વાતચીત કરવા માટે કરી રહ્યા છે.</translation>
+    </message>
     <message>
         <source>Block chain</source>
         <translation type="unfinished">બ્લોક સાંકળ</translation>
@@ -2300,6 +2329,10 @@ BIP70 માં વ્યાપક સુરક્ષા ખામીઓને 
         <source>Select a peer to view detailed information.</source>
         <translation type="unfinished">વિગતવાર માહિતી જોવા માટે પીઅર પસંદ કરો.</translation>
     </message>
+    <message>
+        <source>Hide Peers Detail</source>
+        <translation type="unfinished">પીઅર્સ વિગતો છુપાવો</translation>
+    </message>
     <message>
         <source>The transport layer version: %1</source>
         <translation type="unfinished">પરિવહન સ્તર સંસ્કરણ:%1</translation>
@@ -2324,10 +2357,6 @@ BIP70 માં વ્યાપક સુરક્ષા ખામીઓને 
         <source>Transaction Relay</source>
         <translation type="unfinished">ટ્રાન્ઝેક્શન રિલે</translation>
     </message>
-    <message>
-        <source>Starting Block</source>
-        <translation type="unfinished">પ્રારંભ બ્લોક</translation>
-    </message>
     <message>
         <source>Synced Headers</source>
         <translation type="unfinished">સમન્વયિત હેડરો</translation>
@@ -2479,6 +2508,10 @@ BIP70 માં વ્યાપક સુરક્ષા ખામીઓને 
         <source>Last block time</source>
         <translation type="unfinished">છેલ્લા બ્લોક નો સમય</translation>
     </message>
+    <message>
+        <source>&amp;Open</source>
+        <translation type="unfinished">&amp; ખોલો </translation>
+    </message>
     <message>
         <source>Inbound: initiated by peer</source>
         <extracomment>Explanatory text for an inbound peer connection.</extracomment>
@@ -2783,6 +2816,10 @@ For more information on using this console, type %6.
         <source>Generates an address compatible with older wallets.</source>
         <translation type="unfinished">જૂના પાકીટ સાથે સુસંગત સરનામું જનરેટ કરે છે.</translation>
     </message>
+    <message>
+        <source>Generates a native segwit address (BIP-173). Some old wallets don't support it.</source>
+        <translation type="unfinished">મૂળ સેગવિટ સરનામું (BIP-173) જનરેટ કરે છે. કેટલાક જૂના વોલેટ તેને સપોર્ટ કરતા નથી.</translation>
+    </message>
     <message>
         <source>Could not unlock wallet.</source>
         <translation type="unfinished">વૉલેટ અનલૉક કરી શકાયું નથી.</translation>
@@ -2832,6 +2869,10 @@ For more information on using this console, type %6.
     </context>
 <context>
     <name>SendCoinsDialog</name>
+    <message>
+        <source>Coin Control Features</source>
+        <translation type="unfinished">સિક્કા નિયંત્રણ સુવિધાઓ</translation>
+    </message>
     <message>
         <source>Quantity:</source>
         <translation type="unfinished">જથ્થો:</translation>
@@ -2856,6 +2897,14 @@ For more information on using this console, type %6.
         <source>Change:</source>
         <translation type="unfinished">બદલો:</translation>
     </message>
+    <message>
+        <source>If this is activated, but the change address is empty or invalid, change will be sent to a newly generated address.</source>
+        <translation type="unfinished">જો આ સક્રિય થયેલ હોય, પરંતુ ફેરફાર સરનામું ખાલી હોય અથવા અમાન્ય હોય, તો ફેરફાર નવા જનરેટ કરેલા સરનામાં પર મોકલવામાં આવશે.</translation>
+    </message>
+    <message>
+        <source>Custom change address</source>
+        <translation type="unfinished">સરનામું કસ્ટમાઇઝ કરો</translation>
+    </message>
     <message>
         <source>Hide</source>
         <translation type="unfinished">છુપાવો</translation>
diff --git a/src/qt/locale/bitcoin_hak.ts b/src/qt/locale/bitcoin_hak.ts
index c5840984268a..35a73cd1cfb6 100644
--- a/src/qt/locale/bitcoin_hak.ts
+++ b/src/qt/locale/bitcoin_hak.ts
@@ -317,11 +317,29 @@ Signing is only possible with addresses of the type 'legacy'.</source>
         <source>Amount</source>
         <translation type="unfinished">金额</translation>
     </message>
+    <message>
+        <source>Enter a Bitcoin address (e.g. %1)</source>
+        <translation type="unfinished">请输入一个比特币地址 (例如 %1)</translation>
+    </message>
+    <message>
+        <source>Unroutable</source>
+        <translation type="unfinished">不可路由</translation>
+    </message>
     <message>
         <source>Inbound</source>
         <extracomment>An inbound connection from a peer. An inbound connection is a connection initiated by a peer.</extracomment>
         <translation type="unfinished">進來</translation>
     </message>
+    <message>
+        <source>Outbound</source>
+        <extracomment>An outbound connection to a peer. An outbound connection is a connection initiated by us.</extracomment>
+        <translation type="unfinished">傳出</translation>
+    </message>
+    <message>
+        <source>Full Relay</source>
+        <extracomment>Peer connection type that relays all network information.</extracomment>
+        <translation type="unfinished">完整转发</translation>
+    </message>
     <message>
         <source>Block Relay</source>
         <extracomment>Peer connection type that relays network information about blocks and not transactions or addresses.</extracomment>
@@ -332,6 +350,16 @@ Signing is only possible with addresses of the type 'legacy'.</source>
         <extracomment>Peer connection type established manually through one of several methods.</extracomment>
         <translation type="unfinished">手册</translation>
     </message>
+    <message>
+        <source>Feeler</source>
+        <extracomment>Short-lived peer connection type that tests the aliveness of known addresses.</extracomment>
+        <translation type="unfinished">触须</translation>
+    </message>
+    <message>
+        <source>Address Fetch</source>
+        <extracomment>Short-lived peer connection type that solicits known addresses from a peer.</extracomment>
+        <translation type="unfinished">地址取回</translation>
+    </message>
     <message>
         <source>%1 h</source>
         <translation type="unfinished">%1 小时</translation>
@@ -544,10 +572,6 @@ Signing is only possible with addresses of the type 'legacy'.</source>
         <source>Processing blocks on disk…</source>
         <translation type="unfinished">处理磁盘上的区块...</translation>
     </message>
-    <message>
-        <source>Connecting to peers…</source>
-        <translation type="unfinished">连接到节点...</translation>
-    </message>
     <message>
         <source>Request payments (generates QR codes and bitcoin: URIs)</source>
         <translation type="unfinished">请求支付 (生成二维码和 bitcoin: URI)</translation>
@@ -558,7 +582,7 @@ Signing is only possible with addresses of the type 'legacy'.</source>
     </message>
     <message>
         <source>Show the list of used receiving addresses and labels</source>
-        <translation type="unfinished">显示用过的收款地址和标签的列表</translation>
+        <translation type="unfinished">顯示已使用過的接收地址和標籤清單</translation>
     </message>
     <message>
         <source>&amp;Command-line options</source>
@@ -578,10 +602,6 @@ Signing is only possible with addresses of the type 'legacy'.</source>
         <source>Catching up…</source>
         <translation type="unfinished">正在追上进度...</translation>
     </message>
-    <message>
-        <source>Last received block was generated %1 ago.</source>
-        <translation type="unfinished">最新收到的区块产生于 %1 之前。</translation>
-    </message>
     <message>
         <source>Transactions after this will not yet be visible.</source>
         <translation type="unfinished">在此之后的交易尚不可见</translation>
@@ -590,18 +610,6 @@ Signing is only possible with addresses of the type 'legacy'.</source>
         <source>Error</source>
         <translation type="unfinished">错误</translation>
     </message>
-    <message>
-        <source>Warning</source>
-        <translation type="unfinished">警告</translation>
-    </message>
-    <message>
-        <source>Information</source>
-        <translation type="unfinished">信息</translation>
-    </message>
-    <message>
-        <source>Up to date</source>
-        <translation type="unfinished">已是最新</translation>
-    </message>
     <message>
         <source>Load Partially Signed Bitcoin Transaction</source>
         <translation type="unfinished">加载部分签名比特币交易（PSBT）</translation>
@@ -702,7 +710,24 @@ Signing is only possible with addresses of the type 'legacy'.</source>
     <message>
         <source>Wallet Name</source>
         <extracomment>Label of the input field where the name of the wallet is entered.</extracomment>
-        <translation type="unfinished">钱包名称</translation>
+        <translation type="unfinished">錢包名稱</translation>
+    </message>
+    <message>
+        <source>Invalid Wallet Name</source>
+        <translation type="unfinished">無效的錢包名稱</translation>
+    </message>
+    <message>
+        <source>Wallet name cannot be empty</source>
+        <translation type="unfinished">錢包名稱不能為空白</translation>
+    </message>
+    <message>
+        <source>Restore and Migrate Wallet Backup</source>
+        <translation type="unfinished">恢復及遷移錢包備份</translation>
+    </message>
+    <message>
+        <source>Restore and Migrate Wallet</source>
+        <extracomment>Title of pop-up window shown when the user is attempting to restore a wallet.</extracomment>
+        <translation type="unfinished">恢復及遷移錢包</translation>
     </message>
     <message>
         <source>&amp;Window</source>
@@ -875,6 +900,10 @@ Signing is only possible with addresses of the type 'legacy'.</source>
         <source>Received with address</source>
         <translation type="unfinished">收款地址</translation>
     </message>
+    <message>
+        <source>Date</source>
+        <translation type="unfinished">日期</translation>
+    </message>
     <message>
         <source>Copy amount</source>
         <translation type="unfinished">复制金额</translation>
@@ -899,6 +928,10 @@ Signing is only possible with addresses of the type 'legacy'.</source>
         <source>L&amp;ock unspent</source>
         <translation type="unfinished">锁定未花费(&amp;O)</translation>
     </message>
+    <message>
+        <source>&amp;Unlock unspent</source>
+        <translation type="unfinished">解鎖未花費的</translation>
+    </message>
     <message>
         <source>Copy quantity</source>
         <translation type="unfinished">复制数目</translation>
@@ -1007,6 +1040,24 @@ The migration process will create a backup of the wallet before migrating. This
         <source>Solvable but not watched scripts have been migrated to a new wallet named '%1'.</source>
         <translation type="unfinished">可解决但未被观察到的脚本已经被迁移到被命名为“%1”的新钱包。</translation>
     </message>
+    <message>
+        <source>Restore and Migrate wallet</source>
+        <translation type="unfinished">恢復及遷移錢包</translation>
+    </message>
+    <message>
+        <source>Are you sure you wish to restore the wallet file &lt;i&gt;%1&lt;/i&gt; to &lt;i&gt;%2&lt;/i&gt; and migrate it?</source>
+        <translation type="unfinished">您確定要恢復錢包檔案&lt;i&gt;%1&lt;/i&gt;到&lt;i&gt;%2&lt;/i&gt;及遷移它嗎？</translation>
+    </message>
+    <message>
+        <source>Restore Wallet</source>
+        <extracomment>Title of progress window which is displayed when wallets are being restored.</extracomment>
+        <translation type="unfinished">恢復錢包</translation>
+    </message>
+    <message>
+        <source>Restoring Wallet &lt;b&gt;%1&lt;/b&gt;…</source>
+        <extracomment>Descriptive text of the restore wallets progress window which indicates to the user that wallets are currently being restored.</extracomment>
+        <translation type="unfinished">正在恢復錢包&lt;b&gt;%1&lt;/b&gt;...</translation>
+    </message>
     <message>
         <source>Migration failed</source>
         <translation type="unfinished">迁移失败</translation>
@@ -1117,10 +1168,6 @@ The migration process will create a backup of the wallet before migrating. This
         <source>Disable Private Keys</source>
         <translation type="unfinished">禁用私钥</translation>
     </message>
-    <message>
-        <source>Make a blank wallet. Blank wallets do not initially have private keys or scripts. Private keys and addresses can be imported, or an HD seed can be set, at a later time.</source>
-        <translation type="unfinished">製作一個空白的錢包。空白錢包最初沒有私鑰或腳本。以後可以匯入私鑰和地址，或者可以設定HD種子。</translation>
-    </message>
     <message>
         <source>Make Blank Wallet</source>
         <translation type="unfinished">製作空白錢包</translation>
@@ -1792,7 +1839,7 @@ The migration process will create a backup of the wallet before migrating. This
     </message>
     <message>
         <source>Sign Tx</source>
-        <translation type="unfinished">签名交易</translation>
+        <translation type="unfinished">簽名交易</translation>
     </message>
     <message>
         <source>Broadcast Tx</source>
@@ -1800,15 +1847,15 @@ The migration process will create a backup of the wallet before migrating. This
     </message>
     <message>
         <source>Copy to Clipboard</source>
-        <translation type="unfinished">复制到剪贴板</translation>
+        <translation type="unfinished">複製到剪貼簿</translation>
     </message>
     <message>
         <source>Save…</source>
-        <translation type="unfinished">保存...</translation>
+        <translation type="unfinished">拯救...</translation>
     </message>
     <message>
         <source>Close</source>
-        <translation type="unfinished">关闭</translation>
+        <translation type="unfinished">關閉</translation>
     </message>
     <message>
         <source>Failed to load transaction: %1</source>
@@ -1826,9 +1873,11 @@ The migration process will create a backup of the wallet before migrating. This
         <source>Could not sign any more inputs.</source>
         <translation type="unfinished">没有交易输入项可供签名了。</translation>
     </message>
-    <message>
-        <source>Signed %1 inputs, but more signatures are still required.</source>
-        <translation type="unfinished">已签名 %1 个交易输入项，但是仍然还有余下的项目需要签名。</translation>
+    <message numerus="yes">
+        <source>Signed %n input(s), but more signatures are still required.</source>
+        <translation type="unfinished">
+            <numerusform />
+        </translation>
     </message>
     <message>
         <source>Signed transaction successfully. Transaction is ready to broadcast.</source>
@@ -1838,14 +1887,6 @@ The migration process will create a backup of the wallet before migrating. This
         <source>Unknown error processing transaction.</source>
         <translation type="unfinished">处理交易时遇到未知错误。</translation>
     </message>
-    <message>
-        <source>Transaction broadcast successfully! Transaction ID: %1</source>
-        <translation type="unfinished">已成功广播交易！交易ID: %1</translation>
-    </message>
-    <message>
-        <source>Transaction broadcast failed: %1</source>
-        <translation type="unfinished">交易广播失败: %1</translation>
-    </message>
     <message>
         <source>PSBT copied to clipboard.</source>
         <translation type="unfinished">已复制PSBT到剪贴板</translation>
@@ -1871,6 +1912,10 @@ The migration process will create a backup of the wallet before migrating. This
         <source>own address</source>
         <translation type="unfinished">自己的地址</translation>
     </message>
+    <message>
+        <source>Unable to calculate transaction fee or total transaction amount.</source>
+        <translation type="unfinished">无法计算交易费用或总交易金额。</translation>
+    </message>
     <message>
         <source>Pays transaction fee: </source>
         <translation type="unfinished">支付交易费用:</translation>
@@ -1883,6 +1928,12 @@ The migration process will create a backup of the wallet before migrating. This
         <source>or</source>
         <translation type="unfinished">或</translation>
     </message>
+    <message numerus="yes">
+        <source>Transaction has %n unsigned input(s).</source>
+        <translation type="unfinished">
+            <numerusform />
+        </translation>
+    </message>
     <message>
         <source>Transaction is missing some information about inputs.</source>
         <translation type="unfinished">交易中有输入项缺失某些信息。</translation>
@@ -1899,6 +1950,14 @@ The migration process will create a backup of the wallet before migrating. This
         <source>(But this wallet cannot sign transactions.)</source>
         <translation type="unfinished">(但这个钱包不能签名交易)</translation>
     </message>
+    <message>
+        <source>(But this wallet does not have the right keys.)</source>
+        <translation type="unfinished">(但这个钱包没有正确的密钥)</translation>
+    </message>
+    <message>
+        <source>Transaction is fully signed and ready for broadcast.</source>
+        <translation type="unfinished">交易已经完全签名，可以广播。</translation>
+    </message>
     <message>
         <source>Transaction status is unknown.</source>
         <translation type="unfinished">交易状态未知。</translation>
@@ -1910,6 +1969,10 @@ The migration process will create a backup of the wallet before migrating. This
         <source>Payment request error</source>
         <translation type="unfinished">支付请求出错</translation>
     </message>
+    <message>
+        <source>Cannot start bitcoin: click-to-pay handler</source>
+        <translation type="unfinished">无法启动 bitcoin: 协议的“一键支付”处理程序</translation>
+    </message>
     <message>
         <source>URI handling</source>
         <translation type="unfinished">URI 處理</translation>
@@ -1987,7 +2050,12 @@ If you are receiving this error you should request the merchant provide a BIP21
         <extracomment>An Inbound Connection from a Peer.</extracomment>
         <translation type="unfinished">進來</translation>
     </message>
-    </context>
+    <message>
+        <source>Outbound</source>
+        <extracomment>An Outbound Connection to a Peer.</extracomment>
+        <translation type="unfinished">傳出</translation>
+    </message>
+</context>
 <context>
     <name>QRImageWidget</name>
     <message>
@@ -2154,10 +2222,6 @@ If you are receiving this error you should request the merchant provide a BIP21
         <source>Transaction Relay</source>
         <translation type="unfinished">交易转发</translation>
     </message>
-    <message>
-        <source>Starting Block</source>
-        <translation type="unfinished">起步区块</translation>
-    </message>
     <message>
         <source>Synced Headers</source>
         <translation type="unfinished">已同步前導資料</translation>
@@ -2440,10 +2504,6 @@ If you are receiving this error you should request the merchant provide a BIP21
         <source>Network activity disabled</source>
         <translation type="unfinished">网络活动已禁用</translation>
     </message>
-    <message>
-        <source>None</source>
-        <translation type="unfinished">无</translation>
-    </message>
     <message>
         <source>Executing command without any wallet</source>
         <translation type="unfinished">不使用任何钱包执行命令</translation>
@@ -2691,10 +2751,6 @@ For more information on using this console, type %6.
 </context>
 <context>
     <name>RecentRequestsTableModel</name>
-    <message>
-        <source>Date</source>
-        <translation type="unfinished">日期</translation>
-    </message>
     <message>
         <source>Label</source>
         <translation type="unfinished">标签</translation>
@@ -3016,10 +3072,6 @@ Note:  Since the fee is calculated on a per-byte basis, a fee rate of "100 satos
         <source>The amount exceeds your balance.</source>
         <translation type="unfinished">金额超出您的余额。</translation>
     </message>
-    <message>
-        <source>The total exceeds your balance when the %1 transaction fee is included.</source>
-        <translation type="unfinished">计入 %1 手续费后，金额超出了您的余额。</translation>
-    </message>
     <message>
         <source>Duplicate address found: addresses should only be used once each.</source>
         <translation type="unfinished">发现重复地址:每个地址应该只使用一次。</translation>
@@ -3647,6 +3699,10 @@ Note:  Since the fee is calculated on a per-byte basis, a fee rate of "100 satos
         <extracomment>Expanded name of the CSV file format. See: https://en.wikipedia.org/wiki/Comma-separated_values.</extracomment>
         <translation type="unfinished">逗號分隔文件</translation>
     </message>
+    <message>
+        <source>Confirmed</source>
+        <translation type="unfinished">已確認</translation>
+    </message>
     <message>
         <source>Date</source>
         <translation type="unfinished">日期</translation>
@@ -3963,10 +4019,6 @@ Go to File &gt; Open Wallet to load a wallet.
         <source>Warning: Private keys detected in wallet {%s} with disabled private keys</source>
         <translation type="unfinished">警告：在已经禁用私钥的钱包 {%s} 中仍然检测到私钥</translation>
     </message>
-    <message>
-        <source>Warning: We do not appear to fully agree with our peers! You may need to upgrade, or other nodes may need to upgrade.</source>
-        <translation type="unfinished">警告：我们和其他节点似乎没达成共识！您可能需要升级，或者就是其他节点可能需要升级。</translation>
-    </message>
     <message>
         <source>Witness data for blocks after height %d requires validation. Please restart with -reindex.</source>
         <translation type="unfinished">需要验证高度在%d之后的区块见证数据。请使用 -reindex 重新启动。</translation>
@@ -4047,14 +4099,6 @@ Go to File &gt; Open Wallet to load a wallet.
         <source>Option '-checkpoints' is set but checkpoints were removed. This option has no effect.</source>
         <translation type="unfinished">选项“-checkpoints”已设置，但检查点已被移除。该选项不再生效。 </translation>
     </message>
-    <message>
-        <source>Option '-maxorphantx' is set but no longer has any effect (see release notes). Please remove it from your configuration.</source>
-        <translation type="unfinished">选项“-maxorphantx”已设置，但已不再生效（参见发行说明）。请从您的配置中移除该选项。 </translation>
-    </message>
-    <message>
-        <source>Options '-datacarrier' or '-datacarriersize' are set but are marked as deprecated. They will be removed in a future version.</source>
-        <translation type="unfinished">选项“-datacarrier”或“-datacarriersize”已设置，但已标记为弃用。它们将在未来版本中移除。 </translation>
-    </message>
     <message>
         <source>Outbound connections restricted to CJDNS (-onlynet=cjdns) but -cjdnsreachable is not provided</source>
         <translation type="unfinished">传出连接被限制为仅使用CJDNS (-onlynet=cjdns) ，但却未提供 -cjdnsreachable 参数。</translation>
@@ -4113,10 +4157,6 @@ Unable to restore backup of wallet.</source>
         <translation type="unfinished">
 无法还原钱包备份</translation>
     </message>
-    <message>
-        <source>-paytxfee is deprecated and will be fully removed in v31.0.</source>
-        <translation type="unfinished">“-paytxfee”已弃用，并将在 v31.0 中完全移除。 </translation>
-    </message>
     <message>
         <source>A fatal internal error occurred, see debug.log for details: </source>
         <translation type="unfinished">發生致命的內部錯誤，有關詳情請查看 debug.log：</translation>
@@ -4126,8 +4166,12 @@ Unable to restore backup of wallet.</source>
         <translation type="unfinished">区块验证已中断</translation>
     </message>
     <message>
-        <source>Cannot add WalletDescriptor to a non-descriptor wallet</source>
-        <translation type="unfinished">无法将钱包描述符添加到非描述符钱包。</translation>
+        <source>Can't spend unconfirmed version %d pre-selected input with a version 3 tx</source>
+        <translation type="unfinished">无法使用版本3交易花费未确认版本1%d的预选输入。</translation>
+    </message>
+    <message>
+        <source>Can't spend unconfirmed version 3 pre-selected input with a version %d tx</source>
+        <translation type="unfinished">无法使用版本1%d交易花费未确认版本3的预选输入。</translation>
     </message>
     <message>
         <source>Cannot write to directory '%s'; check permissions.</source>
@@ -4173,10 +4217,6 @@ Unable to restore backup of wallet.</source>
         <source>Dump file %s does not exist.</source>
         <translation type="unfinished">转储文件 %s 不存在</translation>
     </message>
-    <message>
-        <source>Error creating %s</source>
-        <translation type="unfinished">创建%s时出错</translation>
-    </message>
     <message>
         <source>Error initializing block database</source>
         <translation type="unfinished">初始化区块数据库时出错</translation>
@@ -4185,10 +4225,6 @@ Unable to restore backup of wallet.</source>
         <source>Error loading %s</source>
         <translation type="unfinished">載入檔案 %s 時發生錯誤</translation>
     </message>
-    <message>
-        <source>Error loading %s: Private keys can only be disabled during creation</source>
-        <translation type="unfinished">載入 %s 時發生錯誤: 只有在造新錢包時能夠指定不允許私鑰</translation>
-    </message>
     <message>
         <source>Error loading %s: Wallet corrupted</source>
         <translation type="unfinished">載入檔案 %s 時發生錯誤: 錢包損毀了</translation>
@@ -4349,10 +4385,6 @@ Unable to restore backup of wallet.</source>
         <source>Failed to write block.</source>
         <translation type="unfinished">寫入區塊失敗。</translation>
     </message>
-    <message>
-        <source>Failed to write to block index database.</source>
-        <translation type="unfinished">寫入區塊索引資料庫失敗。</translation>
-    </message>
     <message>
         <source>Failure removing transaction: %s</source>
         <translation type="unfinished">%s删除交易时失败: </translation>
@@ -4393,14 +4425,14 @@ Unable to restore backup of wallet.</source>
         <source>Invalid P2P permission: '%s'</source>
         <translation type="unfinished">无效的 P2P 权限：'%s'</translation>
     </message>
-    <message>
-        <source>Invalid amount for %s=&lt;amount&gt;: '%s' (must be at least %s)</source>
-        <translation type="unfinished">%s=&lt;amount&gt;: '%s' 中指定了非法的金额 (必须至少达到 %s)</translation>
-    </message>
     <message>
         <source>Invalid amount for %s=&lt;amount&gt;: '%s'</source>
         <translation type="unfinished">%s=&lt;amount&gt;: '%s' 中指定了非法的金额</translation>
     </message>
+    <message>
+        <source>Creating wallet…</source>
+        <translation type="unfinished">創建錢包...</translation>
+    </message>
     <message>
         <source>Invalid amount for -%s=&lt;amount&gt;: '%s'</source>
         <translation type="unfinished">参数 -%s=&lt;amount&gt;: '%s' 指定了无效的金额</translation>
@@ -4501,6 +4533,10 @@ Unable to restore backup of wallet.</source>
         <source>Starting network threads…</source>
         <translation type="unfinished">正在開始網路線程...</translation>
     </message>
+    <message>
+        <source>The %s path uses exFAT, which is known to have intermittent corruption problems on macOS. Move this directory to a different filesystem to avoid data loss.</source>
+        <translation type="unfinished">%s路径使用exFAT，该格式在macOS上已知会出现间歇性损坏问题。请将此目录移动到其他文件系统以避免数据丢失。</translation>
+    </message>
     <message>
         <source>The source code is available from %s.</source>
         <translation type="unfinished">可以从 %s 获取源代码。</translation>
diff --git a/src/qt/locale/bitcoin_he.ts b/src/qt/locale/bitcoin_he.ts
index 90b9ffffb23e..9ef1c2256985 100644
--- a/src/qt/locale/bitcoin_he.ts
+++ b/src/qt/locale/bitcoin_he.ts
@@ -1022,13 +1022,22 @@ Signing is only possible with addresses of the type 'legacy'.</source>
         <source>Create wallet warning</source>
         <translation type="unfinished">אזהרה לגבי יצירת הארנק</translation>
     </message>
-    </context>
+    <message>
+        <source>Too many external signers found</source>
+        <translation type="unfinished">נמצאו יותר מדי חותמים חיצוניים</translation>
+    </message>
+</context>
 <context>
     <name>MigrateWalletActivity</name>
     <message>
         <source>Migrate Wallet</source>
         <translation type="unfinished">הסבת ארנק</translation>
     </message>
+    <message>
+        <source>Restore Wallet</source>
+        <extracomment>Title of progress window which is displayed when wallets are being restored.</extracomment>
+        <translation type="unfinished">שחזור ארנק</translation>
+    </message>
     </context>
 <context>
     <name>OpenWalletActivity</name>
@@ -1116,14 +1125,14 @@ Signing is only possible with addresses of the type 'legacy'.</source>
         <source>Disable Private Keys</source>
         <translation type="unfinished">השבתת מפתחות פרטיים</translation>
     </message>
-    <message>
-        <source>Make a blank wallet. Blank wallets do not initially have private keys or scripts. Private keys and addresses can be imported, or an HD seed can be set, at a later time.</source>
-        <translation type="unfinished">הכינו ארנק ריק. ארנקים ריקים הנם ללא מפתחות פרטיים ראשוניים או סקריפטים. מפתחות פרטיים או כתובות ניתנים לייבוא, או שניתן להגדיר מקור HD במועד מאוחר יותר. </translation>
-    </message>
     <message>
         <source>Make Blank Wallet</source>
         <translation type="unfinished">יצירת ארנק ריק</translation>
     </message>
+    <message>
+        <source>External signer</source>
+        <translation type="unfinished">חותם חיצוני</translation>
+    </message>
     <message>
         <source>Create</source>
         <translation type="unfinished">יצירה</translation>
@@ -1721,9 +1730,12 @@ Signing is only possible with addresses of the type 'legacy'.</source>
         <source>Could not sign any more inputs.</source>
         <translation type="unfinished">לא ניתן לחתום קלטים נוספים.</translation>
     </message>
-    <message>
-        <source>Signed %1 inputs, but more signatures are still required.</source>
-        <translation type="unfinished">נחתם קלט  %1 אך יש צורך בחתימות נוספות.</translation>
+    <message numerus="yes">
+        <source>Signed %n input(s), but more signatures are still required.</source>
+        <translation type="unfinished">
+            <numerusform />
+            <numerusform />
+        </translation>
     </message>
     <message>
         <source>Signed transaction successfully. Transaction is ready to broadcast.</source>
@@ -1773,9 +1785,12 @@ Signing is only possible with addresses of the type 'legacy'.</source>
         <source>or</source>
         <translation type="unfinished">או</translation>
     </message>
-    <message>
-        <source>Transaction has %1 unsigned inputs.</source>
-        <translation type="unfinished">לעיסקה יש  %1 קלטים לא חתומים.</translation>
+    <message numerus="yes">
+        <source>Transaction has %n unsigned input(s).</source>
+        <translation type="unfinished">
+            <numerusform />
+            <numerusform />
+        </translation>
     </message>
     <message>
         <source>Transaction is missing some information about inputs.</source>
@@ -1999,10 +2014,6 @@ Signing is only possible with addresses of the type 'legacy'.</source>
         <source>Version</source>
         <translation type="unfinished">גרסה</translation>
     </message>
-    <message>
-        <source>Starting Block</source>
-        <translation type="unfinished">בלוק התחלה</translation>
-    </message>
     <message>
         <source>Synced Headers</source>
         <translation type="unfinished">כותרות עדכניות</translation>
@@ -2587,10 +2598,6 @@ Signing is only possible with addresses of the type 'legacy'.</source>
         <source>The amount exceeds your balance.</source>
         <translation type="unfinished">הסכום חורג מהמאזן שלך.</translation>
     </message>
-    <message>
-        <source>The total exceeds your balance when the %1 transaction fee is included.</source>
-        <translation type="unfinished">הסכום גבוה מהמאזן שלכם לאחר כלילת עמלת עסקה  %1.</translation>
-    </message>
     <message>
         <source>Duplicate address found: addresses should only be used once each.</source>
         <translation type="unfinished">נמצאה כתובת כפולה: יש להשתמש בכל כתובת פעם אחת בלבד.</translation>
@@ -3385,10 +3392,6 @@ Go to File &gt; Open Wallet to load a wallet.
         <source>Warning: Private keys detected in wallet {%s} with disabled private keys</source>
         <translation type="unfinished">אזהרה: זוהו מפתחות פרטיים בארנק {%s} עם מפתחות פרטיים מושבתים</translation>
     </message>
-    <message>
-        <source>Warning: We do not appear to fully agree with our peers! You may need to upgrade, or other nodes may need to upgrade.</source>
-        <translation type="unfinished">אזהרה: יתכן שלא נסכים לגמרי עם עמיתינו! יתכן שתצטרכו לשדרג או שצמתות אחרות יצטרכו לשדרג.</translation>
-    </message>
     <message>
         <source>You need to rebuild the database using -reindex to go back to unpruned mode.  This will redownload the entire blockchain</source>
         <translation type="unfinished">יש צורך בבניה מחדש של מסד הנתונים ע"י שימוש ב -reindex כדי לחזור חזרה לצומת שאינה גזומה.  הפעולה תוריד מחדש את כל שרשרת הבלוקים.</translation>
@@ -3449,10 +3452,6 @@ Go to File &gt; Open Wallet to load a wallet.
         <source>Error loading %s</source>
         <translation type="unfinished">שגיאה בטעינת %s</translation>
     </message>
-    <message>
-        <source>Error loading %s: Private keys can only be disabled during creation</source>
-        <translation type="unfinished">שגיאת טעינה %s: מפתחות פרטיים ניתנים לניטרול רק בעת תהליך היצירה</translation>
-    </message>
     <message>
         <source>Error loading %s: Wallet corrupted</source>
         <translation type="unfinished">שגיאת טעינה %s: הארנק משובש</translation>
@@ -3593,10 +3592,6 @@ Go to File &gt; Open Wallet to load a wallet.
         <source>This is the minimum transaction fee you pay on every transaction.</source>
         <translation type="unfinished">זו עמלת ההעברה המזערית שתיגבה מכל העברה שלך.</translation>
     </message>
-    <message>
-        <source>This is the transaction fee you will pay if you send a transaction.</source>
-        <translation type="unfinished">זו עמלת ההעברה שתיגבה ממך במידה של שליחת העברה.</translation>
-    </message>
     <message>
         <source>Transaction amount too small</source>
         <translation type="unfinished">סכום ההעברה קטן מדי</translation>
diff --git a/src/qt/locale/bitcoin_hi.ts b/src/qt/locale/bitcoin_hi.ts
index 21c0b856f1a3..42b8454a82af 100644
--- a/src/qt/locale/bitcoin_hi.ts
+++ b/src/qt/locale/bitcoin_hi.ts
@@ -249,10 +249,18 @@ Signing is only possible with addresses of the type 'legacy'.</source>
 </context>
 <context>
     <name>BitcoinApplication</name>
+    <message>
+        <source>Settings file %1 might be corrupt or invalid.</source>
+        <translation type="unfinished">सेटिंग्स फ़ाइल %1 दूषित या अमान्य हो सकती है।</translation>
+    </message>
     <message>
         <source>Runaway exception</source>
         <translation type="unfinished">रनअवे अपवाद</translation>
     </message>
+    <message>
+        <source>A fatal error occurred. %1 can no longer continue safely and will quit.</source>
+        <translation type="unfinished">एक गंभीर त्रुटि हुई। %1 अब सुरक्षित रूप से जारी नहीं रह सकता है और बंद हो जाएगा।</translation>
+    </message>
     <message>
         <source>Internal error</source>
         <translation type="unfinished">आंतरिक त्रुटि</translation>
@@ -436,7 +444,11 @@ Signing is only possible with addresses of the type 'legacy'.</source>
     </message>
     <message>
         <source>Backup wallet to another location</source>
-        <translation type="unfinished">किसी अन्य स्थान पर वॉलेट  बैकअप करे |</translation>
+        <translation type="unfinished">किसी अन्य स्थान पर वॉलेट बैकअप करे |</translation>
+    </message>
+    <message>
+        <source>Change the passphrase used for wallet encryption</source>
+        <translation type="unfinished">वॉलेट एन्क्रिप्शन के लिए उपयोग किए गए पासफ्रेज़ को बदलें</translation>
     </message>
     <message>
         <source>&amp;Send</source>
@@ -448,8 +460,47 @@ Signing is only possible with addresses of the type 'legacy'.</source>
     </message>
     <message>
         <source>&amp;Options…</source>
-        <translation type="unfinished">&amp;विकल्प
- </translation>
+        <translation type="unfinished">&amp;विकल्प…</translation>
+    </message>
+    <message>
+        <source>&amp;Encrypt Wallet…</source>
+        <translation type="unfinished">&amp;वॉलेट एन्क्रिप्ट करें…</translation>
+    </message>
+    <message>
+        <source>Encrypt the private keys that belong to your wallet</source>
+        <translation type="unfinished">अपने वॉलेट से संबंधित निजी कुंजियों को एन्क्रिप्ट करें</translation>
+    </message>
+    <message>
+        <source>&amp;Backup Wallet…</source>
+        <translation type="unfinished">&amp;वॉलेट का बैकअप लें…</translation>
+    </message>
+    <message>
+        <source>&amp;Change Passphrase…</source>
+        <translation type="unfinished">&amp;पासफ्रेज़ बदलें…</translation>
+    </message>
+    <message>
+        <source>Sign &amp;message…</source>
+        <translation type="unfinished">हस्ताक्षर &amp;संदेश</translation>
+    </message>
+    <message>
+        <source>Sign messages with your Bitcoin addresses to prove you own them</source>
+        <translation type="unfinished">यह साबित करने के लिए कि आप उनके मालिक हैं, अपने बिटकॉइन पतों के साथ संदेशों पर हस्ताक्षर करें</translation>
+    </message>
+    <message>
+        <source>&amp;Verify message…</source>
+        <translation type="unfinished">&amp;संदेश सत्यापित करें…</translation>
+    </message>
+    <message>
+        <source>Verify messages to ensure they were signed with specified Bitcoin addresses</source>
+        <translation type="unfinished">संदेशों को सत्यापित करें ताकि यह सुनिश्चित हो सके कि उन पर निर्दिष्ट बिटकॉइन पतों से हस्ताक्षर किए गए थे</translation>
+    </message>
+    <message>
+        <source>&amp;Load PSBT from file…</source>
+        <translation type="unfinished">&amp;फ़ाइल से PSBT लोड करें…</translation>
+    </message>
+    <message>
+        <source>Open &amp;URI…</source>
+        <translation type="unfinished">URI &amp;खोलें…</translation>
     </message>
     <message>
         <source>Close Wallet…</source>
@@ -463,13 +514,83 @@ Signing is only possible with addresses of the type 'legacy'.</source>
         <source>Close All Wallets…</source>
         <translation type="unfinished">सारे बटुएँ बंद करें...</translation>
     </message>
+    <message>
+        <source>&amp;Settings</source>
+        <translation type="unfinished">&amp;सेटिंग्स</translation>
+    </message>
+    <message>
+        <source>&amp;Help</source>
+        <translation type="unfinished">&amp;मदद</translation>
+    </message>
+    <message>
+        <source>Tabs toolbar</source>
+        <translation type="unfinished">टैब टूलबार</translation>
+    </message>
+    <message>
+        <source>Syncing Headers (%1%)…</source>
+        <translation type="unfinished">हेडर सिंक हो रहे हैं (%1%)…</translation>
+    </message>
+    <message>
+        <source>Synchronizing with network…</source>
+        <translation type="unfinished">नेटवर्क के साथ सिंक्रनाइज़ हो रहा है…</translation>
+    </message>
+    <message>
+        <source>Indexing blocks on disk…</source>
+        <translation type="unfinished">डिस्क पर ब्लॉक को अनुक्रमित कर रहा है…</translation>
+    </message>
+    <message>
+        <source>Processing blocks on disk…</source>
+        <translation type="unfinished">डिस्क पर ब्लॉक को प्रोसेस कर रहा है…</translation>
+    </message>
     <message numerus="yes">
         <source>Processed %n block(s) of transaction history.</source>
         <translation type="unfinished">
-            <numerusform>Processed %n block(s) of transaction history.</numerusform>
-            <numerusform>Processed %n block(s) of transaction history.</numerusform>
+            <numerusform>लेनदेन इतिहास के %n ब्लॉक संसाधित हुए।</numerusform>
+            <numerusform>लेनदेन इतिहास के %n ब्लॉक संसाधित हुए।</numerusform>
         </translation>
     </message>
+    <message>
+        <source>Load PSBT from &amp;clipboard…</source>
+        <translation type="unfinished">क्लिपबोर्ड से PSBT लोड करें…</translation>
+    </message>
+    <message>
+        <source>Load Partially Signed Bitcoin Transaction from clipboard</source>
+        <translation type="unfinished">क्लिपबोर्ड से आंशिक रूप से हस्ताक्षरित बिटकॉइन लेनदेन लोड करें</translation>
+    </message>
+    <message>
+        <source>Open node debugging and diagnostic console</source>
+        <translation type="unfinished">नोड डिबगिंग और डायग्नोस्टिक कंसोल खोलें</translation>
+    </message>
+    <message>
+        <source>&amp;Sending addresses</source>
+        <translation type="unfinished">&amp;भेजने वाले पते</translation>
+    </message>
+    <message>
+        <source>&amp;Receiving addresses</source>
+        <translation type="unfinished">&amp;प्राप्त करने वाले पते</translation>
+    </message>
+    <message>
+        <source>Open a bitcoin: URI</source>
+        <translation type="unfinished">एक बिटकॉइन: URI खोलें</translation>
+    </message>
+    <message>
+        <source>Open a wallet</source>
+        <translation type="unfinished">एक वॉलेट खोलें</translation>
+    </message>
+    <message>
+        <source>Close wallet</source>
+        <translation type="unfinished">वॉलेट बंद करें</translation>
+    </message>
+    <message>
+        <source>Restore Wallet…</source>
+        <extracomment>Name of the menu item that restores wallet from a backup file.</extracomment>
+        <translation type="unfinished">वॉलेट पुनर्स्थापित करें…</translation>
+    </message>
+    <message>
+        <source>Restore a wallet from a backup file</source>
+        <extracomment>Status tip for Restore Wallet menu item</extracomment>
+        <translation type="unfinished">बैकअप फ़ाइल से एक वॉलेट पुनर्स्थापित करें</translation>
+    </message>
     <message>
         <source>Migrate Wallet</source>
         <translation type="unfinished">वॉलेट माइग्रेट करें</translation>
@@ -478,12 +599,44 @@ Signing is only possible with addresses of the type 'legacy'.</source>
         <source>Migrate a wallet</source>
         <translation type="unfinished">कोई वॉलेट माइग्रेट करें</translation>
     </message>
+    <message>
+        <source>Show the %1 help message to get a list with possible Bitcoin command-line options</source>
+        <translation type="unfinished">%1 सहायता संदेश दिखाएं ताकि बिटकॉइन कमांड-लाइन विकल्पों की संभावित सूची मिल सके</translation>
+    </message>
+    <message>
+        <source>&amp;Mask values</source>
+        <translation type="unfinished">&amp;मान छुपाएं</translation>
+    </message>
+    <message>
+        <source>Mask the values in the Overview tab</source>
+        <translation type="unfinished">अवलोकन टैब में मान छुपाएं</translation>
+    </message>
+    <message>
+        <source>Zoom</source>
+        <translation type="unfinished">ज़ूम</translation>
+    </message>
+    <message>
+        <source>Main Window</source>
+        <translation type="unfinished">मुख्य विंडो</translation>
+    </message>
+    <message>
+        <source>%1 client</source>
+        <translation type="unfinished">%1 क्लाइंट</translation>
+    </message>
+    <message>
+        <source>&amp;Hide</source>
+        <translation type="unfinished">&amp;छुपाएं</translation>
+    </message>
+    <message>
+        <source>S&amp;how</source>
+        <translation type="unfinished">&amp;दिखाएं</translation>
+    </message>
     <message numerus="yes">
         <source>%n active connection(s) to Bitcoin network.</source>
         <extracomment>A substring of the tooltip.</extracomment>
         <translation type="unfinished">
-            <numerusform>%n active connection(s) to Bitcoin network.</numerusform>
-            <numerusform>%n active connection(s) to Bitcoin network.</numerusform>
+            <numerusform>बिटकॉइन नेटवर्क से %n सक्रिय कनेक्शन।</numerusform>
+            <numerusform>बिटकॉइन नेटवर्क से %n सक्रिय कनेक्शन।</numerusform>
         </translation>
     </message>
     <message>
@@ -506,6 +659,10 @@ Signing is only possible with addresses of the type 'legacy'.</source>
         <extracomment>A context menu item. The network activity was disabled previously.</extracomment>
         <translation type="unfinished">नेटवर्क गतिविधि सक्षम करें</translation>
     </message>
+    <message>
+        <source>Pre-syncing Headers (%1%)…</source>
+        <translation type="unfinished">हेडर को प्री-सिंक कर रहा है (%1%)…</translation>
+    </message>
     <message>
         <source>Error: %1</source>
         <translation type="unfinished">त्रुटि: %1</translation>
@@ -548,6 +705,34 @@ Signing is only possible with addresses of the type 'legacy'.</source>
         <source>Fee:</source>
         <translation type="unfinished">फी:</translation>
     </message>
+    <message>
+        <source>After Fee:</source>
+        <translation type="unfinished">आफ़्टर फी:</translation>
+    </message>
+    <message>
+        <source>Date</source>
+        <translation type="unfinished">तारीख़</translation>
+    </message>
+    <message>
+        <source>&amp;Copy address</source>
+        <translation type="unfinished">&amp;कॉपी पता</translation>
+    </message>
+    <message>
+        <source>Copy &amp;label</source>
+        <translation type="unfinished">कॉपी  &amp;लेबल</translation>
+    </message>
+    <message>
+        <source>Copy &amp;amount</source>
+        <translation type="unfinished">कॉपी &amp;अमाउंट</translation>
+    </message>
+    <message>
+        <source>Copy quantity</source>
+        <translation type="unfinished">कॉपी क्वांटिटी</translation>
+    </message>
+    <message>
+        <source>Copy after fee</source>
+        <translation type="unfinished">कॉपी आफ़्टर फी</translation>
+    </message>
     </context>
 <context>
     <name>CreateWalletActivity</name>
@@ -611,6 +796,13 @@ The migration process will create a backup of the wallet before migrating. This
         <translation type="unfinished">माइग्रेशन हो गया</translation>
     </message>
 </context>
+<context>
+    <name>WalletController</name>
+    <message>
+        <source>Close wallet</source>
+        <translation type="unfinished">वॉलेट बंद करें</translation>
+    </message>
+    </context>
 <context>
     <name>CreateWalletDialog</name>
     <message>
@@ -701,6 +893,22 @@ The migration process will create a backup of the wallet before migrating. This
         <source>PSBT Operations</source>
         <translation type="unfinished">पीएसबीटी संचालन</translation>
     </message>
+    <message numerus="yes">
+        <source>Signed %n input(s), but more signatures are still required.</source>
+        <translation type="unfinished">
+            <numerusform />
+            <numerusform />
+        </translation>
+    </message>
+    <message>
+        <source>Save Transaction Data</source>
+        <translation type="unfinished">लेन-देन डेटा सहेजें</translation>
+    </message>
+    <message>
+        <source>Partially Signed Transaction (Binary)</source>
+        <extracomment>Expanded name of the binary PSBT file format. See: BIP 174.</extracomment>
+        <translation type="unfinished">आंशिक रूप से हस्ताक्षरित लेनदेन (बाइनरी)</translation>
+    </message>
     <message>
         <source>Sends %1 to %2</source>
         <translation type="unfinished">%1 को %2 के पास भेजता है </translation>
@@ -717,6 +925,13 @@ The migration process will create a backup of the wallet before migrating. This
         <source>or</source>
         <translation type="unfinished">और</translation>
     </message>
+    <message numerus="yes">
+        <source>Transaction has %n unsigned input(s).</source>
+        <translation type="unfinished">
+            <numerusform />
+            <numerusform />
+        </translation>
+    </message>
     </context>
 <context>
     <name>PeerTableModel</name>
@@ -743,7 +958,7 @@ The migration process will create a backup of the wallet before migrating. This
     <message>
         <source>Type</source>
         <extracomment>Title of Peers Table column which describes the type of peer connection. The "type" describes why the connection exists.</extracomment>
-        <translation type="unfinished">टाइप</translation>
+        <translation type="unfinished">प्रकार</translation>
     </message>
     <message>
         <source>Network</source>
@@ -872,10 +1087,6 @@ The migration process will create a backup of the wallet before migrating. This
         <source>Transaction Relay</source>
         <translation type="unfinished">लेन-देन रिले</translation>
     </message>
-    <message>
-        <source>Starting Block</source>
-        <translation type="unfinished">प्रारम्भिक खण्ड</translation>
-    </message>
     <message>
         <source>Synced Headers</source>
         <translation type="unfinished">सिंक किए गए हेडर</translation>
@@ -1281,18 +1492,10 @@ For more information on using this console, type %6.
         <source>&amp;Copy address</source>
         <translation type="unfinished">&amp;कॉपी पता</translation>
     </message>
-    <message>
-        <source>Copy &amp;label</source>
-        <translation type="unfinished">कॉपी  &amp;लेबल</translation>
-    </message>
     <message>
         <source>Copy &amp;message</source>
         <translation type="unfinished">कॉपी  &amp;मेसेज</translation>
     </message>
-    <message>
-        <source>Copy &amp;amount</source>
-        <translation type="unfinished">कॉपी &amp;अमाउंट</translation>
-    </message>
     <message>
         <source>Not recommended due to higher fees and less protection against typos.</source>
         <translation type="unfinished">उच्च शुल्क और टाइपिंग त्रुटियों के प्रति कम सुरक्षा के कारण इसकी अनुशंसा नहीं की जाती।</translation>
@@ -1371,10 +1574,6 @@ For more information on using this console, type %6.
 </context>
 <context>
     <name>RecentRequestsTableModel</name>
-    <message>
-        <source>Date</source>
-        <translation type="unfinished">तारीख़</translation>
-    </message>
     <message>
         <source>Label</source>
         <translation type="unfinished">लेबल</translation>
@@ -1542,22 +1741,10 @@ Note:  Since the fee is calculated on a per-byte basis, a fee rate of "100 satos
         <source>Copy quantity</source>
         <translation type="unfinished">कॉपी क्वांटिटी</translation>
     </message>
-    <message>
-        <source>Copy amount</source>
-        <translation type="unfinished">कॉपी अमाउंट</translation>
-    </message>
-    <message>
-        <source>Copy fee</source>
-        <translation type="unfinished">कॉपी फी</translation>
-    </message>
     <message>
         <source>Copy after fee</source>
         <translation type="unfinished">कॉपी आफ़्टर फी</translation>
     </message>
-    <message>
-        <source>Copy bytes</source>
-        <translation type="unfinished">कॉपी बाइट्स</translation>
-    </message>
     <message>
         <source>%1 (%2 blocks)</source>
         <translation type="unfinished">%1 (%2 ब्लाकस)</translation>
@@ -1610,15 +1797,6 @@ Note:  Since the fee is calculated on a per-byte basis, a fee rate of "100 satos
         <extracomment>"External signer" means using devices such as hardware wallets.</extracomment>
         <translation type="unfinished">बाहरी हस्ताक्षरकर्ता विफलता</translation>
     </message>
-    <message>
-        <source>Save Transaction Data</source>
-        <translation type="unfinished">लेन-देन डेटा सहेजें</translation>
-    </message>
-    <message>
-        <source>Partially Signed Transaction (Binary)</source>
-        <extracomment>Expanded name of the binary PSBT file format. See: BIP 174.</extracomment>
-        <translation type="unfinished">आंशिक रूप से हस्ताक्षरित लेनदेन (बाइनरी)</translation>
-    </message>
     <message>
         <source>PSBT saved</source>
         <extracomment>Popup message when a PSBT has been saved to a file</extracomment>
@@ -1704,10 +1882,6 @@ Note:  Since the fee is calculated on a per-byte basis, a fee rate of "100 satos
         <source>The amount exceeds your balance.</source>
         <translation type="unfinished">राशि आपकी शेष राशि से अधिक है।</translation>
     </message>
-    <message>
-        <source>The total exceeds your balance when the %1 transaction fee is included.</source>
-        <translation type="unfinished"> %1 जब लेन-देन शुल्क शामिल किया जाता है, तो कुल आपकी शेष राशि से अधिक हो जाती है।</translation>
-    </message>
     <message>
         <source>Duplicate address found: addresses should only be used once each.</source>
         <translation type="unfinished">डुप्लिकेट पता मिला: पतों का उपयोग केवल एक बार किया जाना चाहिए।</translation>
@@ -2107,7 +2281,7 @@ Note:  Since the fee is calculated on a per-byte basis, a fee rate of "100 satos
     </message>
     <message>
         <source>%1 (Certificate was not verified)</source>
-        <translation type="unfinished">%1 (प्रमाणपत्र सत्यापित नहीं किया गया है)</translation>
+        <translation type="unfinished">%1 (प्रमाणपत्र सत्यापित नहीं किया गया)</translation>
     </message>
     <message>
         <source>Merchant</source>
@@ -2129,6 +2303,10 @@ Note:  Since the fee is calculated on a per-byte basis, a fee rate of "100 satos
         <source>Inputs</source>
         <translation type="unfinished">इनपुट</translation>
     </message>
+    <message>
+        <source>Amount</source>
+        <translation type="unfinished">राशि</translation>
+    </message>
     <message>
         <source>true</source>
         <translation type="unfinished">सच</translation>
@@ -2299,6 +2477,10 @@ Note:  Since the fee is calculated on a per-byte basis, a fee rate of "100 satos
         <extracomment>Expanded name of the CSV file format. See: https://en.wikipedia.org/wiki/Comma-separated_values.</extracomment>
         <translation type="unfinished">कॉमा सेपरेटेड फ़ाइल</translation>
     </message>
+    <message>
+        <source>Confirmed</source>
+        <translation type="unfinished">पुष्टीकृत</translation>
+    </message>
     <message>
         <source>Date</source>
         <translation type="unfinished">तारीख़</translation>
@@ -2359,10 +2541,6 @@ Note:  Since the fee is calculated on a per-byte basis, a fee rate of "100 satos
         <source>%s failed to validate the -assumeutxo snapshot state. This indicates a hardware problem, or a bug in the software, or a bad software modification that allowed an invalid snapshot to be loaded. As a result of this, the node will shut down and stop using any state that was built on the snapshot, resetting the chain height from %d to %d. On the next restart, the node will resume syncing from %d without using any snapshot data. Please report this incident to %s, including how you obtained the snapshot. The invalid snapshot chainstate will be left on disk in case it is helpful in diagnosing the issue that caused this error.</source>
         <translation type="unfinished">-assumeutxo snapshot state को सत्यापित करने में %sविफल रहा |  यह हार्डवेयर समस्या, या सॉफ्टवेयर में बग, या खराब सॉफ्टवेयर संशोधन को इंगित करता है जिसके कारण अमान्य स्नैपशॉट लोड हो गया। इसके परिणामस्वरूप, नोड बंद हो जाएगा और स्नैपशॉट पर निर्मित किसी भी स्थिति का उपयोग करना बंद कर देगा, जिससे चेन की ऊंचाई %d से %d पर रीसेट हो जाएगी। अगली बार restart करने पर, नोड किसी भी स्नैपशॉट डेटा का उपयोग किए बिना %d से सिंक करना फिर से शुरू कर देगा। कृपया इस घटना की रिपोर्ट %s को करें, जिसमें यह भी शामिल है कि आपने स्नैपशॉट कैसे प्राप्त किया। अमान्य स्नैपशॉट चेनस्टेट को डिस्क पर छोड़ दिया जाएगा, ताकि यह उस समस्या का निदान करने में सहायक हो, जिसके कारण यह त्रुटि हुई।</translation>
     </message>
-    <message>
-        <source>%s request to listen on port %u. This port is considered "bad" and thus it is unlikely that any peer will connect to it. See doc/p2p-bad-ports.md for details and a full list.</source>
-        <translation type="unfinished">%s अनुरोध %u पोर्ट पर सुनने का. इस बंदरगाह को "खराब" माना जाता है और इस प्रकार यह संभावना नहीं है कि कोई भी सहकर्मी इससे जुड़ेगा। विवरण और पूरी सूची के लिए doc/p2p-bad-ports.md देखें।</translation>
-    </message>
     <message>
         <source>Disk space for %s may not accommodate the block files. Approximately %u GB of data will be stored in this directory.</source>
         <translation type="unfinished">%s के लिए डिस्क स्थान ब्लॉक फ़ाइलों को समायोजित नहीं कर सकता है। इस निर्देशिका में लगभग %u GB डेटा संग्रहीत किया जाएगा।</translation>
@@ -2387,6 +2565,10 @@ Note:  Since the fee is calculated on a per-byte basis, a fee rate of "100 satos
         <source>Rename of '%s' -&gt; '%s' failed. You should resolve this by manually moving or deleting the invalid snapshot directory %s, otherwise you will encounter the same error again on the next startup.</source>
         <translation type="unfinished">'%s' का नाम बदलकर '%s' करना विफल रहा। आपको अमान्य स्नैपशॉट निर्देशिका %s को मैन्युअल रूप से स्थानांतरित या हटाकर इसे हल करना चाहिए, अन्यथा आपको अगली बार स्टार्टअप पर फिर से वही त्रुटि का सामना करना पड़ेगा।</translation>
     </message>
+    <message>
+        <source>Unsupported category-specific logging level %1$s=%2$s. Expected %1$s=&lt;category&gt;:&lt;loglevel&gt;. Valid categories: %3$s. Valid loglevels: %4$s.</source>
+        <translation type="unfinished">असमर्थित श्रेणी-विशिष्ट लॉगिंग स्तर%1$s=%2$s.अपेक्षित%1$s=&lt;category&gt;:&lt;loglevel&gt;.मान्य श्रेणियां:%3$s.मान्य लॉग स्तर:%4$s</translation>
+    </message>
     <message>
         <source>%s is set very high! Fees this large could be paid on a single transaction.</source>
         <translation type="unfinished">%sबहुत अधिक निर्धारित है! इतनी बड़ी फीस एक ही लेनदेन पर चुकाई जा सकती है।</translation>
@@ -2464,8 +2646,7 @@ The wallet might have been tampered with or created with malicious intent.
 </source>
         <translation type="unfinished">डिस्क्रिप्टर वॉलेट में अप्रत्याशित विरासत प्रविष्टि मिली। %s बटुआ लोड हो रहा है
 
-हो सकता है कि वॉलेट से छेड़छाड़ की गई हो या दुर्भावनापूर्ण इरादे से बनाया गया हो।
-</translation>
+हो सकता है कि वॉलेट से छेड़छाड़ की गई हो या दुर्भावनापूर्ण इरादे से बनाया गया हो।</translation>
     </message>
     <message>
         <source>Your computer's date and time appear to be more than %d minutes out of sync with the network, this may lead to consensus failure. After you've confirmed your computer's clock, this message should no longer appear when you restart your node. Without a restart, it should stop showing automatically after you've connected to a sufficient number of new outbound peers, which may take some time. You can inspect the `timeoffset` field of the `getpeerinfo` and `getnetworkinfo` RPC methods to get more info.</source>
@@ -2527,10 +2708,6 @@ The wallet might have been tampered with or created with malicious intent.
         <source>Error: database transaction cannot be executed for wallet %s</source>
         <translation type="unfinished">Error: वॉलेट %s के लिए डेटाबेस लेनदेन निष्पादित नहीं किया जा सकता</translation>
     </message>
-    <message>
-        <source>Failed to connect best block (%s).</source>
-        <translation type="unfinished">best ब्लॉक (%s) से कनेक्ट करने में विफल |</translation>
-    </message>
     <message>
         <source>Failed to disconnect block.</source>
         <translation type="unfinished">ब्लॉक को डिस्कनेक्ट करने में विफल |</translation>
@@ -2543,14 +2720,6 @@ The wallet might have been tampered with or created with malicious intent.
         <source>Failed to write block.</source>
         <translation type="unfinished">ब्लॉक लिखने में विफल |</translation>
     </message>
-    <message>
-        <source>Failed to write to block index database.</source>
-        <translation type="unfinished">ब्लॉक इंडेक्स डेटाबेस में लिखने में विफल |</translation>
-    </message>
-    <message>
-        <source>Failed to write to coin database.</source>
-        <translation type="unfinished">सिक्का डेटाबेस में लिखने में विफल |</translation>
-    </message>
     <message>
         <source>Failed to write undo data.</source>
         <translation type="unfinished">पूर्ववत डेटा लिखने में विफल.</translation>
diff --git a/src/qt/locale/bitcoin_hr.ts b/src/qt/locale/bitcoin_hr.ts
index cad8e138cd92..e63769ae006a 100644
--- a/src/qt/locale/bitcoin_hr.ts
+++ b/src/qt/locale/bitcoin_hr.ts
@@ -1095,10 +1095,6 @@ Potpisivanje je moguće samo sa 'legacy' adresama. </translation>
         <source>Disable Private Keys</source>
         <translation type="unfinished">Isključite privatne ključeve</translation>
     </message>
-    <message>
-        <source>Make a blank wallet. Blank wallets do not initially have private keys or scripts. Private keys and addresses can be imported, or an HD seed can be set, at a later time.</source>
-        <translation type="unfinished">Stvorite prazni novčanik. Prazni novčanici nemaju privatnih ključeva ili skripta. Mogu se naknadno uvesti privatne ključeve i adrese ili postaviti HD sjeme.</translation>
-    </message>
     <message>
         <source>Make Blank Wallet</source>
         <translation type="unfinished">Stvorite prazni novčanik</translation>
@@ -1789,9 +1785,13 @@ Potpisivanje je moguće samo sa 'legacy' adresama. </translation>
         <source>Could not sign any more inputs.</source>
         <translation type="unfinished">Nije bilo moguće potpisati više inputa. </translation>
     </message>
-    <message>
-        <source>Signed %1 inputs, but more signatures are still required.</source>
-        <translation type="unfinished">Potpisano %1 inputa, ali potrebno je još potpisa. </translation>
+    <message numerus="yes">
+        <source>Signed %n input(s), but more signatures are still required.</source>
+        <translation type="unfinished">
+            <numerusform />
+            <numerusform />
+            <numerusform />
+        </translation>
     </message>
     <message>
         <source>Signed transaction successfully. Transaction is ready to broadcast.</source>
@@ -1846,9 +1846,13 @@ Potpisivanje je moguće samo sa 'legacy' adresama. </translation>
         <source>or</source>
         <translation type="unfinished">ili</translation>
     </message>
-    <message>
-        <source>Transaction has %1 unsigned inputs.</source>
-        <translation type="unfinished">Transakcija ima %1 nepotpisanih inputa.</translation>
+    <message numerus="yes">
+        <source>Transaction has %n unsigned input(s).</source>
+        <translation type="unfinished">
+            <numerusform />
+            <numerusform />
+            <numerusform />
+        </translation>
     </message>
     <message>
         <source>Transaction is missing some information about inputs.</source>
@@ -2088,10 +2092,6 @@ Ako imate ovu grešku, od trgovca zatražite URI koji je kompatibilan sa BIP21.<
         <source>Version</source>
         <translation type="unfinished">Verzija</translation>
     </message>
-    <message>
-        <source>Starting Block</source>
-        <translation type="unfinished">Početni blok</translation>
-    </message>
     <message>
         <source>Synced Headers</source>
         <translation type="unfinished">Broj sinkroniziranih zaglavlja</translation>
@@ -2897,10 +2897,6 @@ Napomena: Budući da se naknada računa po bajtu, naknada od "100 satošija po k
         <source>The amount exceeds your balance.</source>
         <translation type="unfinished">Iznos je veći od raspoložljivog stanja novčanika.</translation>
     </message>
-    <message>
-        <source>The total exceeds your balance when the %1 transaction fee is included.</source>
-        <translation type="unfinished">Iznos je veći od stanja novčanika kad se doda naknada za transakcije od %1.</translation>
-    </message>
     <message>
         <source>Duplicate address found: addresses should only be used once each.</source>
         <translation type="unfinished">Duplikatna adresa pronađena: adrese trebaju biti korištene samo jedanput.</translation>
@@ -3785,10 +3781,6 @@ Idi na Datoteka &gt;  Otvori novčanik za učitanje novčanika.
         <source>Warning: Private keys detected in wallet {%s} with disabled private keys</source>
         <translation type="unfinished">Upozorenje: Privatni ključevi pronađeni u novčaniku {%s} s isključenim privatnim ključevima</translation>
     </message>
-    <message>
-        <source>Warning: We do not appear to fully agree with our peers! You may need to upgrade, or other nodes may need to upgrade.</source>
-        <translation type="unfinished">Upozorenje: Izgleda da se ne slažemo u potpunosti s našim klijentima! Možda ćete se vi ili ostali čvorovi morati ažurirati.</translation>
-    </message>
     <message>
         <source>Witness data for blocks after height %d requires validation. Please restart with -reindex.</source>
         <translation type="unfinished">Podaci svjedoka za blokove poslije visine %d zahtijevaju validaciju. Molimo restartirajte sa -reindex.</translation>
@@ -3861,10 +3853,6 @@ Idi na Datoteka &gt;  Otvori novčanik za učitanje novčanika.
         <source>Dump file %s does not exist.</source>
         <translation type="unfinished">Dump datoteka %s ne postoji.</translation>
     </message>
-    <message>
-        <source>Error creating %s</source>
-        <translation type="unfinished">Greška pri stvaranju %s</translation>
-    </message>
     <message>
         <source>Error initializing block database</source>
         <translation type="unfinished">Greška kod inicijaliziranja baze blokova</translation>
@@ -3873,10 +3861,6 @@ Idi na Datoteka &gt;  Otvori novčanik za učitanje novčanika.
         <source>Error loading %s</source>
         <translation type="unfinished">Greška kod pokretanja programa %s!</translation>
     </message>
-    <message>
-        <source>Error loading %s: Private keys can only be disabled during creation</source>
-        <translation type="unfinished">Greška kod učitavanja %s: Privatni ključevi mogu biti isključeni samo tijekom stvaranja</translation>
-    </message>
     <message>
         <source>Error loading %s: Wallet corrupted</source>
         <translation type="unfinished">Greška kod učitavanja %s: Novčanik pokvaren</translation>
@@ -4125,10 +4109,6 @@ Idi na Datoteka &gt;  Otvori novčanik za učitanje novčanika.
         <source>This is the minimum transaction fee you pay on every transaction.</source>
         <translation type="unfinished">Ovo je minimalna transakcijska naknada koju plaćate za svaku transakciju.</translation>
     </message>
-    <message>
-        <source>This is the transaction fee you will pay if you send a transaction.</source>
-        <translation type="unfinished">Ovo je transakcijska naknada koju ćete platiti ako pošaljete transakciju.</translation>
-    </message>
     <message>
         <source>Transaction amount too small</source>
         <translation type="unfinished">Transakcijski iznos premalen</translation>
diff --git a/src/qt/locale/bitcoin_hu.ts b/src/qt/locale/bitcoin_hu.ts
index 337325a3e9ab..9b7e647d46af 100644
--- a/src/qt/locale/bitcoin_hu.ts
+++ b/src/qt/locale/bitcoin_hu.ts
@@ -773,6 +773,10 @@ Aláírni csak régi típusú, egyessel kezdődő címekkel lehet.</translation>
         <extracomment>Label of the input field where the name of the wallet is entered.</extracomment>
         <translation type="unfinished">Tárca neve</translation>
     </message>
+    <message>
+        <source>Invalid Wallet Name</source>
+        <translation type="unfinished">Érvénytelen tárca név</translation>
+    </message>
     <message>
         <source>&amp;Window</source>
         <translation type="unfinished">&amp;Ablak</translation>
@@ -988,11 +992,11 @@ Aláírni csak régi típusú, egyessel kezdődő címekkel lehet.</translation>
     </message>
     <message>
         <source>Copy &amp;label</source>
-        <translation type="unfinished">Címke &amp;másolása</translation>
+        <translation type="unfinished">C&amp;ímke másolása</translation>
     </message>
     <message>
         <source>Copy &amp;amount</source>
-        <translation type="unfinished">Ö&amp;sszeg másolása</translation>
+        <translation type="unfinished">&amp;Összeg másolása</translation>
     </message>
     <message>
         <source>Copy transaction &amp;ID and output index</source>
@@ -1131,6 +1135,16 @@ A migrációs folyamat készít biztonsági mentést a tárcáról migrálás el
         <source>Solvable but not watched scripts have been migrated to a new wallet named '%1'.</source>
         <translation type="unfinished">Megoldható de nem megfigyelt szkriptek az új '%1' nevű tárcába lettek migrálva.</translation>
     </message>
+    <message>
+        <source>Restore Wallet</source>
+        <extracomment>Title of progress window which is displayed when wallets are being restored.</extracomment>
+        <translation type="unfinished">Tárca visszaállítása</translation>
+    </message>
+    <message>
+        <source>Restoring Wallet &lt;b&gt;%1&lt;/b&gt;…</source>
+        <extracomment>Descriptive text of the restore wallets progress window which indicates to the user that wallets are currently being restored.</extracomment>
+        <translation type="unfinished">Tárca visszaállítása folyamatban &lt;b&gt;%1&lt;/b&gt;...</translation>
+    </message>
     <message>
         <source>Migration failed</source>
         <translation type="unfinished">Migrálás meghiúsult</translation>
@@ -1254,10 +1268,6 @@ A migrációs folyamat készít biztonsági mentést a tárcáról migrálás el
         <source>Disable Private Keys</source>
         <translation type="unfinished">Privát kulcsok letiltása</translation>
     </message>
-    <message>
-        <source>Make a blank wallet. Blank wallets do not initially have private keys or scripts. Private keys and addresses can be imported, or an HD seed can be set, at a later time.</source>
-        <translation type="unfinished">Üres tárca készítése. Az üres tárcák kezdetben nem tartalmaznak privát kulcsokat vagy szkripteket. Később lehetséges a privát kulcsok vagy címek importálása illetve egy HD mag beállítása.</translation>
-    </message>
     <message>
         <source>Make Blank Wallet</source>
         <translation type="unfinished">Üres tárca készítése</translation>
@@ -1955,7 +1965,7 @@ A migrációs folyamat készít biztonsági mentést a tárcáról migrálás el
     </message>
     <message>
         <source>Broadcast Tx</source>
-        <translation type="unfinished">Tx szétküldése</translation>
+        <translation type="unfinished">Tx közlése</translation>
     </message>
     <message>
         <source>Copy to Clipboard</source>
@@ -1985,13 +1995,15 @@ A migrációs folyamat készít biztonsági mentést a tárcáról migrálás el
         <source>Could not sign any more inputs.</source>
         <translation type="unfinished">Több bemenetet nem lehet aláírni.</translation>
     </message>
-    <message>
-        <source>Signed %1 inputs, but more signatures are still required.</source>
-        <translation type="unfinished">%1 bemenet aláírva, de több aláírásra van szükség.</translation>
+    <message numerus="yes">
+        <source>Signed %n input(s), but more signatures are still required.</source>
+        <translation type="unfinished">
+            <numerusform />
+        </translation>
     </message>
     <message>
         <source>Signed transaction successfully. Transaction is ready to broadcast.</source>
-        <translation type="unfinished">Tranzakció sikeresen aláírva. Szétküldésre kész.</translation>
+        <translation type="unfinished">Tranzakció sikeresen aláírva. Közlésre kész.</translation>
     </message>
     <message>
         <source>Unknown error processing transaction.</source>
@@ -1999,11 +2011,11 @@ A migrációs folyamat készít biztonsági mentést a tárcáról migrálás el
     </message>
     <message>
         <source>Transaction broadcast successfully! Transaction ID: %1</source>
-        <translation type="unfinished">Tranzakció sikeresen szétküldve. Tranzakció azonosító: %1</translation>
+        <translation type="unfinished">Tranzakció sikeresen közölve. Tranzakció azonosító: %1</translation>
     </message>
     <message>
         <source>Transaction broadcast failed: %1</source>
-        <translation type="unfinished">Tranzakció szétküldése sikertelen: %1</translation>
+        <translation type="unfinished">Tranzakció közlése sikertelen: %1</translation>
     </message>
     <message>
         <source>PSBT copied to clipboard.</source>
@@ -2016,11 +2028,11 @@ A migrációs folyamat készít biztonsági mentést a tárcáról migrálás el
     <message>
         <source>Partially Signed Transaction (Binary)</source>
         <extracomment>Expanded name of the binary PSBT file format. See: BIP 174.</extracomment>
-        <translation type="unfinished">Részlegesen Aláírt Tranzakció (PSBT bináris)</translation>
+        <translation type="unfinished">Részlegesen aláírt tranzakció (PSBT bináris)</translation>
     </message>
     <message>
         <source>PSBT saved to disk.</source>
-        <translation type="unfinished">PSBT háttértárolóra mentve.</translation>
+        <translation type="unfinished">PSBT lemezre mentve.</translation>
     </message>
     <message>
         <source>Sends %1 to %2</source>
@@ -2046,9 +2058,11 @@ A migrációs folyamat készít biztonsági mentést a tárcáról migrálás el
         <source>or</source>
         <translation type="unfinished">vagy</translation>
     </message>
-    <message>
-        <source>Transaction has %1 unsigned inputs.</source>
-        <translation type="unfinished">A tranzakciónak %1 aláíratlan bemenete van.</translation>
+    <message numerus="yes">
+        <source>Transaction has %n unsigned input(s).</source>
+        <translation type="unfinished">
+            <numerusform />
+        </translation>
     </message>
     <message>
         <source>Transaction is missing some information about inputs.</source>
@@ -2336,10 +2350,6 @@ If you are receiving this error you should request the merchant provide a BIP21
         <source>Transaction Relay</source>
         <translation type="unfinished">Tranzakció elosztó</translation>
     </message>
-    <message>
-        <source>Starting Block</source>
-        <translation type="unfinished">Kezdő blokk</translation>
-    </message>
     <message>
         <source>Synced Headers</source>
         <translation type="unfinished">Szinkronizált fejlécek</translation>
@@ -2776,7 +2786,7 @@ Gépeljen %5 az elérhető parancsok áttekintéséhez. Több információért a
     </message>
     <message>
         <source>Copy &amp;label</source>
-        <translation type="unfinished">C&amp;ímke másolása</translation>
+        <translation type="unfinished">Címke &amp;másolása</translation>
     </message>
     <message>
         <source>Copy &amp;message</source>
@@ -3134,7 +3144,7 @@ Megjegyzés: Mivel a díj bájtonként van kiszámítva, egy "100 satoshi kvB-nk
     <message>
         <source>Partially Signed Transaction (Binary)</source>
         <extracomment>Expanded name of the binary PSBT file format. See: BIP 174.</extracomment>
-        <translation type="unfinished">Részlegesen aláírt tranzakció (PSBT bináris)</translation>
+        <translation type="unfinished">Részlegesen Aláírt Tranzakció (PSBT bináris)</translation>
     </message>
     <message>
         <source>PSBT saved</source>
@@ -3219,10 +3229,6 @@ Megjegyzés: Mivel a díj bájtonként van kiszámítva, egy "100 satoshi kvB-nk
         <source>The amount exceeds your balance.</source>
         <translation type="unfinished">Az összeg meghaladja az egyenlegét.</translation>
     </message>
-    <message>
-        <source>The total exceeds your balance when the %1 transaction fee is included.</source>
-        <translation type="unfinished">A küldeni kívánt összeg és a %1 tranzakciós díj együtt meghaladja az egyenlegén rendelkezésre álló összeget.</translation>
-    </message>
     <message>
         <source>Duplicate address found: addresses should only be used once each.</source>
         <translation type="unfinished">Többször szerepel ugyanaz a cím: egy címet csak egyszer használjon.</translation>
@@ -3811,7 +3817,7 @@ Megjegyzés: Mivel a díj bájtonként van kiszámítva, egy "100 satoshi kvB-nk
     </message>
     <message>
         <source>Copy &amp;amount</source>
-        <translation type="unfinished">Ö&amp;sszeg másolása</translation>
+        <translation type="unfinished">&amp;Összeg másolása</translation>
     </message>
     <message>
         <source>Copy transaction &amp;ID</source>
@@ -4189,10 +4195,6 @@ A "Fájl &gt; Tárca megnyitása" menüben tölthet be egyet.
         <source>Warning: Private keys detected in wallet {%s} with disabled private keys</source>
         <translation type="unfinished">Figyelmeztetés: Privát kulcsokat észleltünk a {%s} tárcában, melynél a privát kulcsok le vannak tiltva.</translation>
     </message>
-    <message>
-        <source>Warning: We do not appear to fully agree with our peers! You may need to upgrade, or other nodes may need to upgrade.</source>
-        <translation type="unfinished">Figyelmeztetés: Úgy tűnik nem értünk egyet teljesen a partnereinkel! Lehet, hogy frissítenie kell, vagy a többi partnernek kell frissítenie.</translation>
-    </message>
     <message>
         <source>Witness data for blocks after height %d requires validation. Please restart with -reindex.</source>
         <translation type="unfinished">Érvényesítés szükséges a %d feletti blokkok tanúsító adatának. Kérjük indítsa újra -reindex paraméterrel.</translation>
@@ -4295,14 +4297,6 @@ A "Fájl &gt; Tárca megnyitása" menüben tölthet be egyet.
         <source>Option '-checkpoints' is set but checkpoints were removed. This option has no effect.</source>
         <translation type="unfinished">A '-checkpoints' opció be van állítva, de az ellenőrzőpontok el lettek távolítva. Ennek az opciónak nincs hatása.</translation>
     </message>
-    <message>
-        <source>Option '-maxorphantx' is set but no longer has any effect (see release notes). Please remove it from your configuration.</source>
-        <translation type="unfinished">A '-maxorphantx' opció be van állítva, de már nincs hatása (lásd a kiadási megjegyzéseket). Kérjük, távolítsa el a konfigurációjából.</translation>
-    </message>
-    <message>
-        <source>Options '-datacarrier' or '-datacarriersize' are set but are marked as deprecated. They will be removed in a future version.</source>
-        <translation type="unfinished">A(z) '-datacarrier' vagy '-datacarriersize' opciók be vannak állítva, de elavultnak lettek jelölve. Egy jövőbeli verzióban eltávolításra kerülnek.</translation>
-    </message>
     <message>
         <source>Outbound connections restricted to CJDNS (-onlynet=cjdns) but -cjdnsreachable is not provided</source>
         <translation type="unfinished">A kilépő kapcsolatok CJDNS-re korlátozottak (-onlynet=cjdns) de nincs megadva -cjdnsreachable</translation>
@@ -4393,10 +4387,6 @@ A tárca biztonsági mentésének visszaállítása sikertelen.</translation>
         <source>whitebind may only be used for incoming connections ("out" was passed)</source>
         <translation type="unfinished">A whitebind csak bejövő kapcsolatokhoz használható ("out" lett megadva)</translation>
     </message>
-    <message>
-        <source>-paytxfee is deprecated and will be fully removed in v31.0.</source>
-        <translation type="unfinished">A -paytxfee elavult, és a v31.0 verzióban teljesen eltávolításra kerül.</translation>
-    </message>
     <message>
         <source>A fatal internal error occurred, see debug.log for details: </source>
         <translation type="unfinished">Végzetes belső hiba történt, részletek a debug.log fájlban:</translation>
@@ -4417,10 +4407,6 @@ A tárca biztonsági mentésének visszaállítása sikertelen.</translation>
         <source>Can't spend unconfirmed version 3 pre-selected input with a version %d tx</source>
         <translation type="unfinished">Nem lehet megerősítetlen, 3-as verziójú, előre kiválasztott bemenetet elkölteni egy %d verziójú tranzakcióval</translation>
     </message>
-    <message>
-        <source>Cannot add WalletDescriptor to a non-descriptor wallet</source>
-        <translation type="unfinished">WalletDescriptor nem adható hozzá nem-leíró alapú tárcához</translation>
-    </message>
     <message>
         <source>Cannot write to directory '%s'; check permissions.</source>
         <translation type="unfinished">Nem tudok írni a '%s' könyvtárba, ellenőrizd a jogosultságokat.</translation>
@@ -4473,10 +4459,6 @@ A tárca biztonsági mentésének visszaállítása sikertelen.</translation>
         <source>Elliptic curve cryptography sanity check failure. %s is shutting down.</source>
         <translation type="unfinished">Elliptikus görbés kriptográfia épségi ellenőrzése sikertelen. %s most leáll.</translation>
     </message>
-    <message>
-        <source>Error creating %s</source>
-        <translation type="unfinished">Hiba %s létrehozása közben</translation>
-    </message>
     <message>
         <source>Error initializing block database</source>
         <translation type="unfinished">A blokk-adatbázis előkészítése nem sikerült</translation>
@@ -4485,10 +4467,6 @@ A tárca biztonsági mentésének visszaállítása sikertelen.</translation>
         <source>Error loading %s</source>
         <translation type="unfinished">Hiba a(z) %s betöltése közben</translation>
     </message>
-    <message>
-        <source>Error loading %s: Private keys can only be disabled during creation</source>
-        <translation type="unfinished"> %s betöltése sikertelen. A privát kulcsok csak a létrehozáskor tilthatóak le.</translation>
-    </message>
     <message>
         <source>Error loading %s: Wallet corrupted</source>
         <translation type="unfinished">Hiba a(z) %s betöltése közben: A tárca hibás.</translation>
@@ -4637,10 +4615,6 @@ A tárca biztonsági mentésének visszaállítása sikertelen.</translation>
         <source>Failed to close file when writing block.</source>
         <translation type="unfinished">Blokk írása közben nem sikerült bezárni a fájlt</translation>
     </message>
-    <message>
-        <source>Failed to connect best block (%s).</source>
-        <translation type="unfinished">Sikertelen a legjobb blokkhoz (%s) csatlakozás.</translation>
-    </message>
     <message>
         <source>Failed to disconnect block.</source>
         <translation type="unfinished">Blokk szétkapcsolása nem sikerült.</translation>
@@ -4665,14 +4639,6 @@ A tárca biztonsági mentésének visszaállítása sikertelen.</translation>
         <source>Failed to write block.</source>
         <translation type="unfinished">Blokk írása nem sikerült.</translation>
     </message>
-    <message>
-        <source>Failed to write to block index database.</source>
-        <translation type="unfinished">A blokk-index adatbázis írása nem sikerült.</translation>
-    </message>
-    <message>
-        <source>Failed to write to coin database.</source>
-        <translation type="unfinished">Az érme-adatbázis írása nem sikerült.</translation>
-    </message>
     <message>
         <source>Failed to write undo data.</source>
         <translation type="unfinished">Visszavonási adatok írása nem sikerült.</translation>
@@ -4725,14 +4691,14 @@ A tárca biztonsági mentésének visszaállítása sikertelen.</translation>
         <source>Invalid P2P permission: '%s'</source>
         <translation type="unfinished">Érvénytelen P2P jog: '%s'</translation>
     </message>
-    <message>
-        <source>Invalid amount for %s=&lt;amount&gt;: '%s' (must be at least %s)</source>
-        <translation type="unfinished">Érvénytelen összeg: %s=&lt;amount&gt;: '%s' (legalább ennyinek kell lennie: %s)</translation>
-    </message>
     <message>
         <source>Invalid amount for %s=&lt;amount&gt;: '%s'</source>
         <translation type="unfinished">Érvénytelen összeg, %s=&lt;amount&gt;: '%s'</translation>
     </message>
+    <message>
+        <source>Creating wallet…</source>
+        <translation type="unfinished">Tárca létrehozása...</translation>
+    </message>
     <message>
         <source>Invalid amount for -%s=&lt;amount&gt;: '%s'</source>
         <translation type="unfinished">Érvénytelen összeg, -%s=&lt;amount&gt;: '%s'</translation>
@@ -4929,10 +4895,6 @@ A tárca biztonsági mentésének visszaállítása sikertelen.</translation>
         <source>This is the minimum transaction fee you pay on every transaction.</source>
         <translation type="unfinished">Ez a minimum tranzakciós díj, amelyet tranzakciónként kifizet.</translation>
     </message>
-    <message>
-        <source>This is the transaction fee you will pay if you send a transaction.</source>
-        <translation type="unfinished">Ez a tranzakció díja, amelyet kifizet, ha tranzakciót indít.</translation>
-    </message>
     <message>
         <source>Transaction %s does not belong to this wallet</source>
         <translation type="unfinished">A %s tranzakció nem tartozik ehhez a tárcához</translation>
diff --git a/src/qt/locale/bitcoin_id.ts b/src/qt/locale/bitcoin_id.ts
index 2bb27a321583..f8e0864c27f4 100644
--- a/src/qt/locale/bitcoin_id.ts
+++ b/src/qt/locale/bitcoin_id.ts
@@ -67,10 +67,6 @@
         <extracomment>An error message. %1 is a stand-in argument for the name of the file we attempted to save to.</extracomment>
         <translation type="unfinished">Terjadi sebuah kesalahan saat mencoba menyimpan daftar alamat ke %1. Silakan coba lagi.</translation>
     </message>
-    <message>
-        <source>Sending addresses - %1</source>
-        <translation type="unfinished">Alamat pengirim - %1</translation>
-    </message>
     <message>
         <source>Receiving addresses - %1</source>
         <translation type="unfinished">Penerima alamat - %1</translation>
@@ -625,10 +621,6 @@
     </context>
 <context>
     <name>CoinControlDialog</name>
-    <message>
-        <source>After Fee:</source>
-        <translation type="unfinished">Dengan Biaya:</translation>
-    </message>
     <message>
         <source>Change:</source>
         <translation type="unfinished">Kembalian:</translation>
@@ -653,10 +645,6 @@
         <source>Received with address</source>
         <translation type="unfinished">Diterima dengan alamat</translation>
     </message>
-    <message>
-        <source>Date</source>
-        <translation type="unfinished">Tanggal</translation>
-    </message>
     <message>
         <source>Confirmations</source>
         <translation type="unfinished">Konfirmasi</translation>
@@ -669,42 +657,10 @@
         <source>Copy amount</source>
         <translation type="unfinished">Salin Jumlah</translation>
     </message>
-    <message>
-        <source>&amp;Copy address</source>
-        <translation type="unfinished">&amp;Salin alamat</translation>
-    </message>
-    <message>
-        <source>Copy &amp;label</source>
-        <translation type="unfinished">Salin &amp;label</translation>
-    </message>
-    <message>
-        <source>Copy &amp;amount</source>
-        <translation type="unfinished">Salin &amp;jumlah</translation>
-    </message>
-    <message>
-        <source>Copy transaction &amp;ID and output index</source>
-        <translation type="unfinished">Copy &amp;ID transaksi dan index keluaran</translation>
-    </message>
-    <message>
-        <source>L&amp;ock unspent</source>
-        <translation type="unfinished">K&amp;unci yang belum digunakan</translation>
-    </message>
-    <message>
-        <source>&amp;Unlock unspent</source>
-        <translation type="unfinished">&amp;Buka kunci yang belum digunakan</translation>
-    </message>
-    <message>
-        <source>Copy quantity</source>
-        <translation type="unfinished">Salin Kuantitas</translation>
-    </message>
     <message>
         <source>Copy fee</source>
         <translation type="unfinished">Salin biaya</translation>
     </message>
-    <message>
-        <source>Copy after fee</source>
-        <translation type="unfinished">Salin Setelah Upah</translation>
-    </message>
     <message>
         <source>Copy bytes</source>
         <translation type="unfinished">Salin bytes</translation>
@@ -780,6 +736,16 @@ Proses migrasi akan mencadangkan dompet sebelum melakukan pemindahan. Fail cadan
         <source>Solvable but not watched scripts have been migrated to a new wallet named '%1'.</source>
         <translation type="unfinished">Skrip hanya lihat telah diimigrasikan ke dompet baru yang bernama '%1'.</translation>
     </message>
+    <message>
+        <source>Restore Wallet</source>
+        <extracomment>Title of progress window which is displayed when wallets are being restored.</extracomment>
+        <translation type="unfinished">Pulihkan Dompet</translation>
+    </message>
+    <message>
+        <source>Restoring Wallet &lt;b&gt;%1&lt;/b&gt;…</source>
+        <extracomment>Descriptive text of the restore wallets progress window which indicates to the user that wallets are currently being restored.</extracomment>
+        <translation type="unfinished">Memulihkan Dompet &lt;b&gt;%1&lt;/b&gt;…</translation>
+    </message>
     <message>
         <source>Migration failed</source>
         <translation type="unfinished">Migrasi gagal</translation>
@@ -894,10 +860,6 @@ Proses migrasi akan mencadangkan dompet sebelum melakukan pemindahan. Fail cadan
         <source>Disable Private Keys</source>
         <translation type="unfinished">Nonaktifkan private keys</translation>
     </message>
-    <message>
-        <source>Make a blank wallet. Blank wallets do not initially have private keys or scripts. Private keys and addresses can be imported, or an HD seed can be set, at a later time.</source>
-        <translation type="unfinished">Buat dompet kosong. Dompet kosong pada awalnya tidak memiliki private keys atau skrip pribadi. Private keys dan alamat pribadi dapat diimpor, atau seed HD dapat diatur di kemudian hari.</translation>
-    </message>
     <message>
         <source>Make Blank Wallet</source>
         <translation type="unfinished">Buat dompet kosong</translation>
@@ -1336,90 +1298,29 @@ Proses migrasi akan mencadangkan dompet sebelum melakukan pemindahan. Fail cadan
         <source>Form</source>
         <translation type="unfinished">Formulir</translation>
     </message>
-    <message>
-        <source>Privacy mode activated for the Overview tab. To unmask the values, uncheck Settings-&gt;Mask values.</source>
-        <translation type="unfinished">Mode privasi diaktivasi untuk tab Overview. Untuk mengunmask nilai-nilai, hapus centang yang ada di Settings&gt;Mask values.</translation>
-    </message>
-</context>
+    </context>
 <context>
     <name>PSBTOperationsDialog</name>
     <message>
         <source>PSBT Operations</source>
         <translation type="unfinished">Operasi PBST</translation>
     </message>
-    <message>
-        <source>Sign Tx</source>
-        <translation type="unfinished">Tanda tangan Tx</translation>
-    </message>
-    <message>
-        <source>Copy to Clipboard</source>
-        <translation type="unfinished">Copy ke Clipboard</translation>
-    </message>
-    <message>
-        <source>Save…</source>
-        <translation type="unfinished">Simpan...</translation>
-    </message>
-    <message>
-        <source>Close</source>
-        <translation type="unfinished">Tutup</translation>
-    </message>
-    <message>
-        <source>Failed to load transaction: %1</source>
-        <translation type="unfinished">Gagal untuk memuat transaksi: %1</translation>
-    </message>
-    <message>
-        <source>Failed to sign transaction: %1</source>
-        <translation type="unfinished">Gagal untuk menandatangani transaksi: %1</translation>
-    </message>
-    <message>
-        <source>Cannot sign inputs while wallet is locked.</source>
-        <translation type="unfinished">Tidak dapat menandatangani input saat dompet terkunci.</translation>
-    </message>
-    <message>
-        <source>Could not sign any more inputs.</source>
-        <translation type="unfinished">Tidak bisa menandatangani lagi input apapun.</translation>
-    </message>
-    <message>
-        <source>Signed %1 inputs, but more signatures are still required.</source>
-        <translation type="unfinished">Menandatangankan %1 input, tetapi tanda tangan lebih banyak masih dibutuhkan.</translation>
-    </message>
-    <message>
-        <source>Signed transaction successfully. Transaction is ready to broadcast.</source>
-        <translation type="unfinished">Berhasil menandatangani transaksi. Transaksi sudah siap untuk di broadcast</translation>
-    </message>
-    <message>
-        <source>Unknown error processing transaction.</source>
-        <translation type="unfinished">Kesalahan yang tidak diketahui ketika memproses transaksi </translation>
-    </message>
-    <message>
-        <source>Transaction broadcast successfully! Transaction ID: %1</source>
-        <translation type="unfinished">Transaksi berhasil di broadcast! ID Transaksi: %1</translation>
-    </message>
-    <message>
-        <source>Transaction broadcast failed: %1</source>
-        <translation type="unfinished">Broadcast transaksi gagal: %1</translation>
-    </message>
-    <message>
-        <source>PSBT copied to clipboard.</source>
-        <translation type="unfinished">PSBT disalin ke clipboard</translation>
-    </message>
-    <message>
-        <source>Save Transaction Data</source>
-        <translation type="unfinished">Simpan data Transaksi</translation>
-    </message>
-    <message>
-        <source>Partially Signed Transaction (Binary)</source>
-        <extracomment>Expanded name of the binary PSBT file format. See: BIP 174.</extracomment>
-        <translation type="unfinished">Transaksi yang Ditandatangani Sebagian (Biner)</translation>
-    </message>
-    <message>
-        <source>PSBT saved to disk.</source>
-        <translation type="unfinished">PSBT disimpan ke disk.</translation>
+    <message numerus="yes">
+        <source>Signed %n input(s), but more signatures are still required.</source>
+        <translation type="unfinished">
+            <numerusform />
+        </translation>
     </message>
     <message>
         <source>Sends %1 to %2</source>
         <translation type="unfinished">Mengirim %1 ke %2</translation>
     </message>
+    <message numerus="yes">
+        <source>Transaction has %n unsigned input(s).</source>
+        <translation type="unfinished">
+            <numerusform />
+        </translation>
+    </message>
     </context>
 <context>
     <name>PeerTableModel</name>
@@ -1428,6 +1329,16 @@ Proses migrasi akan mencadangkan dompet sebelum melakukan pemindahan. Fail cadan
         <extracomment>Title of Peers Table column which indicates the duration (length of time) since the peer connection started.</extracomment>
         <translation type="unfinished">Umur</translation>
     </message>
+    <message>
+        <source>Received</source>
+        <extracomment>Title of Peers Table column which indicates the total amount of network information we have received from the peer.</extracomment>
+        <translation type="unfinished">Diterima</translation>
+    </message>
+    <message>
+        <source>Address</source>
+        <extracomment>Title of Peers Table column which contains the IP/Onion/I2P address of the connected peer.</extracomment>
+        <translation type="unfinished">Alamat</translation>
+    </message>
     </context>
 <context>
     <name>RPCConsole</name>
@@ -1507,6 +1418,14 @@ Proses migrasi akan mencadangkan dompet sebelum melakukan pemindahan. Fail cadan
     </context>
 <context>
     <name>ReceiveCoinsDialog</name>
+    <message>
+        <source>Copy &amp;label</source>
+        <translation type="unfinished">Salin &amp;label</translation>
+    </message>
+    <message>
+        <source>Copy &amp;amount</source>
+        <translation type="unfinished">Salin &amp;jumlah</translation>
+    </message>
     <message>
         <source>Not recommended due to higher fees and less protection against typos.</source>
         <translation type="unfinished">Tidak direkomendasikan karena tingginya biaya dan kurang perlindungan terhadap salah ketik.</translation>
@@ -1530,6 +1449,10 @@ Proses migrasi akan mencadangkan dompet sebelum melakukan pemindahan. Fail cadan
     </context>
 <context>
     <name>RecentRequestsTableModel</name>
+    <message>
+        <source>Date</source>
+        <translation type="unfinished">Tanggal</translation>
+    </message>
     <message>
         <source>(no label)</source>
         <translation type="unfinished">(tidak ada label)</translation>
@@ -1545,10 +1468,31 @@ Proses migrasi akan mencadangkan dompet sebelum melakukan pemindahan. Fail cadan
         <source>Hide</source>
         <translation type="unfinished">Sembunyikan</translation>
     </message>
+    <message>
+        <source>Copy amount</source>
+        <translation type="unfinished">Salin Jumlah</translation>
+    </message>
+    <message>
+        <source>Copy fee</source>
+        <translation type="unfinished">Salin biaya</translation>
+    </message>
+    <message>
+        <source>Copy bytes</source>
+        <translation type="unfinished">Salin bytes</translation>
+    </message>
     <message>
         <source>Copy change</source>
         <translation type="unfinished">Salin Perubahan</translation>
     </message>
+    <message>
+        <source>Save Transaction Data</source>
+        <translation type="unfinished">Simpan data Transaksi</translation>
+    </message>
+    <message>
+        <source>Partially Signed Transaction (Binary)</source>
+        <extracomment>Expanded name of the binary PSBT file format. See: BIP 174.</extracomment>
+        <translation type="unfinished">Transaksi yang Ditandatangani Sebagian (Biner)</translation>
+    </message>
     <message>
         <source>%1 from wallet '%2'</source>
         <translation type="unfinished">%1 dari dompet '%2'</translation>
@@ -1611,10 +1555,6 @@ Proses migrasi akan mencadangkan dompet sebelum melakukan pemindahan. Fail cadan
         <source>%1 (Certificate was not verified)</source>
         <translation type="unfinished">%1 (Sertifikat tidak terverifikasi)</translation>
     </message>
-    <message>
-        <source>Amount</source>
-        <translation type="unfinished">Jumlah</translation>
-    </message>
     </context>
 <context>
     <name>TransactionTableModel</name>
@@ -1630,10 +1570,6 @@ Proses migrasi akan mencadangkan dompet sebelum melakukan pemindahan. Fail cadan
         <extracomment>Expanded name of the CSV file format. See: https://en.wikipedia.org/wiki/Comma-separated_values.</extracomment>
         <translation type="unfinished">File yang dipisahkan koma</translation>
     </message>
-    <message>
-        <source>Confirmed</source>
-        <translation type="unfinished">Terkonfirmasi</translation>
-    </message>
     <message>
         <source>Address</source>
         <translation type="unfinished">Alamat</translation>
@@ -1671,6 +1607,10 @@ Proses migrasi akan mencadangkan dompet sebelum melakukan pemindahan. Fail cadan
     </context>
 <context>
     <name>bitcoin-core</name>
+    <message>
+        <source>%s failed to validate the -assumeutxo snapshot state. This indicates a hardware problem, or a bug in the software, or a bad software modification that allowed an invalid snapshot to be loaded. As a result of this, the node will shut down and stop using any state that was built on the snapshot, resetting the chain height from %d to %d. On the next restart, the node will resume syncing from %d without using any snapshot data. Please report this incident to %s, including how you obtained the snapshot. The invalid snapshot chainstate will be left on disk in case it is helpful in diagnosing the issue that caused this error.</source>
+        <translation type="unfinished">%s gagal memvalidasi status snapshot -assumeutxo. Ini mengindikasikan masalah perangkat keras, atau bug pada perangkat lunak, atau modifikasi perangkat lunak yang buruk yang memungkinkan snapshot yang tidak valid dimuat. Sebagai akibatnya, node akan dimatikan dan berhenti menggunakan status apa pun yang dibangun di atas snapshot, mengatur ulang tinggi rantai dari %d ke %d. Pada restart berikutnya, node akan melanjutkan sinkronisasi dari %d tanpa menggunakan data snapshot apa pun. Silakan laporkan kejadian ini ke %s, termasuk bagaimana Anda mendapatkan snapshot tersebut. Chainstate snapshot yang tidak valid akan dibiarkan di disk jika hal itu membantu dalam mendiagnosis masalah yang menyebabkan kesalahan ini.</translation>
+    </message>
     <message>
         <source>%s request to listen on port %u. This port is considered "bad" and thus it is unlikely that any peer will connect to it. See doc/p2p-bad-ports.md for details and a full list.</source>
         <translation type="unfinished">%s meminta mendengarkan di port %u. Port ini dianggap "buruk" dan oleh karena itu tidak mungkin peer lain akan terhubung kesini. Lihat doc/p2p-bad-ports.md untuk detail dan daftar lengkap.</translation>
@@ -1901,10 +1841,6 @@ Tidak dapat memulihkan cadangan dompet..</translation>
         <source>Insufficient dbcache for block verification</source>
         <translation type="unfinished">Kekurangan dbcache untuk verifikasi blok</translation>
     </message>
-    <message>
-        <source>Invalid amount for %s=&lt;amount&gt;: '%s' (must be at least %s)</source>
-        <translation type="unfinished">Jumlah yang tidak valid untuk %s=&lt;amount&gt;: '%s' (harus minimal %s)</translation>
-    </message>
     <message>
         <source>Invalid amount for %s=&lt;amount&gt;: '%s'</source>
         <translation type="unfinished">Jumlah yang tidak valid untuk %s=&lt;amount&gt;: '%s'</translation>
diff --git a/src/qt/locale/bitcoin_is.ts b/src/qt/locale/bitcoin_is.ts
index 1ec11e091323..312b81225ec7 100644
--- a/src/qt/locale/bitcoin_is.ts
+++ b/src/qt/locale/bitcoin_is.ts
@@ -924,6 +924,20 @@ Signing is only possible with addresses of the type 'legacy'.</source>
         <source>Broadcast Tx</source>
         <translation type="unfinished">Útsending Tx</translation>
     </message>
+    <message numerus="yes">
+        <source>Signed %n input(s), but more signatures are still required.</source>
+        <translation type="unfinished">
+            <numerusform />
+            <numerusform />
+        </translation>
+    </message>
+    <message numerus="yes">
+        <source>Transaction has %n unsigned input(s).</source>
+        <translation type="unfinished">
+            <numerusform />
+            <numerusform />
+        </translation>
+    </message>
     </context>
 <context>
     <name>PeerTableModel</name>
@@ -946,10 +960,6 @@ Signing is only possible with addresses of the type 'legacy'.</source>
         <source>Block chain</source>
         <translation type="unfinished">Blokkarkeðja</translation>
     </message>
-    <message>
-        <source>Starting Block</source>
-        <translation type="unfinished">Upphafsblokk</translation>
-    </message>
     <message>
         <source>Synced Blocks</source>
         <translation type="unfinished">Samhæfðar blokkir</translation>
@@ -1064,10 +1074,6 @@ Signing is only possible with addresses of the type 'legacy'.</source>
         <source>The amount exceeds your balance.</source>
         <translation type="unfinished">Upphæðin fer yfir stöðu þína.</translation>
     </message>
-    <message>
-        <source>The total exceeds your balance when the %1 transaction fee is included.</source>
-        <translation type="unfinished">Heildarkostnaður fer yfir stöðuna þína þegar %1 færslugjaldið er innifalið.</translation>
-    </message>
     <message numerus="yes">
         <source>Estimated to begin confirmation within %n block(s).</source>
         <translation type="unfinished">
diff --git a/src/qt/locale/bitcoin_it.ts b/src/qt/locale/bitcoin_it.ts
index 4f348cff7168..d161cf116be3 100644
--- a/src/qt/locale/bitcoin_it.ts
+++ b/src/qt/locale/bitcoin_it.ts
@@ -578,7 +578,7 @@
     </message>
     <message>
         <source>Connecting to peers…</source>
-        <translation type="unfinished">Connessione ai nodi...</translation>
+        <translation type="unfinished">Connessione ai nodi in corso...</translation>
     </message>
     <message>
         <source>Request payments (generates QR codes and bitcoin: URIs)</source>
@@ -609,7 +609,7 @@
     </message>
     <message>
         <source>Catching up…</source>
-        <translation type="unfinished">Recuperando il ritardo...</translation>
+        <translation type="unfinished">Recupero del ritardo in corso...</translation>
     </message>
     <message>
         <source>Last received block was generated %1 ago.</source>
@@ -637,7 +637,7 @@
     </message>
     <message>
         <source>Load Partially Signed Bitcoin Transaction</source>
-        <translation type="unfinished">Carica Transazione Bitcoin Parzialmente Firmata (PSBT)</translation>
+        <translation type="unfinished">Carica Partially Signed Bitcoin Transaction</translation>
     </message>
     <message>
         <source>Load PSBT from &amp;clipboard…</source>
@@ -1088,6 +1088,16 @@ Il processo di migrazione creerà un backup del portafoglio prima della migrazio
         <source>Solvable but not watched scripts have been migrated to a new wallet named '%1'.</source>
         <translation type="unfinished">Gli script risolvibili ma non monitorati sono stati migrati su un nuovo wallet chiamato '%1'.</translation>
     </message>
+    <message>
+        <source>Restore Wallet</source>
+        <extracomment>Title of progress window which is displayed when wallets are being restored.</extracomment>
+        <translation type="unfinished">Ripristina Portafoglio</translation>
+    </message>
+    <message>
+        <source>Restoring Wallet &lt;b&gt;%1&lt;/b&gt;…</source>
+        <extracomment>Descriptive text of the restore wallets progress window which indicates to the user that wallets are currently being restored.</extracomment>
+        <translation type="unfinished">Ripristinando Portafoglio  &lt;b&gt;%1&lt;/b&gt;…</translation>
+    </message>
     <message>
         <source>Migration failed</source>
         <translation type="unfinished">Migrazione fallita</translation>
@@ -1211,10 +1221,6 @@ Il processo di migrazione creerà un backup del portafoglio prima della migrazio
         <source>Disable Private Keys</source>
         <translation type="unfinished">Disabilita Chiavi Private</translation>
     </message>
-    <message>
-        <source>Make a blank wallet. Blank wallets do not initially have private keys or scripts. Private keys and addresses can be imported, or an HD seed can be set, at a later time.</source>
-        <translation type="unfinished">Crea un portafoglio vuoto. I portafogli vuoti non hanno inizialmente nessuna chiave privata o script. In seguito, possono essere importate chiavi private e indirizzi oppure può essere impostato un seme HD.</translation>
-    </message>
     <message>
         <source>Make Blank Wallet</source>
         <translation type="unfinished">Crea Portafoglio Vuoto</translation>
@@ -1950,9 +1956,12 @@ Il processo di migrazione creerà un backup del portafoglio prima della migrazio
         <source>Could not sign any more inputs.</source>
         <translation type="unfinished">Impossibile firmare ulteriori input.</translation>
     </message>
-    <message>
-        <source>Signed %1 inputs, but more signatures are still required.</source>
-        <translation type="unfinished">Firmato/i %1 input, ma sono ancora richieste ulteriori firme.</translation>
+    <message numerus="yes">
+        <source>Signed %n input(s), but more signatures are still required.</source>
+        <translation type="unfinished">
+            <numerusform />
+            <numerusform />
+        </translation>
     </message>
     <message>
         <source>Signed transaction successfully. Transaction is ready to broadcast.</source>
@@ -2011,9 +2020,12 @@ Il processo di migrazione creerà un backup del portafoglio prima della migrazio
         <source>or</source>
         <translation type="unfinished">o</translation>
     </message>
-    <message>
-        <source>Transaction has %1 unsigned inputs.</source>
-        <translation type="unfinished">La transazione ha %1 input non firmati.</translation>
+    <message numerus="yes">
+        <source>Transaction has %n unsigned input(s).</source>
+        <translation type="unfinished">
+            <numerusform />
+            <numerusform />
+        </translation>
     </message>
     <message>
         <source>Transaction is missing some information about inputs.</source>
@@ -2286,10 +2298,6 @@ Se ricevi questo errore, dovresti richiedere al commerciante di fornire un URI c
         <source>Transaction Relay</source>
         <translation type="unfinished">Relay di transazione</translation>
     </message>
-    <message>
-        <source>Starting Block</source>
-        <translation type="unfinished">Blocco di partenza</translation>
-    </message>
     <message>
         <source>Synced Headers</source>
         <translation type="unfinished">Intestazioni Sincronizzate</translation>
@@ -3138,10 +3146,6 @@ Nota: poiché la commissione è calcolata su base per byte, una commissione di "
         <source>The amount exceeds your balance.</source>
         <translation type="unfinished">Non hai abbastanza fondi</translation>
     </message>
-    <message>
-        <source>The total exceeds your balance when the %1 transaction fee is included.</source>
-        <translation type="unfinished">Il totale è superiore al tuo saldo attuale includendo la commissione di %1.</translation>
-    </message>
     <message>
         <source>Duplicate address found: addresses should only be used once each.</source>
         <translation type="unfinished">Rilevato un indirizzo duplicato Ciascun indirizzo dovrebbe essere utilizzato una sola volta.</translation>
@@ -4102,10 +4106,6 @@ Vai su File &gt; Apri Portafoglio per caricare un portafoglio.
         <source>Warning: Private keys detected in wallet {%s} with disabled private keys</source>
         <translation type="unfinished">Avviso: chiavi private rilevate nel portafoglio { %s} con chiavi private disabilitate</translation>
     </message>
-    <message>
-        <source>Warning: We do not appear to fully agree with our peers! You may need to upgrade, or other nodes may need to upgrade.</source>
-        <translation type="unfinished">Attenzione: Sembra che non vi sia pieno consenso con i nostri peer! Un aggiornamento da parte tua o degli altri nodi potrebbe essere necessario.</translation>
-    </message>
     <message>
         <source>Witness data for blocks after height %d requires validation. Please restart with -reindex.</source>
         <translation type="unfinished">I dati di testimonianza per blocchi più alti di %d richiedono verifica. Si prega di riavviare con -reindex.</translation>
@@ -4346,10 +4346,6 @@ Non in grado di ripristinare il backup del portafoglio.</translation>
         <source>Elliptic curve cryptography sanity check failure. %s is shutting down.</source>
         <translation type="unfinished">Errore nel controllo di integrità della crittografia a curva ellittica. %s in spegnimento. </translation>
     </message>
-    <message>
-        <source>Error creating %s</source>
-        <translation type="unfinished">Errore di creazione %s</translation>
-    </message>
     <message>
         <source>Error initializing block database</source>
         <translation type="unfinished">Errore durante l'inizializzazione del database dei blocchi</translation>
@@ -4358,10 +4354,6 @@ Non in grado di ripristinare il backup del portafoglio.</translation>
         <source>Error loading %s</source>
         <translation type="unfinished">Errore caricamento %s</translation>
     </message>
-    <message>
-        <source>Error loading %s: Private keys can only be disabled during creation</source>
-        <translation type="unfinished">Errore durante il caricamento di %s: le chiavi private possono essere disabilitate solo durante la creazione</translation>
-    </message>
     <message>
         <source>Error loading %s: Wallet corrupted</source>
         <translation type="unfinished">Errore caricamento %s: portafoglio corrotto</translation>
@@ -4490,10 +4482,6 @@ Non in grado di ripristinare il backup del portafoglio.</translation>
         <source>Error: database transaction cannot be executed for wallet %s</source>
         <translation type="unfinished">Errore: la transazione database non può essere eseguita per il portafoglio %s</translation>
     </message>
-    <message>
-        <source>Failed to connect best block (%s).</source>
-        <translation type="unfinished">Non è stato possibile connettersi al blocco migliore (%s).</translation>
-    </message>
     <message>
         <source>Failed to disconnect block.</source>
         <translation type="unfinished">Non è stato possibile scollegare il blocco.</translation>
@@ -4518,14 +4506,6 @@ Non in grado di ripristinare il backup del portafoglio.</translation>
         <source>Failed to write block.</source>
         <translation type="unfinished">Errore nella scrittura del blocco.</translation>
     </message>
-    <message>
-        <source>Failed to write to block index database.</source>
-        <translation type="unfinished">Non è stato possibile scrivere sul database degli indici di blocco.</translation>
-    </message>
-    <message>
-        <source>Failed to write to coin database.</source>
-        <translation type="unfinished">Impossibile scrivere sul database delle monete.</translation>
-    </message>
     <message>
         <source>Failed to write undo data.</source>
         <translation type="unfinished"> 
@@ -4579,10 +4559,6 @@ Errore nella scrittura dei dati di ripristino.</translation>
         <source>Invalid P2P permission: '%s'</source>
         <translation type="unfinished">Permesso P2P non valido: '%s'</translation>
     </message>
-    <message>
-        <source>Invalid amount for %s=&lt;amount&gt;: '%s' (must be at least %s)</source>
-        <translation type="unfinished">Importo non valido per %s=&lt;amount&gt;: '%s' (deve essere almeno %s)</translation>
-    </message>
     <message>
         <source>Invalid amount for %s=&lt;amount&gt;: '%s'</source>
         <translation type="unfinished">Importo non valido per %s=&lt;amount&gt;: '%s'</translation>
@@ -4780,10 +4756,6 @@ Errore di sistema in fase di salvataggio del blocco nel disco: %s</translation>
         <source>This is the minimum transaction fee you pay on every transaction.</source>
         <translation type="unfinished">Questo è il costo di transazione minimo che pagherai su ogni transazione.</translation>
     </message>
-    <message>
-        <source>This is the transaction fee you will pay if you send a transaction.</source>
-        <translation type="unfinished">Questo è il costo di transazione che pagherai se invii una transazione.</translation>
-    </message>
     <message>
         <source>Transaction %s does not belong to this wallet</source>
         <translation type="unfinished">La transazione %s non appartiene a questo portafoglio</translation>
diff --git a/src/qt/locale/bitcoin_ja.ts b/src/qt/locale/bitcoin_ja.ts
index 01a99f5f79ed..8855eb24baec 100644
--- a/src/qt/locale/bitcoin_ja.ts
+++ b/src/qt/locale/bitcoin_ja.ts
@@ -369,6 +369,11 @@ Signing is only possible with addresses of the type 'legacy'.</source>
         <extracomment>Short-lived peer connection type that solicits known addresses from a peer.</extracomment>
         <translation type="unfinished">アドレスのフェッチ</translation>
     </message>
+    <message>
+        <source>Private Broadcast</source>
+        <extracomment>Short-lived peer connection type that is used for broadcasting privacy-sensitive data.</extracomment>
+        <translation type="unfinished">プライベートブロードキャスト</translation>
+    </message>
     <message>
         <source>%1 d</source>
         <translation type="unfinished">%1 日</translation>
@@ -619,7 +624,7 @@ Signing is only possible with addresses of the type 'legacy'.</source>
     </message>
     <message>
         <source>Connecting to peers…</source>
-        <translation type="unfinished">ピアに接続中...</translation>
+        <translation type="unfinished">ピアに接続中…</translation>
     </message>
     <message>
         <source>Request payments (generates QR codes and bitcoin: URIs)</source>
@@ -770,13 +775,30 @@ Signing is only possible with addresses of the type 'legacy'.</source>
     <message>
         <source>Restore Wallet</source>
         <extracomment>Title of pop-up window shown when the user is attempting to restore a wallet.</extracomment>
-        <translation type="unfinished">ウォレットを復元</translation>
+        <translation type="unfinished">ウォレットを復</translation>
     </message>
     <message>
         <source>Wallet Name</source>
         <extracomment>Label of the input field where the name of the wallet is entered.</extracomment>
         <translation type="unfinished">ウォレット名</translation>
     </message>
+    <message>
+        <source>Invalid Wallet Name</source>
+        <translation type="unfinished">無効なウォレット名</translation>
+    </message>
+    <message>
+        <source>Wallet name cannot be empty</source>
+        <translation type="unfinished">ウォレット名は空にはできません</translation>
+    </message>
+    <message>
+        <source>Restore and Migrate Wallet Backup</source>
+        <translation type="unfinished">ウォレットバックアップの復元と移行</translation>
+    </message>
+    <message>
+        <source>Restore and Migrate Wallet</source>
+        <extracomment>Title of pop-up window shown when the user is attempting to restore a wallet.</extracomment>
+        <translation type="unfinished">ウォレットの復元と移行</translation>
+    </message>
     <message>
         <source>&amp;Window</source>
         <translation type="unfinished">ウィンドウ (&amp;W)</translation>
@@ -1000,7 +1022,7 @@ Signing is only possible with addresses of the type 'legacy'.</source>
     </message>
     <message>
         <source>Copy transaction &amp;ID and output index</source>
-        <translation type="unfinished">取引IDとアウトプットのインデックスをコピー</translation>
+        <translation type="unfinished">取引IDとアウトプットのインデックスをコピー(&amp;I)</translation>
     </message>
     <message>
         <source>L&amp;ock unspent</source>
@@ -1135,6 +1157,40 @@ The migration process will create a backup of the wallet before migrating. This
         <source>Solvable but not watched scripts have been migrated to a new wallet named '%1'.</source>
         <translation type="unfinished">解決可能だが監視されないスクリプトは '%1' という名前の新しいウォレットに移行されました。</translation>
     </message>
+    <message>
+        <source>Restore and Migrate wallet</source>
+        <translation type="unfinished">ウォレットの復元と移行</translation>
+    </message>
+    <message>
+        <source>Are you sure you wish to restore the wallet file &lt;i&gt;%1&lt;/i&gt; to &lt;i&gt;%2&lt;/i&gt; and migrate it?</source>
+        <translation type="unfinished">ウォレットファイル&lt;i&gt;%1&lt;/i&gt;を復元し&lt;i&gt;%2&lt;/i&gt;に移行してもよろしいですか？</translation>
+    </message>
+    <message>
+        <source>Restoring the wallet will copy the backup file to the wallets directory and place it in the standard wallet directory layout. The original file will not be modified.
+
+Migrating the wallet will convert the restored wallet to one or more descriptor wallets. A new wallet backup will need to be made.
+If this wallet contains any watchonly scripts, a new wallet will be created which contains those watchonly scripts.
+If this wallet contains any solvable but not watched scripts, a different and new wallet will be created which contains those scripts.
+
+The migration process will create a backup of the wallet before migrating. This backup file will be named &lt;wallet name&gt;-&lt;timestamp&gt;.legacy.bak and can be found in the directory for this wallet. In the event of an incorrect migration, the backup can be restored with the "Restore Wallet" functionality.</source>
+        <translation type="unfinished">ウォレットの復元では、バックアップファイルをウォレットディレクトリにコピーし、標準のウォレットディレクトリレイアウトに配置します。元のファイルは変更されません。
+
+ウォレットの移行では、復元されたウォレットを１つ以上のディスクリプターウォレットに変換します。新しいウォレットバックアップを作成する必要があります。
+このウォレットに監視専用スクリプトが含まれている場合、それらの監視専用スクリプトを含む新しいウォレットが作成されます。
+このウォレットに解決可能だが非監視スクリプトが含まれている場合、それらのスクリプトを含む別の新しいウォレットが作成されます。
+
+移行プロセスでは、移行前にウォレットのバックアップが作成されます。このバックアップファイルの名前は&lt;wallet name&gt;-&lt;timestamp&gt;.legacy.bakで、このウォレット用のディレクトリ内に保存されます。間違った移行が行われた場合、「ウォレットの復元」機能をしよいうしてバックアップを復元できます。</translation>
+    </message>
+    <message>
+        <source>Restore Wallet</source>
+        <extracomment>Title of progress window which is displayed when wallets are being restored.</extracomment>
+        <translation type="unfinished">ウォレットを復元</translation>
+    </message>
+    <message>
+        <source>Restoring Wallet &lt;b&gt;%1&lt;/b&gt;…</source>
+        <extracomment>Descriptive text of the restore wallets progress window which indicates to the user that wallets are currently being restored.</extracomment>
+        <translation type="unfinished">ウォレット &lt;b&gt;%1&lt;/b&gt; を復元中...</translation>
+    </message>
     <message>
         <source>Migration failed</source>
         <translation type="unfinished">移行に失敗しました</translation>
@@ -1259,8 +1315,8 @@ The migration process will create a backup of the wallet before migrating. This
         <translation type="unfinished">秘密鍵を無効化</translation>
     </message>
     <message>
-        <source>Make a blank wallet. Blank wallets do not initially have private keys or scripts. Private keys and addresses can be imported, or an HD seed can be set, at a later time.</source>
-        <translation type="unfinished">空ウォレットを作成。空ウォレットには、最初は秘密鍵やスクリプトがありません。後から秘密鍵やアドレスをインポート、またはHDシードを設定できます。</translation>
+        <source>Make a blank wallet. Blank wallets do not initially have private keys or scripts. Private keys and addresses can be imported using descriptors at a later time.</source>
+        <translation type="unfinished">空のウォレットを作成します。空のウォレットには、最初は秘密鍵やスクリプトが含まれていません。秘密鍵とアドレスは、後からディスクリプターを使用してインポートできます。</translation>
     </message>
     <message>
         <source>Make Blank Wallet</source>
@@ -1944,7 +2000,7 @@ The migration process will create a backup of the wallet before migrating. This
     </message>
     <message>
         <source>Privacy mode activated for the Overview tab. To unmask the values, uncheck Settings-&gt;Mask values.</source>
-        <translation type="unfinished">概要タブでプライバシーモードが有効になっています。値のマスクを解除するには、設定-&gt;マスクの値のチェックを外してください。</translation>
+        <translation type="unfinished">概要タブでプライバシーモードが有効になっています。値のマスクを解除するには、設定 -&gt; 値を隠す のチェックを外してください。</translation>
     </message>
 </context>
 <context>
@@ -1955,11 +2011,11 @@ The migration process will create a backup of the wallet before migrating. This
     </message>
     <message>
         <source>Sign Tx</source>
-        <translation type="unfinished">署名されたトランザクション</translation>
+        <translation type="unfinished">取引に署名</translation>
     </message>
     <message>
         <source>Broadcast Tx</source>
-        <translation type="unfinished">Txをブロードキャスト</translation>
+        <translation type="unfinished">取引をブロードキャスト</translation>
     </message>
     <message>
         <source>Copy to Clipboard</source>
@@ -1975,11 +2031,11 @@ The migration process will create a backup of the wallet before migrating. This
     </message>
     <message>
         <source>Failed to load transaction: %1</source>
-        <translation type="unfinished">%1 : トランザクションの読込失敗</translation>
+        <translation type="unfinished">取引の読込に失敗: %1</translation>
     </message>
     <message>
         <source>Failed to sign transaction: %1</source>
-        <translation type="unfinished">%1 : トランザクション署名失敗</translation>
+        <translation type="unfinished">取引の署名に失敗: %1</translation>
     </message>
     <message>
         <source>Cannot sign inputs while wallet is locked.</source>
@@ -1989,25 +2045,27 @@ The migration process will create a backup of the wallet before migrating. This
         <source>Could not sign any more inputs.</source>
         <translation type="unfinished">これ以上インプットに署名できませんでした。</translation>
     </message>
-    <message>
-        <source>Signed %1 inputs, but more signatures are still required.</source>
-        <translation type="unfinished">%1個のインプットに署名しましたが、さらに多くの署名が必要です。</translation>
+    <message numerus="yes">
+        <source>Signed %n input(s), but more signatures are still required.</source>
+        <translation type="unfinished">
+            <numerusform />
+        </translation>
     </message>
     <message>
         <source>Signed transaction successfully. Transaction is ready to broadcast.</source>
-        <translation type="unfinished">トランザクションへの署名が成功しました。トランザクションのブロードキャストの準備ができています。</translation>
+        <translation type="unfinished">取引への署名に成功しました。取引はブロードキャストの準備ができています。</translation>
     </message>
     <message>
         <source>Unknown error processing transaction.</source>
-        <translation type="unfinished">トランザクション処理中の不明なエラー。</translation>
+        <translation type="unfinished">取引処理中の不明なエラー。</translation>
     </message>
     <message>
         <source>Transaction broadcast successfully! Transaction ID: %1</source>
-        <translation type="unfinished">トランザクションのブロードキャストに成功しました！トランザクションID: %1</translation>
+        <translation type="unfinished">取引のブロードキャストに成功！ 取引 ID: %1</translation>
     </message>
     <message>
         <source>Transaction broadcast failed: %1</source>
-        <translation type="unfinished">トランザクションのブロードキャストが失敗しました: %1</translation>
+        <translation type="unfinished">取引のブロードキャストに失敗しました: %1</translation>
     </message>
     <message>
         <source>PSBT copied to clipboard.</source>
@@ -2015,12 +2073,12 @@ The migration process will create a backup of the wallet before migrating. This
     </message>
     <message>
         <source>Save Transaction Data</source>
-        <translation type="unfinished">トランザクションデータの保存</translation>
+        <translation type="unfinished">取引データの保存</translation>
     </message>
     <message>
         <source>Partially Signed Transaction (Binary)</source>
         <extracomment>Expanded name of the binary PSBT file format. See: BIP 174.</extracomment>
-        <translation type="unfinished">部分的に署名されたトランザクション（バイナリ）</translation>
+        <translation type="unfinished">部分的に署名された取引（バイナリ）</translation>
     </message>
     <message>
         <source>PSBT saved to disk.</source>
@@ -2050,9 +2108,11 @@ The migration process will create a backup of the wallet before migrating. This
         <source>or</source>
         <translation type="unfinished">または</translation>
     </message>
-    <message>
-        <source>Transaction has %1 unsigned inputs.</source>
-        <translation type="unfinished">取引には %1 個の未署名インプットがあります。</translation>
+    <message numerus="yes">
+        <source>Transaction has %n unsigned input(s).</source>
+        <translation type="unfinished">
+            <numerusform />
+        </translation>
     </message>
     <message>
         <source>Transaction is missing some information about inputs.</source>
@@ -2338,10 +2398,6 @@ BIP70には広範なセキュリティー上の問題があるので、ウォレ
         <source>Transaction Relay</source>
         <translation type="unfinished">取引のリレー</translation>
     </message>
-    <message>
-        <source>Starting Block</source>
-        <translation type="unfinished">開始ブロック</translation>
-    </message>
     <message>
         <source>Synced Headers</source>
         <translation type="unfinished">同期済みヘッダ</translation>
@@ -2559,6 +2615,11 @@ BIP70には広範なセキュリティー上の問題があるので、ウォレ
         <extracomment>Explanatory text for a short-lived outbound peer connection that is used to request addresses from a peer.</extracomment>
         <translation type="unfinished">アドレス収集用アウトバウンド: 短時間接続、アドレス収集用</translation>
     </message>
+    <message>
+        <source>Private broadcast: short-lived, for broadcasting privacy-sensitive transactions</source>
+        <extracomment>Explanatory text for a short-lived outbound peer connection that is used to broadcast privacy-sensitive data (like our transactions).</extracomment>
+        <translation type="unfinished">プライベートブロードキャスト: プライバシーに配慮した取引をブロードキャストするためもので、短命</translation>
+    </message>
     <message>
         <source>detecting: peer could be v1 or v2</source>
         <extracomment>Explanatory text for "detecting" transport type.</extracomment>
@@ -3128,12 +3189,12 @@ Note:  Since the fee is calculated on a per-byte basis, a fee rate of "100 satos
     </message>
     <message>
         <source>Save Transaction Data</source>
-        <translation type="unfinished">取引データの保存</translation>
+        <translation type="unfinished">トランザクションデータの保存</translation>
     </message>
     <message>
         <source>Partially Signed Transaction (Binary)</source>
         <extracomment>Expanded name of the binary PSBT file format. See: BIP 174.</extracomment>
-        <translation type="unfinished">部分的に署名された取引（バイナリ）</translation>
+        <translation type="unfinished">部分的に署名されたトランザクション（バイナリ）</translation>
     </message>
     <message>
         <source>PSBT saved</source>
@@ -3224,10 +3285,6 @@ Note:  Since the fee is calculated on a per-byte basis, a fee rate of "100 satos
         <source>The amount exceeds your balance.</source>
         <translation type="unfinished">金額が残高を超えています。</translation>
     </message>
-    <message>
-        <source>The total exceeds your balance when the %1 transaction fee is included.</source>
-        <translation type="unfinished">取引手数料 %1 を含めた総額が残高を超えています。</translation>
-    </message>
     <message>
         <source>Duplicate address found: addresses should only be used once each.</source>
         <translation type="unfinished">重複したアドレスが見つかりました: アドレスはそれぞれ一度のみ使用することができます。</translation>
@@ -4193,10 +4250,6 @@ Go to File &gt; Open Wallet to load a wallet.
         <source>Warning: Private keys detected in wallet {%s} with disabled private keys</source>
         <translation type="unfinished">警告: 秘密鍵が無効なウォレット {%s} で秘密鍵を検出しました</translation>
     </message>
-    <message>
-        <source>Warning: We do not appear to fully agree with our peers! You may need to upgrade, or other nodes may need to upgrade.</source>
-        <translation type="unfinished">警告: ピアと完全に合意が取れていないようです！ このノードもしくは他のノードのアップグレードが必要な可能性があります。</translation>
-    </message>
     <message>
         <source>Witness data for blocks after height %d requires validation. Please restart with -reindex.</source>
         <translation type="unfinished">高さ%d以降のブロックのwitnessデータは検証が必要です。-reindexを付けて再起動してください。</translation>
@@ -4299,14 +4352,6 @@ Go to File &gt; Open Wallet to load a wallet.
         <source>Option '-checkpoints' is set but checkpoints were removed. This option has no effect.</source>
         <translation type="unfinished">オプション「-checkpoints」が設定されていますが、チェックポイントは削除されています。このオプションは効果がありません。</translation>
     </message>
-    <message>
-        <source>Option '-maxorphantx' is set but no longer has any effect (see release notes). Please remove it from your configuration.</source>
-        <translation type="unfinished">オプション「-maxorphantx」が設定されていますが、効果はありません（リリースノートを参照）。設定から削除してください。</translation>
-    </message>
-    <message>
-        <source>Options '-datacarrier' or '-datacarriersize' are set but are marked as deprecated. They will be removed in a future version.</source>
-        <translation type="unfinished">オプション「-datacarrier」または「-datacarriersize」が設定されていますが、非推奨とマークされています。これらは将来のバージョンで削除される予定です。</translation>
-    </message>
     <message>
         <source>Outbound connections restricted to CJDNS (-onlynet=cjdns) but -cjdnsreachable is not provided</source>
         <translation type="unfinished">アウトバウンド接続がCJDNS (-onlynet=cjdns)に制限されていますが、-cjdnsreachableが設定されていません。</translation>
@@ -4397,10 +4442,6 @@ Unable to restore backup of wallet.</source>
         <source>whitebind may only be used for incoming connections ("out" was passed)</source>
         <translation type="unfinished">whitebindは受信接続のみに使用できます（"out"が渡されました）</translation>
     </message>
-    <message>
-        <source>-paytxfee is deprecated and will be fully removed in v31.0.</source>
-        <translation type="unfinished">-paytxfee は非推奨となり、v31.0 で完全に削除されます。</translation>
-    </message>
     <message>
         <source>A fatal internal error occurred, see debug.log for details: </source>
         <translation type="unfinished">致命的な内部エラーが発生しました。詳細はデバッグ用のログファイル debug.log を参照してください:</translation>
@@ -4414,8 +4455,12 @@ Unable to restore backup of wallet.</source>
         <translation type="unfinished">ブロック検証が中断されました</translation>
     </message>
     <message>
-        <source>Cannot add WalletDescriptor to a non-descriptor wallet</source>
-        <translation type="unfinished">WalletDescriptor を非ディスクリプターウォレットに追加することはできません</translation>
+        <source>Can't spend unconfirmed version %d pre-selected input with a version 3 tx</source>
+        <translation type="unfinished">バージョン3のtxで、未確認バージョン1%dの事前選択されたインプットを使うことはできません</translation>
+    </message>
+    <message>
+        <source>Can't spend unconfirmed version 3 pre-selected input with a version %d tx</source>
+        <translation type="unfinished">バージョン1%dのtxで、未確認バージョン3の事前選択されたインプットを使うことはできません</translation>
     </message>
     <message>
         <source>Cannot write to directory '%s'; check permissions.</source>
@@ -4465,10 +4510,6 @@ Unable to restore backup of wallet.</source>
         <source>Elliptic curve cryptography sanity check failure. %s is shutting down.</source>
         <translation type="unfinished">楕円曲線暗号の健全性チェックに失敗しました。%sを終了します。</translation>
     </message>
-    <message>
-        <source>Error creating %s</source>
-        <translation type="unfinished">%sの作成エラー</translation>
-    </message>
     <message>
         <source>Error initializing block database</source>
         <translation type="unfinished">ブロックデータベースの初期化時にエラーが発生しました</translation>
@@ -4477,10 +4518,6 @@ Unable to restore backup of wallet.</source>
         <source>Error loading %s</source>
         <translation type="unfinished">%s の読み込みエラー</translation>
     </message>
-    <message>
-        <source>Error loading %s: Private keys can only be disabled during creation</source>
-        <translation type="unfinished">%s の読み込みエラー: 秘密鍵の無効化はウォレットの生成時のみ可能です</translation>
-    </message>
     <message>
         <source>Error loading %s: Wallet corrupted</source>
         <translation type="unfinished">%s の読み込みエラー: ウォレットが壊れています</translation>
@@ -4629,10 +4666,6 @@ Unable to restore backup of wallet.</source>
         <source>Failed to close file when writing block.</source>
         <translation type="unfinished">ブロックの書き込み時にファイルを閉じることができませんでした。</translation>
     </message>
-    <message>
-        <source>Failed to connect best block (%s).</source>
-        <translation type="unfinished">ベストブロック（%s）への接続に失敗しました。</translation>
-    </message>
     <message>
         <source>Failed to disconnect block.</source>
         <translation type="unfinished">ブロックの切断に失敗しました。</translation>
@@ -4657,14 +4690,6 @@ Unable to restore backup of wallet.</source>
         <source>Failed to write block.</source>
         <translation type="unfinished">ブロックの書き込みに失敗しました。</translation>
     </message>
-    <message>
-        <source>Failed to write to block index database.</source>
-        <translation type="unfinished">ブロックインデックスデータベースの書き込みに失敗しました。</translation>
-    </message>
-    <message>
-        <source>Failed to write to coin database.</source>
-        <translation type="unfinished">コインデータベースへの書き込みに失敗しました。</translation>
-    </message>
     <message>
         <source>Failed to write undo data.</source>
         <translation type="unfinished">元へ戻すデータの書き込みに失敗しました。</translation>
@@ -4717,14 +4742,26 @@ Unable to restore backup of wallet.</source>
         <source>Invalid P2P permission: '%s'</source>
         <translation type="unfinished">無効なP2Pアクセス権: '%s'</translation>
     </message>
-    <message>
-        <source>Invalid amount for %s=&lt;amount&gt;: '%s' (must be at least %s)</source>
-        <translation type="unfinished">%s=&lt;amount&gt; オプションに対する不正な設定: '%s'（最低でも %s が必要です）</translation>
-    </message>
     <message>
         <source>Invalid amount for %s=&lt;amount&gt;: '%s'</source>
         <translation type="unfinished">%s=&lt;amount&gt; オプションに対する不正な設定: '%s'</translation>
     </message>
+    <message>
+        <source>A %zu MiB dbcache may be too large for a system memory of only %zu MiB.</source>
+        <translation type="unfinished">%zuMiBのdbcacheは、%zuMiBのシステムメモリには大きすぎる可能性があります。</translation>
+    </message>
+    <message>
+        <source>Creating wallet…</source>
+        <translation type="unfinished">ウォレットを作成中...</translation>
+    </message>
+    <message>
+        <source>Duplicate binding configuration for address %s. Please check your -bind, -bind=...=onion and -whitebind settings.</source>
+        <translation type="unfinished">アドレス%sのバインド設定が重複しています。-bindおよび-bind=...=onion、-whitebindの設定を確認してください。</translation>
+    </message>
+    <message>
+        <source>Error creating %s: Could not write version metadata.</source>
+        <translation type="unfinished">%s作成エラー: バージョンメタデータを書き込めませんでした。</translation>
+    </message>
     <message>
         <source>Invalid amount for -%s=&lt;amount&gt;: '%s'</source>
         <translation type="unfinished">-%s=&lt;amount&gt; オプションに対する不正な設定: '%s'</translation>
@@ -4789,6 +4826,26 @@ Unable to restore backup of wallet.</source>
         <source>Only direction was set, no permissions: '%s'</source>
         <translation type="unfinished">方向のみが設定されており、権限がありません: '%s'</translation>
     </message>
+    <message>
+        <source>Option '-limitancestorsize' is given but ancestor size limits have been replaced with cluster size limits (see -limitclustersize). This option has no effect.</source>
+        <translation type="unfinished">「-limitancestorsize」オプションが指定されていますが、祖先サイズの制限はクラスターサイズの制限に置き換えられています（-limitclustersize を参照）。このオプションは効果がありません。</translation>
+    </message>
+    <message>
+        <source>Option '-limitdescendantsize' is given but descendant size limits have been replaced with cluster size limits (see -limitclustersize). This option has no effect.</source>
+        <translation type="unfinished">「-limitdescendantsize」オプションが指定されていますが、子孫サイズの制限はクラスターサイズの制限に置き換えられています（-limitclustersize を参照）。このオプションは効果がありません。</translation>
+    </message>
+    <message>
+        <source>Private broadcast of own transactions requested (-privatebroadcast) and -proxyrandomize is disabled. Tor circuits for private broadcast connections may be correlated to other connections over Tor. For maximum privacy set -proxyrandomize=1.</source>
+        <translation type="unfinished">自身のトランザクションのプライベートブロードキャスト（-privatebroadcast）が要求されており、-proxyrandomize が無効になっています。プライベートブロードキャスト接続用のTor回線が、Tor経由の他の接続と関連付けられる可能性があります。最大限のプライバシーを確保するには、-proxyrandomize=1 を設定してください。</translation>
+    </message>
+    <message>
+        <source>Private broadcast of own transactions requested (-privatebroadcast), but -connect is also configured. They are incompatible because the private broadcast needs to open new connections to randomly chosen Tor or I2P peers. Consider using -maxconnections=0 -addnode=... instead</source>
+        <translation type="unfinished">自身のトランザクションのプライベートブロードキャスト（-privatebroadcast）が要求されていますが、-connect も設定されています。プライベートブロードキャストはランダムに選択されたTorまたはI2Pピアへの新しい接続を開く必要があるため、これらは互換性がありません。代わりに -maxconnections=0 -addnode=... の使用を検討してください。</translation>
+    </message>
+    <message>
+        <source>Private broadcast of own transactions requested (-privatebroadcast), but none of Tor or I2P networks is reachable</source>
+        <translation type="unfinished">自身のトランザクションのプライベートブロードキャスト（-privatebroadcast）が要求されていますが、到達可能なTorネットワークもI2Pネットワークもありません。</translation>
+    </message>
     <message>
         <source>Prune cannot be configured with a negative value.</source>
         <translation type="unfinished">剪定モードの設定値は負の値にはできません。</translation>
@@ -4885,6 +4942,10 @@ Unable to restore backup of wallet.</source>
         <source>System error while saving block to disk: %s</source>
         <translation type="unfinished">ブロックをディスクに保存中にシステムエラー: %s</translation>
     </message>
+    <message>
+        <source>The %s path uses exFAT, which is known to have intermittent corruption problems on macOS. Move this directory to a different filesystem to avoid data loss.</source>
+        <translation type="unfinished">%sパスはexFATを使用しており、macOS上で断続的に破損問題が発生することが知られています。データ損失を避けるため、このディレクトリを別のファイルシステムに移動してください。</translation>
+    </message>
     <message>
         <source>The source code is available from %s.</source>
         <translation type="unfinished">ソースコードは %s から入手できます。</translation>
@@ -4917,10 +4978,6 @@ Unable to restore backup of wallet.</source>
         <source>This is the minimum transaction fee you pay on every transaction.</source>
         <translation type="unfinished">これは、全ての取引に対して最低限支払うべき手数料です。</translation>
     </message>
-    <message>
-        <source>This is the transaction fee you will pay if you send a transaction.</source>
-        <translation type="unfinished">これは、取引を送信する場合に支払う取引手数料です。</translation>
-    </message>
     <message>
         <source>Transaction %s does not belong to this wallet</source>
         <translation type="unfinished">取引%sはこのウォレットのものではありません</translation>
@@ -5009,6 +5066,10 @@ Unable to restore backup of wallet.</source>
         <source>Wallet file creation failed: %s</source>
         <translation type="unfinished">ウォレットファイルの作成に失敗しました：%s</translation>
     </message>
+    <message>
+        <source>Warning: Found invalid chain more than 6 blocks longer than our best chain. This could be due to database corruption or consensus incompatibility with peers.</source>
+        <translation type="unfinished">警告: ベストチェーンより6ブロック以上長い無効なチェーンが見つかりました。これはデータベースの破損、またはピアとのコンセンサスの非互換性が原因である可能性があります。</translation>
+    </message>
     <message>
         <source>acceptstalefeeestimates is not supported on %s chain.</source>
         <translation type="unfinished">%s チェーンでは acceptstalefeeestimates はサポートされていません。</translation>
diff --git a/src/qt/locale/bitcoin_ka.ts b/src/qt/locale/bitcoin_ka.ts
index d51f64093938..a0dceb8317df 100644
--- a/src/qt/locale/bitcoin_ka.ts
+++ b/src/qt/locale/bitcoin_ka.ts
@@ -964,6 +964,14 @@ Signing is only possible with addresses of the type 'legacy'.</source>
         <translation type="unfinished">იტვირთება საფულეები...</translation>
     </message>
 </context>
+<context>
+    <name>MigrateWalletActivity</name>
+    <message>
+        <source>Restore Wallet</source>
+        <extracomment>Title of progress window which is displayed when wallets are being restored.</extracomment>
+        <translation type="unfinished">საფულის აღდგენა</translation>
+    </message>
+    </context>
 <context>
     <name>OpenWalletActivity</name>
     <message>
@@ -1492,9 +1500,12 @@ Signing is only possible with addresses of the type 'legacy'.</source>
         <source>Could not sign any more inputs.</source>
         <translation type="unfinished">მეტი შენატანის ხელმოწერა ვერ მოხერხდა.</translation>
     </message>
-    <message>
-        <source>Signed %1 inputs, but more signatures are still required.</source>
-        <translation type="unfinished">ხელმოწერილია %1 შენატანი, მაგრამ მაინც საჭიროა უფრო მეტი ხელმოწერები.</translation>
+    <message numerus="yes">
+        <source>Signed %n input(s), but more signatures are still required.</source>
+        <translation type="unfinished">
+            <numerusform />
+            <numerusform />
+        </translation>
     </message>
     <message>
         <source>Unknown error processing transaction.</source>
@@ -1541,9 +1552,12 @@ Signing is only possible with addresses of the type 'legacy'.</source>
         <source>or</source>
         <translation type="unfinished">ან</translation>
     </message>
-    <message>
-        <source>Transaction has %1 unsigned inputs.</source>
-        <translation type="unfinished">ტრანზაქციას აქვს %1 ხელმოუწერელი შენატანი.</translation>
+    <message numerus="yes">
+        <source>Transaction has %n unsigned input(s).</source>
+        <translation type="unfinished">
+            <numerusform />
+            <numerusform />
+        </translation>
     </message>
     <message>
         <source>Transaction is missing some information about inputs.</source>
@@ -2212,10 +2226,6 @@ Signing is only possible with addresses of the type 'legacy'.</source>
         <source>The amount exceeds your balance.</source>
         <translation type="unfinished">თანხა აღემატება თქვენს ბალანსს</translation>
     </message>
-    <message>
-        <source>The total exceeds your balance when the %1 transaction fee is included.</source>
-        <translation type="unfinished">საკომისიო %1-ის დამატების შემდეგ თანხა აჭარბებს თქვენს ბალანსს</translation>
-    </message>
     <message>
         <source>Transaction creation failed!</source>
         <translation type="unfinished">შეცდომა ტრანსაქციის შექმნისას!</translation>
@@ -2851,10 +2861,6 @@ Signing is only possible with addresses of the type 'legacy'.</source>
         <source>This is a pre-release test build - use at your own risk - do not use for mining or merchant applications</source>
         <translation type="unfinished">ეს არის წინასწარი სატესტო ვერსია - გამოიყენეთ საკუთარი რისკით - არ გამოიყენოთ მოპოვებისა ან კომერციული მიზნებისათვის</translation>
     </message>
-    <message>
-        <source>Warning: We do not appear to fully agree with our peers! You may need to upgrade, or other nodes may need to upgrade.</source>
-        <translation type="unfinished">ყურადღება: ჩვენ არ ვეთანხმებით ყველა პირს. შესაძლოა თქვენ ან სხვა კვანძებს განახლება გჭირდებათ.</translation>
-    </message>
     <message>
         <source>%s is set very high!</source>
         <translation type="unfinished">%s დაყენებულია ძალიან მაღალზე!</translation>
@@ -2879,10 +2885,6 @@ Signing is only possible with addresses of the type 'legacy'.</source>
         <source>Done loading</source>
         <translation type="unfinished">ჩატვირთვა დასრულებულია</translation>
     </message>
-    <message>
-        <source>Error creating %s</source>
-        <translation type="unfinished">შეცდომა%s-ის შექმნისას</translation>
-    </message>
     <message>
         <source>Error initializing block database</source>
         <translation type="unfinished">ვერ ინიციალიზდება ბლოკების ბაზა</translation>
diff --git a/src/qt/locale/bitcoin_kk.ts b/src/qt/locale/bitcoin_kk.ts
index db56e0667ba7..8f77d87d3753 100644
--- a/src/qt/locale/bitcoin_kk.ts
+++ b/src/qt/locale/bitcoin_kk.ts
@@ -67,7 +67,7 @@
     </message>
     <message>
         <source>&amp;Edit</source>
-        <translation type="unfinished">&amp;Өңдеу</translation>
+        <translation type="unfinished">&amp;Өзгерту</translation>
     </message>
     <message>
         <source>Export Address List</source>
@@ -477,7 +477,7 @@
     </message>
     <message>
         <source>%1 behind</source>
-        <translation type="unfinished">%1 қалмады</translation>
+        <translation type="unfinished">%1 артта</translation>
     </message>
     <message>
         <source>Catching up…</source>
@@ -485,7 +485,7 @@
     </message>
     <message>
         <source>Error</source>
-        <translation type="unfinished">қате</translation>
+        <translation type="unfinished">Қате</translation>
     </message>
     <message>
         <source>Warning</source>
@@ -493,7 +493,7 @@
     </message>
     <message>
         <source>Information</source>
-        <translation type="unfinished">Информация</translation>
+        <translation type="unfinished">Ақпарат</translation>
     </message>
     <message>
         <source>Up to date</source>
@@ -663,6 +663,23 @@
         <translation type="unfinished">Қате</translation>
     </message>
     </context>
+<context>
+    <name>PSBTOperationsDialog</name>
+    <message numerus="yes">
+        <source>Signed %n input(s), but more signatures are still required.</source>
+        <translation type="unfinished">
+            <numerusform />
+            <numerusform />
+        </translation>
+    </message>
+    <message numerus="yes">
+        <source>Transaction has %n unsigned input(s).</source>
+        <translation type="unfinished">
+            <numerusform />
+            <numerusform />
+        </translation>
+    </message>
+    </context>
 <context>
     <name>PeerTableModel</name>
     <message>
diff --git a/src/qt/locale/bitcoin_kk@latin.ts b/src/qt/locale/bitcoin_kk@latin.ts
index 8024e35d922a..37ec0e9cedea 100644
--- a/src/qt/locale/bitcoin_kk@latin.ts
+++ b/src/qt/locale/bitcoin_kk@latin.ts
@@ -246,35 +246,30 @@
         <source>%n second(s)</source>
         <translation type="unfinished">
             <numerusform />
-            <numerusform />
         </translation>
     </message>
     <message numerus="yes">
         <source>%n minute(s)</source>
         <translation type="unfinished">
             <numerusform />
-            <numerusform />
         </translation>
     </message>
     <message numerus="yes">
         <source>%n hour(s)</source>
         <translation type="unfinished">
             <numerusform />
-            <numerusform />
         </translation>
     </message>
     <message numerus="yes">
         <source>%n day(s)</source>
         <translation type="unfinished">
             <numerusform />
-            <numerusform />
         </translation>
     </message>
     <message numerus="yes">
         <source>%n week(s)</source>
         <translation type="unfinished">
             <numerusform />
-            <numerusform />
         </translation>
     </message>
     <message>
@@ -285,7 +280,6 @@
         <source>%n year(s)</source>
         <translation type="unfinished">
             <numerusform />
-            <numerusform />
         </translation>
     </message>
     </context>
@@ -472,12 +466,11 @@
         <source>Processed %n block(s) of transaction history.</source>
         <translation type="unfinished">
             <numerusform />
-            <numerusform />
         </translation>
     </message>
     <message>
         <source>%1 behind</source>
-        <translation type="unfinished">%1 қалмады</translation>
+        <translation type="unfinished">%1 артта</translation>
     </message>
     <message>
         <source>Catching up…</source>
@@ -485,7 +478,7 @@
     </message>
     <message>
         <source>Error</source>
-        <translation type="unfinished">қате</translation>
+        <translation type="unfinished">Қате</translation>
     </message>
     <message>
         <source>Warning</source>
@@ -493,7 +486,7 @@
     </message>
     <message>
         <source>Information</source>
-        <translation type="unfinished">Информация</translation>
+        <translation type="unfinished">Ақпарат</translation>
     </message>
     <message>
         <source>Up to date</source>
@@ -520,7 +513,6 @@
         <extracomment>A substring of the tooltip.</extracomment>
         <translation type="unfinished">
             <numerusform />
-            <numerusform />
         </translation>
     </message>
     <message>
@@ -606,21 +598,18 @@
         <source>%n GB of space available</source>
         <translation type="unfinished">
             <numerusform />
-            <numerusform />
         </translation>
     </message>
     <message numerus="yes">
         <source>(of %n GB needed)</source>
         <translation type="unfinished">
             <numerusform />
-            <numerusform />
         </translation>
     </message>
     <message numerus="yes">
         <source>(%n GB needed for full chain)</source>
         <translation type="unfinished">
             <numerusform />
-            <numerusform />
         </translation>
     </message>
     <message numerus="yes">
@@ -628,7 +617,6 @@
         <extracomment>Explanatory text on the capability of the current prune target.</extracomment>
         <translation type="unfinished">
             <numerusform />
-            <numerusform />
         </translation>
     </message>
     <message>
@@ -663,6 +651,21 @@
         <translation type="unfinished">Қате</translation>
     </message>
     </context>
+<context>
+    <name>PSBTOperationsDialog</name>
+    <message numerus="yes">
+        <source>Signed %n input(s), but more signatures are still required.</source>
+        <translation type="unfinished">
+            <numerusform />
+        </translation>
+    </message>
+    <message numerus="yes">
+        <source>Transaction has %n unsigned input(s).</source>
+        <translation type="unfinished">
+            <numerusform />
+        </translation>
+    </message>
+    </context>
 <context>
     <name>PeerTableModel</name>
     <message>
@@ -752,7 +755,6 @@
         <source>Estimated to begin confirmation within %n block(s).</source>
         <translation type="unfinished">
             <numerusform />
-            <numerusform />
         </translation>
     </message>
     <message>
@@ -788,7 +790,6 @@
         <source>matures in %n more block(s)</source>
         <translation type="unfinished">
             <numerusform />
-            <numerusform />
         </translation>
     </message>
     <message>
diff --git a/src/qt/locale/bitcoin_km.ts b/src/qt/locale/bitcoin_km.ts
index bb756f032c83..b6d7416b5435 100644
--- a/src/qt/locale/bitcoin_km.ts
+++ b/src/qt/locale/bitcoin_km.ts
@@ -153,7 +153,7 @@ Signing is only possible with addresses of the type 'legacy'.</source>
     </message>
     <message>
         <source>Unlock wallet</source>
-        <translation type="unfinished">ដោះសោរកាបូបចល័ត</translation>
+        <translation type="unfinished">ដោះសោកាបូបចល័ត</translation>
     </message>
     <message>
         <source>Change passphrase</source>
@@ -225,7 +225,7 @@ Signing is only possible with addresses of the type 'legacy'.</source>
     </message>
     <message>
         <source>Wallet unlock failed</source>
-        <translation type="unfinished">បរាជ័យដោះសោរកាបូបចល័ត</translation>
+        <translation type="unfinished">បានបរាជ័យដោះសោកាបូបចល័ត</translation>
     </message>
     <message>
         <source>The passphrase entered for the wallet decryption was incorrect.</source>
@@ -310,10 +310,6 @@ Signing is only possible with addresses of the type 'legacy'.</source>
         <source>Amount</source>
         <translation type="unfinished">ចំនួន</translation>
     </message>
-    <message>
-        <source>Enter a Bitcoin address (e.g. %1)</source>
-        <translation type="unfinished">បញ្ចូលអាសយដ្ឋាន Bitcoin (ឧទាហរណ៏ %1)</translation>
-    </message>
     <message>
         <source>Unroutable</source>
         <translation type="unfinished">មិនអាចបើកច្រក</translation>
@@ -431,7 +427,7 @@ Signing is only possible with addresses of the type 'legacy'.</source>
     </message>
     <message>
         <source>&amp;About %1</source>
-        <translation type="unfinished">អំពី(&amp;A) %1</translation>
+        <translation type="unfinished">អំពី %1</translation>
     </message>
     <message>
         <source>Show information about %1</source>
@@ -443,7 +439,7 @@ Signing is only possible with addresses of the type 'legacy'.</source>
     </message>
     <message>
         <source>Show information about Qt</source>
-        <translation type="unfinished">បង្ហាញព័ត៍មានអំពី Qt</translation>
+        <translation type="unfinished">បង្ហាញព័ត៌មានអំពី Qt</translation>
     </message>
     <message>
         <source>Modify configuration options for %1</source>
@@ -455,7 +451,7 @@ Signing is only possible with addresses of the type 'legacy'.</source>
     </message>
     <message>
         <source>&amp;Minimize</source>
-        <translation type="unfinished">បង្រួមអប្បបរមា(&amp;M)</translation>
+        <translation type="unfinished">បង្រួមអប្បបរមា</translation>
     </message>
     <message>
         <source>Wallet:</source>
@@ -484,19 +480,19 @@ Signing is only possible with addresses of the type 'legacy'.</source>
     </message>
     <message>
         <source>&amp;Send</source>
-        <translation type="unfinished">ផ្ញើ(&amp;S)</translation>
+        <translation type="unfinished">ផ្ងើ</translation>
     </message>
     <message>
         <source>&amp;Receive</source>
-        <translation type="unfinished">&amp;ទទួល</translation>
+        <translation type="unfinished">ទទួល</translation>
     </message>
     <message>
         <source>&amp;Options…</source>
-        <translation type="unfinished">&amp;ជម្រើស…</translation>
+        <translation type="unfinished">ជម្រើស…</translation>
     </message>
     <message>
         <source>&amp;Encrypt Wallet…</source>
-        <translation type="unfinished">&amp;អ៊ិនគ្រីបកាបូប...</translation>
+        <translation type="unfinished">អ៊ិនគ្រីបកាបូបចល័ត…</translation>
     </message>
     <message>
         <source>Encrypt the private keys that belong to your wallet</source>
@@ -504,15 +500,15 @@ Signing is only possible with addresses of the type 'legacy'.</source>
     </message>
     <message>
         <source>&amp;Backup Wallet…</source>
-        <translation type="unfinished">&amp;ការបម្រុងទុកកាបូប...</translation>
+        <translation type="unfinished">ការបម្រុងទុកកាបូប...</translation>
     </message>
     <message>
         <source>&amp;Change Passphrase…</source>
-        <translation type="unfinished">&amp;ការផ្លាស់ប្តូរឃ្លាសម្ងាត់</translation>
+        <translation type="unfinished">ការផ្លាស់ប្តូរឃ្លាសម្ងាត់</translation>
     </message>
     <message>
         <source>Sign &amp;message…</source>
-        <translation type="unfinished">ចុះហត្ថលេខា&amp;សារ…</translation>
+        <translation type="unfinished">ចុះហត្ថលេខាសារ…</translation>
     </message>
     <message>
         <source>Sign messages with your Bitcoin addresses to prove you own them</source>
@@ -520,7 +516,7 @@ Signing is only possible with addresses of the type 'legacy'.</source>
     </message>
     <message>
         <source>&amp;Verify message…</source>
-        <translation type="unfinished">&amp;ផ្ទៀងផ្ទាត់សារ...</translation>
+        <translation type="unfinished">ផ្ទៀងផ្ទាត់សារ…</translation>
     </message>
     <message>
         <source>Verify messages to ensure they were signed with specified Bitcoin addresses</source>
@@ -528,7 +524,7 @@ Signing is only possible with addresses of the type 'legacy'.</source>
     </message>
     <message>
         <source>&amp;Load PSBT from file…</source>
-        <translation type="unfinished">&amp;ផ្ទុក PSBT ពីឯកសារ...</translation>
+        <translation type="unfinished">ផ្ទុក PSBT ពីឯកសារ…</translation>
     </message>
     <message>
         <source>Open &amp;URI…</source>
@@ -536,11 +532,11 @@ Signing is only possible with addresses of the type 'legacy'.</source>
     </message>
     <message>
         <source>Close Wallet…</source>
-        <translation type="unfinished">បិទកាបូប…</translation>
+        <translation type="unfinished">បិទកាបូបចល័ត…</translation>
     </message>
     <message>
         <source>Create Wallet…</source>
-        <translation type="unfinished">បង្កើតកាបូប...</translation>
+        <translation type="unfinished">បង្កើតកាបូប…</translation>
     </message>
     <message>
         <source>Close All Wallets…</source>
@@ -556,7 +552,7 @@ Signing is only possible with addresses of the type 'legacy'.</source>
     </message>
     <message>
         <source>&amp;Help</source>
-        <translation type="unfinished">ជំនួយ(&amp;H)</translation>
+        <translation type="unfinished">ជំនួយ</translation>
     </message>
     <message>
         <source>Tabs toolbar</source>
@@ -643,7 +639,7 @@ Signing is only possible with addresses of the type 'legacy'.</source>
     </message>
     <message>
         <source>&amp;Receiving addresses</source>
-        <translation type="unfinished">&amp;អាសយដ្ឋានទទួល</translation>
+        <translation type="unfinished">អាសយដ្ឋានទទួល</translation>
     </message>
     <message>
         <source>Open a bitcoin: URI</source>
@@ -664,7 +660,7 @@ Signing is only possible with addresses of the type 'legacy'.</source>
     <message>
         <source>Restore Wallet…</source>
         <extracomment>Name of the menu item that restores wallet from a backup file.</extracomment>
-        <translation type="unfinished">ស្តារកាបូប…</translation>
+        <translation type="unfinished">ស្តារកាបូបចល័តឡើងវិញ…</translation>
     </message>
     <message>
         <source>Restore a wallet from a backup file</source>
@@ -717,7 +713,7 @@ Signing is only possible with addresses of the type 'legacy'.</source>
     </message>
     <message>
         <source>&amp;Window</source>
-        <translation type="unfinished">វិនដូ(&amp;W)</translation>
+        <translation type="unfinished">&amp;វិនដូ</translation>
     </message>
     <message>
         <source>Main Window</source>
@@ -725,7 +721,7 @@ Signing is only possible with addresses of the type 'legacy'.</source>
     </message>
     <message>
         <source>%1 client</source>
-        <translation type="unfinished">%1 អតិថិជន</translation>
+        <translation type="unfinished">អតិថូបករណ៍ %1</translation>
     </message>
     <message>
         <source>&amp;Hide</source>
@@ -733,7 +729,7 @@ Signing is only possible with addresses of the type 'legacy'.</source>
     </message>
     <message>
         <source>S&amp;how</source>
-        <translation type="unfinished">របៀប(&amp;S)</translation>
+        <translation type="unfinished">បង្ហាញ</translation>
     </message>
     <message numerus="yes">
         <source>%n active connection(s) to Bitcoin network.</source>
@@ -869,6 +865,10 @@ Signing is only possible with addresses of the type 'legacy'.</source>
         <source>Fee:</source>
         <translation type="unfinished">តម្លៃសេវា៖</translation>
     </message>
+    <message>
+        <source>After Fee:</source>
+        <translation type="unfinished">បន្ទាប់ពីតម្លៃសេវា៖</translation>
+    </message>
     <message>
         <source>(un)select all</source>
         <translation type="unfinished">(កុំ)ជ្រើសរើសទាំងអស់</translation>
@@ -887,7 +887,7 @@ Signing is only possible with addresses of the type 'legacy'.</source>
     </message>
     <message>
         <source>Date</source>
-        <translation type="unfinished">ថ្ងៃ</translation>
+        <translation type="unfinished">កាលបរិច្ឆេទ</translation>
     </message>
     <message>
         <source>Confirmations</source>
@@ -899,7 +899,7 @@ Signing is only possible with addresses of the type 'legacy'.</source>
     </message>
     <message>
         <source>&amp;Copy address</source>
-        <translation type="unfinished">&amp;ចម្លងអាសយដ្ឋាន</translation>
+        <translation type="unfinished">ចម្លងអាសយដ្ឋាន(&amp;C)</translation>
     </message>
     <message>
         <source>Copy &amp;label</source>
@@ -907,7 +907,7 @@ Signing is only possible with addresses of the type 'legacy'.</source>
     </message>
     <message>
         <source>Copy &amp;amount</source>
-        <translation type="unfinished">ចម្លង &amp; ចំនួន</translation>
+        <translation type="unfinished">ចម្លង &amp; ចំនួនទឹកប្រាក់</translation>
     </message>
     <message>
         <source>Copy transaction &amp;ID and output index</source>
@@ -921,6 +921,14 @@ Signing is only possible with addresses of the type 'legacy'.</source>
         <source>&amp;Unlock unspent</source>
         <translation type="unfinished">&amp;ដោះសោដោយមិនបានចំណាយ</translation>
     </message>
+    <message>
+        <source>Copy quantity</source>
+        <translation type="unfinished">ចម្លងបរិមាណ</translation>
+    </message>
+    <message>
+        <source>(%1 locked)</source>
+        <translation type="unfinished">(%1បានចាក់សោរ)</translation>
+    </message>
     <message>
         <source>Can vary +/- %1 satoshi(s) per input.</source>
         <translation type="unfinished">អាច +/- %1 satoshi(s)ច្រើនក្នុងការបញ្ជូលមួយ។</translation>
@@ -990,6 +998,16 @@ Signing is only possible with addresses of the type 'legacy'.</source>
         <source>Migrating Wallet &lt;b&gt;%1&lt;/b&gt;…</source>
         <translation type="unfinished">អន្ដោប្រវេសន៍កាបូប&lt;b&gt;%1&lt;/b&gt;…</translation>
     </message>
+    <message>
+        <source>Restore Wallet</source>
+        <extracomment>Title of progress window which is displayed when wallets are being restored.</extracomment>
+        <translation type="unfinished">ស្តារកាបូប</translation>
+    </message>
+    <message>
+        <source>Restoring Wallet &lt;b&gt;%1&lt;/b&gt;…</source>
+        <extracomment>Descriptive text of the restore wallets progress window which indicates to the user that wallets are currently being restored.</extracomment>
+        <translation type="unfinished">កំពុងស្ដារកាបូប&lt;b&gt;%1&lt;/b&gt;…</translation>
+    </message>
     <message>
         <source>Migration failed</source>
         <translation type="unfinished">អន្ដោប្រវេសន៍បរាជ័យ</translation>
@@ -1153,6 +1171,18 @@ Signing is only possible with addresses of the type 'legacy'.</source>
         <source>Edit sending address</source>
         <translation type="unfinished">កែប្រែអាសយដ្ឋានបញ្ចូន</translation>
     </message>
+    <message>
+        <source>The entered address "%1" is not a valid Bitcoin address.</source>
+        <translation type="unfinished">អាសយដ្ឋានដែលបានបញ្ចូល  ៉​%1 ៉​គឺមិនមែនជាអាសយដ្ឋានត្រឹមត្រូវរបស់ប៊ីតខញ។</translation>
+    </message>
+    <message>
+        <source>Address "%1" already exists as a receiving address with label "%2" and so cannot be added as a sending address.</source>
+        <translation type="unfinished">អាសយដ្ឋាន  ៉​%1​ ៉​ មាននៅក្នុងអាសយដ្ឋានសម្រាប់ទទួលដែលមានស្លាកសញ្ញា  ៉​%2​​  ៉ ដូច្នេះមិនអាចបញ្ចូលជាអាសយដ្ឋាសម្រាប់បញ្ចូន។</translation>
+    </message>
+    <message>
+        <source>The entered address "%1" is already in the address book with label "%2".</source>
+        <translation type="unfinished">អាសយដ្ឋានបានបញ្ចូល ​ ៉​%1  ៉ គឺមាននៅក្នុងសៀវភៅអាសយដ្ឋានដែលមានស្លាកសញ្ញា  ៉​​​%2  ៉​។</translation>
+    </message>
     <message>
         <source>Could not unlock wallet.</source>
         <translation type="unfinished">មិនអាចបើកសោរ កាបូបអេឡិចត្រូនិចបាន។</translation>
@@ -1607,16 +1637,19 @@ Signing is only possible with addresses of the type 'legacy'.</source>
         <translation type="unfinished">បិទ</translation>
     </message>
     <message>
-        <source>Failed to load transaction: %1</source>
-        <translation type="unfinished">មិនជោគជ័យក្នុងការបង្ហាញប្រត្តិបត្តិការៈ %1</translation>
+        <source>Cannot sign inputs while wallet is locked.</source>
+        <translation type="unfinished">មិនអាចចុះហត្ថលេខាលើធាតុចូលបានទេ ខណៈពេលដែលកាបូបត្រូវបានចាក់សោ។</translation>
     </message>
     <message>
-        <source>Failed to sign transaction: %1</source>
-        <translation type="unfinished">មិនជោគជ័យក្នុងការចុះហត្ថលេខាលើប្រត្តិបត្តិការៈ %1</translation>
+        <source>Could not sign any more inputs.</source>
+        <translation type="unfinished">មិនអាចចុះហត្ថលេខាលើធាតុចូលទៀតទេ</translation>
     </message>
-    <message>
-        <source>Cannot sign inputs while wallet is locked.</source>
-        <translation type="unfinished">មិនអាចចុះហត្ថលេខាលើធាតុចូលបានទេ ខណៈពេលដែលកាបូបត្រូវបានចាក់សោ។</translation>
+    <message numerus="yes">
+        <source>Signed %n input(s), but more signatures are still required.</source>
+        <translation type="unfinished">
+            <numerusform />
+            <numerusform />
+        </translation>
     </message>
     <message>
         <source>Signed transaction successfully. Transaction is ready to broadcast.</source>
@@ -1626,10 +1659,6 @@ Signing is only possible with addresses of the type 'legacy'.</source>
         <source>Unknown error processing transaction.</source>
         <translation type="unfinished"> ពុំស្គាល់ប្រត្តិបត្តិការកំពុងដំណើរការជួបបញ្ហា។</translation>
     </message>
-    <message>
-        <source>Transaction broadcast failed: %1</source>
-        <translation type="unfinished">ផ្សព្វផ្សាយប្រត្តិបត្តិការមិនជោគជ័យៈ %1</translation>
-    </message>
     <message>
         <source>PSBT copied to clipboard.</source>
         <translation type="unfinished">PSBT ត្រូវបានថតចម្លងទៅកាន់ក្ដារតម្រៀប។</translation>
@@ -1671,9 +1700,12 @@ Signing is only possible with addresses of the type 'legacy'.</source>
         <source>or</source>
         <translation type="unfinished">ឬ</translation>
     </message>
-    <message>
-        <source>Transaction has %1 unsigned inputs.</source>
-        <translation type="unfinished">ប្រត្តិបត្តិការ​មាននៅសល់ %1 នៅពុំទាន់បានហត្ថលេខាធាតុចូល។</translation>
+    <message numerus="yes">
+        <source>Transaction has %n unsigned input(s).</source>
+        <translation type="unfinished">
+            <numerusform />
+            <numerusform />
+        </translation>
     </message>
     <message>
         <source>Transaction is missing some information about inputs.</source>
@@ -1875,10 +1907,6 @@ If you are receiving this error you should request the merchant provide a BIP21
         <source>Transaction Relay</source>
         <translation type="unfinished">ការបញ្ជូនតប្រតិបត្តិការ</translation>
     </message>
-    <message>
-        <source>Starting Block</source>
-        <translation type="unfinished">កំពុងចាប់ផ្តើមប៊្លុក</translation>
-    </message>
     <message>
         <source>Last Transaction</source>
         <translation type="unfinished">ប្រតិបត្តិការចុងក្រោយ</translation>
@@ -2110,7 +2138,7 @@ If you are receiving this error you should request the merchant provide a BIP21
     </message>
     <message>
         <source>Copy &amp;amount</source>
-        <translation type="unfinished">ចម្លង &amp; ចំនួនទឹកប្រាក់</translation>
+        <translation type="unfinished">ចម្លង &amp; ចំនួន</translation>
     </message>
     <message>
         <source>Base58 (Legacy)</source>
@@ -2149,7 +2177,7 @@ If you are receiving this error you should request the merchant provide a BIP21
     </message>
     <message>
         <source>Wallet:</source>
-        <translation type="unfinished">កាបូបចល័ត៖</translation>
+        <translation type="unfinished">កាបូប៖</translation>
     </message>
     <message>
         <source>Copy &amp;URI</source>
@@ -2184,7 +2212,7 @@ If you are receiving this error you should request the merchant provide a BIP21
     <name>RecentRequestsTableModel</name>
     <message>
         <source>Date</source>
-        <translation type="unfinished">កាលបរិច្ឆេទ</translation>
+        <translation type="unfinished">ថ្ងៃ</translation>
     </message>
     <message>
         <source>Label</source>
@@ -2321,14 +2349,6 @@ Note:  Since the fee is calculated on a per-byte basis, a fee rate of "100 satos
         <source>Copy quantity</source>
         <translation type="unfinished">ចម្លងបរិមាណ</translation>
     </message>
-    <message>
-        <source>Copy amount</source>
-        <translation type="unfinished">ចម្លងចំនួនទឹកប្រាក់</translation>
-    </message>
-    <message>
-        <source>Copy fee</source>
-        <translation type="unfinished">ចម្លងតម្លៃ</translation>
-    </message>
     <message>
         <source>Sign on device</source>
         <extracomment>"device" usually means a hardware wallet.</extracomment>
@@ -2441,10 +2461,6 @@ Note:  Since the fee is calculated on a per-byte basis, a fee rate of "100 satos
         <source>The amount exceeds your balance.</source>
         <translation type="unfinished">ចំនួនលើសសមតុល្យរបស់អ្នក។</translation>
     </message>
-    <message>
-        <source>The total exceeds your balance when the %1 transaction fee is included.</source>
-        <translation type="unfinished">ចំនួនសរុបលើសសមតុល្យរបស់អ្នកនៅពេលដែលកម្រៃប្រត្តិបត្តិការ%1ត្រូវបានបូកបញ្ចូល។</translation>
-    </message>
     <message>
         <source>Duplicate address found: addresses should only be used once each.</source>
         <translation type="unfinished">អាសយដ្ឋានស្ទួនត្រូវបានរកឃើញៈ គ្រប់អាសយដ្ឋានគួរត្រូវបានប្រើតែម្តង</translation>
@@ -2913,7 +2929,7 @@ Note:  Since the fee is calculated on a per-byte basis, a fee rate of "100 satos
     </message>
     <message>
         <source>Confirmed</source>
-        <translation type="unfinished">បានបញ្ចាក់រួចរាល់</translation>
+        <translation type="unfinished">បានបញ្ជាក់</translation>
     </message>
     <message>
         <source>Date</source>
@@ -3141,10 +3157,6 @@ Go to File &gt; Open Wallet to load a wallet.
         <source>This is the minimum transaction fee you pay on every transaction.</source>
         <translation type="unfinished">នេះជាកម្រៃប្រត្តិបត្តិការតិចបំផុត អ្នកបង់រាល់ពេលធ្វើប្រត្តិបត្តិការម្តងៗ។</translation>
     </message>
-    <message>
-        <source>This is the transaction fee you will pay if you send a transaction.</source>
-        <translation type="unfinished">នេះជាកម្រៃប្រត្តិបត្តិការ អ្នកនឹងបង់ប្រសិនបើអ្នកធ្វើប្រត្តិបត្តិការម្តង។</translation>
-    </message>
     <message>
         <source>Transaction amount too small</source>
         <translation type="unfinished">ចំនួនប្រត្តិបត្តិការមានទឹកប្រាក់ទំហំតូច</translation>
diff --git a/src/qt/locale/bitcoin_kn.ts b/src/qt/locale/bitcoin_kn.ts
index ee2f5da44479..80f8ae5f9806 100644
--- a/src/qt/locale/bitcoin_kn.ts
+++ b/src/qt/locale/bitcoin_kn.ts
@@ -29,6 +29,10 @@
         <source>Enter address or label to search</source>
         <translation type="unfinished">ಹುಡುಕಲು ವಿಳಾಸ ಅಥವಾ ಲೇಬಲ್ ನಮೂದಿಸಿ.</translation>
     </message>
+    <message>
+        <source>Copy the currently selected address to the clipboard</source>
+        <translation type="unfinished">ಪ್ರಸ್ತುತ ಆಯ್ಕೆ ಮಾಡಲಾದ ವಿಳಾಸವನ್ನು ಕ್ಲಿಪ್‌ಬೋರ್ಡ್‌ಗೆ ನಕಲಿಸಿ</translation>
+    </message>
     <message>
         <source>Export the data in the current tab to a file</source>
         <translation type="unfinished">ಪ್ರಸ್ತುತ ಟ್ಯಾಬ್‌ನಲ್ಲಿರುವ ಡೇಟಾವನ್ನು ಫೈಲ್‌ಗೆ ರಫ್ತು ಮಾಡಿ</translation>
@@ -583,6 +587,23 @@ Signing is only possible with addresses of the type 'legacy'.</source>
         </translation>
     </message>
     </context>
+<context>
+    <name>PSBTOperationsDialog</name>
+    <message numerus="yes">
+        <source>Signed %n input(s), but more signatures are still required.</source>
+        <translation type="unfinished">
+            <numerusform />
+            <numerusform />
+        </translation>
+    </message>
+    <message numerus="yes">
+        <source>Transaction has %n unsigned input(s).</source>
+        <translation type="unfinished">
+            <numerusform />
+            <numerusform />
+        </translation>
+    </message>
+    </context>
 <context>
     <name>PeerTableModel</name>
     <message>
@@ -623,6 +644,13 @@ Signing is only possible with addresses of the type 'legacy'.</source>
         <translation type="unfinished">(ಲೇಬಲ್ ಇಲ್ಲ)</translation>
     </message>
 </context>
+<context>
+    <name>SignVerifyMessageDialog</name>
+    <message>
+        <source>Copy the current signature to the clipboard</source>
+        <translation type="unfinished">ಪ್ರಸ್ತುತ ಸಹಿಯನ್ನು ಕ್ಲಿಪ್‌ಬೋರ್ಡ್‌ಗೆ ನಕಲಿಸಿ</translation>
+    </message>
+    </context>
 <context>
     <name>TransactionDesc</name>
     <message numerus="yes">
@@ -710,6 +738,10 @@ Signing is only possible with addresses of the type 'legacy'.</source>
  
  </translation>
     </message>
+    <message>
+        <source>Option '-checkpoints' is set but checkpoints were removed. This option has no effect.</source>
+        <translation type="unfinished">'-ಚೆಕ್‌ಪಾಯಿಂಟ್‌ಗಳು' ಆಯ್ಕೆಯನ್ನು ಹೊಂದಿಸಲಾಗಿದೆ ಆದರೆ ಚೆಕ್‌ಪಾಯಿಂಟ್‌ಗಳನ್ನು ತೆಗೆದುಹಾಕಲಾಗಿದೆ. ಈ ಆಯ್ಕೆಯು ಯಾವುದೇ ಪರಿಣಾಮವನ್ನು ಬೀರುವುದಿಲ್ಲ.</translation>
+    </message>
     <message>
         <source>Outbound connections restricted to Tor (-onlynet=onion) but the proxy for reaching the Tor network is explicitly forbidden: -onion=0</source>
         <translation type="unfinished">ಹೊರಗಡೆಯ ಸಂಪರ್ಕಗಳು Tor ಗೆ ಮಿತಿಮೀರಿರುವುದು (-onlynet=onion), ಆದರೆ Tor ನೆಟ್ವರ್ಕ್ ತಲುಪಲು ಪ್ರಾಕ್ಸಿ ಸ್ಪಷ್ಟವಾಗಿ ನಿಷೇಧಿಸಲ್ಪಟ್ಟಿದೆ: -onion=0.</translation>
@@ -720,6 +752,10 @@ Signing is only possible with addresses of the type 'legacy'.</source>
  
  </translation>
     </message>
+    <message>
+        <source>Prune: last wallet synchronisation goes beyond pruned data. You need to -reindex (download the whole blockchain again in case of a pruned node)</source>
+        <translation type="unfinished">ಪ್ರೂನ್: ಕೊನೆಯ ವ್ಯಾಲೆಟ್ ಸಿಂಕ್ರೊನೈಸೇಶನ್ ಪ್ರೂನ್ ಮಾಡಿದ ಡೇಟಾವನ್ನು ಮೀರಿದೆ. ನೀವು -ರೀಇಂಡೆಕ್ಸ್ ಮಾಡಬೇಕಾಗುತ್ತದೆ (ಪ್ರೂನ್ ಮಾಡಿದ ನೋಡ್ ಸಂದರ್ಭದಲ್ಲಿ ಇಡೀ ಬ್ಲಾಕ್‌ಚೈನ್ ಅನ್ನು ಮತ್ತೆ ಡೌನ್‌ಲೋಡ್ ಮಾಡಿ)</translation>
+    </message>
     <message>
         <source>Specified -blockmaxweight (%d) exceeds consensus maximum block weight (%d)</source>
         <translation type="unfinished">ನಿರ್ದಿಷ್ಟ -ಬ್ಲಾಕ್‌ಮ್ಯಾಕ್ಸ್‌ವೈಟ್ (%d) ಸಮ್ಮತಿಯ ಗರಿಷ್ಠ ಬ್ಲಾಕ್ ತೂಕವನ್ನು (%d) ಮೀರಿದೆ</translation>
@@ -732,6 +768,34 @@ Signing is only possible with addresses of the type 'legacy'.</source>
         <source>Specified -blockreservedweight (%d) is lower than minimum safety value of (%d)</source>
         <translation type="unfinished">ನಿರ್ದಿಷ್ಟ -ಬ್ಲಾಕ್‌ರಿಸರ್ವ್ಡ್‌ವೈಟ್ (%d) ಕನಿಷ್ಠ ಸುರಕ್ಷತಾ ಮೌಲ್ಯಕ್ಕಿಂತ (%d) ಕಡಿಮೆಯಾಗಿದೆ</translation>
     </message>
+    <message>
+        <source>Could not generate scriptPubKeys (cache is empty)</source>
+        <translation type="unfinished">ಸ್ಕ್ರಿಪ್ಟ್‌ಪಬ್‌ಕೀಗಳನ್ನು ರಚಿಸಲು ಸಾಧ್ಯವಾಗಲಿಲ್ಲ (ಕ್ಯಾಶ್ ಖಾಲಿಯಾಗಿದೆ)</translation>
+    </message>
+    <message>
+        <source>Could not top up scriptPubKeys</source>
+        <translation type="unfinished">ಸ್ಕ್ರಿಪ್ಟ್‌ಪಬ್‌ಕೀಸ್‌ಗಳನ್ನು ಮರುಪೂರಣ ಮಾಡಲು ಸಾಧ್ಯವಾಗಲಿಲ್ಲ.</translation>
+    </message>
+    <message>
+        <source>Error: Not all address book records were migrated</source>
+        <translation type="unfinished">ದೋಷ: ಎಲ್ಲಾ ವಿಳಾಸ ಪುಸ್ತಕ ದಾಖಲೆಗಳನ್ನು ಸ್ಥಳಾಂತರಿಸಲಾಗಿಲ್ಲ.</translation>
+    </message>
+    <message>
+        <source>Error: Not all transaction records were migrated</source>
+        <translation type="unfinished">ದೋಷ: ಎಲ್ಲಾ ವಹಿವಾಟು ದಾಖಲೆಗಳನ್ನು ಸ್ಥಳಾಂತರಿಸಲಾಗಿಲ್ಲ.</translation>
+    </message>
+    <message>
+        <source>Failed to acquire rescan reserver during wallet initialization</source>
+        <translation type="unfinished">ವಾಲೆಟ್ ಅನ್ನು ಪ್ರಾರಂಭಿಸುವಾಗ ಮರುಸ್ಕ್ಯಾನ್ ರಿಸರ್ವರ್ ಅನ್ನು ಪಡೆದುಕೊಳ್ಳಲು ವಿಫಲವಾಗಿದೆ.</translation>
+    </message>
+    <message>
+        <source>Failed to close block undo file.</source>
+        <translation type="unfinished">ನಿರ್ಬಂಧಿಸುವಿಕೆ ರದ್ದುಗೊಳಿಸುವಿಕೆ ಫೈಲ್ ಅನ್ನು ಮುಚ್ಚಲು ವಿಫಲವಾಗಿದೆ.</translation>
+    </message>
+    <message>
+        <source>Failed to close file when writing block.</source>
+        <translation type="unfinished">ಬ್ಲಾಕ್ ಬರೆಯುವಾಗ ಫೈಲ್ ಅನ್ನು ಮುಚ್ಚಲು ವಿಫಲವಾಗಿದೆ.</translation>
+    </message>
     <message>
         <source>The wallet will avoid paying less than the minimum relay fee.</source>
         <translation type="unfinished">ನೆಲೆಯ ರೆಲೇ ಶುಲ್ಕದಿಂದ ಕಡಿಮೆ ಶುಲ್ಕವನ್ನು ಕೊಡದಂತೆ ವಾಲೆಟ್ ನುಡಿಮುಟ್ಟುವುದು.</translation>
@@ -740,13 +804,21 @@ Signing is only possible with addresses of the type 'legacy'.</source>
         <source>This is the minimum transaction fee you pay on every transaction.</source>
         <translation type="unfinished">ನೀವು ಪ್ರತಿಯೊಂದು ಟ್ರಾನ್ಸ್ಯಾಕ್ಷನ್ ಮೇಲೆ ಪಾವತಿ ಶುಲ್ಕವನ್ನು ಕೊಡಬೇಕಾದ ಕನಿಷ್ಠ ಶುಲ್ಕ.</translation>
     </message>
-    <message>
-        <source>This is the transaction fee you will pay if you send a transaction.</source>
-        <translation type="unfinished">ನೀವು ಟ್ರಾನ್ಸ್ಯಾಕ್ಷನ್ ಕಳುಹಿಸುವಾಗ ನೀವು ಪಾವತಿ ವಿಧಾನದ ಮೂಲಕ ಪಾವತಿ ಶುಲ್ಕವನ್ನು ಪಾವತಿ ಕಳುಹಿಸುವಾಗ ನೀವು ಕೊಡಬೇಕಾದ ಶುಲ್ಕ.</translation>
-    </message>
     <message>
         <source>Transaction needs a change address, but we can't generate it.</source>
         <translation type="unfinished">ಲೆಕ್ಕಾಚಾರದಲ್ಲಿ ಬದಲಾವಣೆ ವಿನಂತಿಯನ್ನು ಹೊಂದಿರುವ ಟ್ರಾನ್ಸ್ಯಾಕ್ಷನ್ ಕೆಲವು ಬದಲಾವಣೆ ವಿನಂತಿಗಳನ್ನು ಹೊಂದಿದೆ, ಆದರೆ ಅದನ್ನು ಉಂಟುಮಾಡಲು ಆಗದಿದೆ.</translation>
     </message>
+    <message>
+        <source>Failed to calculate bump fees, because unconfirmed UTXOs depend on an enormous cluster of unconfirmed transactions.</source>
+        <translation type="unfinished">ದೃಢೀಕರಿಸದ UTXOಗಳು ದೃಢೀಕರಿಸದ ವಹಿವಾಟುಗಳ ಅಗಾಧ ಸಮೂಹವನ್ನು ಅವಲಂಬಿಸಿರುವುದರಿಂದ, ಬಂಪ್ ಶುಲ್ಕವನ್ನು ಲೆಕ್ಕಾಚಾರ ಮಾಡಲು ವಿಫಲವಾಗಿದೆ.</translation>
+    </message>
+    <message>
+        <source>Transaction requires one destination of non-zero value, a non-zero feerate, or a pre-selected input</source>
+        <translation type="unfinished">ವಹಿವಾಟಿಗೆ ಶೂನ್ಯವಲ್ಲದ ಮೌಲ್ಯದ ಒಂದು ಗಮ್ಯಸ್ಥಾನ, ಶೂನ್ಯವಲ್ಲದ ದರ ಅಥವಾ ಮೊದಲೇ ಆಯ್ಕೆಮಾಡಿದ ಇನ್‌ಪುಟ್ ಅಗತ್ಯವಿದೆ.</translation>
+    </message>
+    <message>
+        <source>Failed to start indexes, shutting down…</source>
+        <translation type="unfinished">ಸೂಚ್ಯಂಕಗಳನ್ನು ಪ್ರಾರಂಭಿಸಲು ವಿಫಲವಾಗಿದೆ, ಸ್ಥಗಿತಗೊಳಿಸಲಾಗುತ್ತಿದೆ...</translation>
+    </message>
     </context>
 </TS>
\ No newline at end of file
diff --git a/src/qt/locale/bitcoin_ko.ts b/src/qt/locale/bitcoin_ko.ts
index fefe4ffb10ac..1642fa9d9b32 100644
--- a/src/qt/locale/bitcoin_ko.ts
+++ b/src/qt/locale/bitcoin_ko.ts
@@ -15,11 +15,11 @@
     </message>
     <message>
         <source>&amp;Copy</source>
-        <translation type="unfinished">&amp;복사</translation>
+        <translation type="unfinished">복사(&amp;C)</translation>
     </message>
     <message>
         <source>C&amp;lose</source>
-        <translation type="unfinished">C&amp;닫기</translation>
+        <translation type="unfinished">닫기(&amp;L)</translation>
     </message>
     <message>
         <source>Delete the currently selected address from the list</source>
@@ -29,6 +29,10 @@
         <source>Enter address or label to search</source>
         <translation type="unfinished">검색하려는 주소 또는 라벨을 입력하십시오.</translation>
     </message>
+    <message>
+        <source>Copy the currently selected address to the clipboard</source>
+        <translation type="unfinished">현재 선택된 주소를 클립보드에 복사하기</translation>
+    </message>
     <message>
         <source>Export the data in the current tab to a file</source>
         <translation type="unfinished">현재 탭에 있는 데이터를 파일로 내보내기</translation>
@@ -306,6 +310,14 @@ Signing is only possible with addresses of the type 'legacy'.</source>
         <source>unknown</source>
         <translation type="unfinished">알 수 없음</translation>
     </message>
+    <message>
+        <source>Embedded "%1"</source>
+        <translation type="unfinished">%1 포함됨</translation>
+    </message>
+    <message>
+        <source>Default system font "%1"</source>
+        <translation type="unfinished">기본 시스템 폰트 "%1"</translation>
+    </message>
     <message>
         <source>Custom…</source>
         <translation type="unfinished">사용자정의</translation>
@@ -1095,6 +1107,10 @@ Signing is only possible with addresses of the type 'legacy'.</source>
         <source>Migrate wallet</source>
         <translation type="unfinished">지갑 이동</translation>
     </message>
+    <message>
+        <source>Are you sure you wish to migrate the wallet &lt;i&gt;%1&lt;/i&gt;?</source>
+        <translation type="unfinished">정말 지갑&lt;i&gt;%1&lt;/i&gt;을 마이그레이션하시겠습니까?</translation>
+    </message>
     <message>
         <source>Migrating the wallet will convert this wallet to one or more descriptor wallets. A new wallet backup will need to be made.
 If this wallet contains any watchonly scripts, a new wallet will be created which contains those watchonly scripts.
@@ -1109,6 +1125,32 @@ The migration process will create a backup of the wallet before migrating. This
         <source>Migrate Wallet</source>
         <translation type="unfinished">지갑 이동</translation>
     </message>
+    <message>
+        <source>Migrating Wallet &lt;b&gt;%1&lt;/b&gt;…</source>
+        <translation type="unfinished">지갑 &lt;b&gt;%1&lt;/b&gt;을 마이그레이션 하는중입니다...</translation>
+    </message>
+    <message>
+        <source>The wallet '%1' was migrated successfully.</source>
+        <translation type="unfinished">'%1'지갑은 성공적으로 마이그레이션이 되었습니다. </translation>
+    </message>
+    <message>
+        <source>Watchonly scripts have been migrated to a new wallet named '%1'.</source>
+        <translation type="unfinished">Watch-only 스크립트가 새 지갑 '%1'으로 마이그레이션 되었습니다:</translation>
+    </message>
+    <message>
+        <source>Solvable but not watched scripts have been migrated to a new wallet named '%1'.</source>
+        <translation type="unfinished">해결 가능 상태(Solvable )이긴 하지만 ‘watch-only’로 표시되지 않은 스크립트들은 새로운 지갑 ‘%1’로 마이그레이션되었습니다.</translation>
+    </message>
+    <message>
+        <source>Restore Wallet</source>
+        <extracomment>Title of progress window which is displayed when wallets are being restored.</extracomment>
+        <translation type="unfinished">지갑 복원하기</translation>
+    </message>
+    <message>
+        <source>Restoring Wallet &lt;b&gt;%1&lt;/b&gt;…</source>
+        <extracomment>Descriptive text of the restore wallets progress window which indicates to the user that wallets are currently being restored.</extracomment>
+        <translation type="unfinished">지갑 복구 중 &lt;b&gt;%1&lt;/b&gt;...</translation>
+    </message>
     <message>
         <source>Migration failed</source>
         <translation type="unfinished">이전 실패</translation>
@@ -1232,10 +1274,6 @@ The migration process will create a backup of the wallet before migrating. This
         <source>Disable Private Keys</source>
         <translation type="unfinished">개인키 비활성화 하기</translation>
     </message>
-    <message>
-        <source>Make a blank wallet. Blank wallets do not initially have private keys or scripts. Private keys and addresses can be imported, or an HD seed can be set, at a later time.</source>
-        <translation type="unfinished">빈 지갑을 만드십시오. 빈 지갑은 처음에는 개인 키나 스크립트를 가지고 있지 않습니다. 개인 키와 주소를 가져 오거나 HD 시드를 설정하는 것은 나중에 할 수 있습니다.</translation>
-    </message>
     <message>
         <source>Make Blank Wallet</source>
         <translation type="unfinished">빈 지갑 만들기</translation>
@@ -1559,6 +1597,12 @@ The migration process will create a backup of the wallet before migrating. This
         <source>Enabling pruning significantly reduces the disk space required to store transactions. All blocks are still fully validated. Reverting this setting requires re-downloading the entire blockchain.</source>
         <translation type="unfinished">정리를 활성화하면 트랜잭션을 저장하는 데 필요한 디스크 공간이 크게 줄어듭니다. 모든 블록의 유효성이 여전히 완전히 확인되었습니다. 이 설정을 되돌리려면 전체 블록체인을 다시 다운로드해야 합니다.</translation>
     </message>
+    <message>
+        <source>Maximum database cache size. Make sure you have enough RAM. A larger cache can contribute to faster sync, after which the benefit is less pronounced for most use cases. Lowering the cache size will reduce memory usage. Unused mempool memory is shared for this cache.</source>
+        <extracomment>Tooltip text for Options window setting that sets the size of the database cache. Explains the corresponding effects of increasing/decreasing this value.</extracomment>
+        <translation type="unfinished"> 
+최대 데이터베이스 캐시 크기. 충분한 RAM이 있는지 확인하세요. 캐시 크기를 크게 설정하면 초기 동기화 속도가 빨라질 수 있지만 대부분의 사용 사례에서는 동기화가 끝난 뒤에는 효과가 크지 않습니다. 캐시 크기를 줄이면 메모리 사용량이 감소합니다. 사용되지 않은 멤풀 메모리는 이 캐시와 공유됩니다.</translation>
+    </message>
     <message>
         <source>Size of &amp;database cache</source>
         <translation type="unfinished">데이터베이스 캐시 크기(&amp;D)</translation>
@@ -1571,6 +1615,14 @@ The migration process will create a backup of the wallet before migrating. This
         <source>Full path to a %1 compatible script (e.g. C:\Downloads\hwi.exe or /Users/you/Downloads/hwi.py). Beware: malware can steal your coins!</source>
         <translation type="unfinished">%1가 호환되는 스크립트가 있는 전체 경로 (예시 - C:\Downloads\hwi.exe or /Users/you/Downloads/hwi.py). 주의: 멀웨어가 당신의 코인들을 훔쳐갈 수도 있습니다!</translation>
     </message>
+    <message>
+        <source>Automatically open the Bitcoin client port on the router. This only works when your router supports PCP or NAT-PMP and it is enabled. The external port could be random.</source>
+        <translation type="unfinished">비트코인 클라이언트 포트를 라우터에서 자동으로 열기. 이 기능은 라우터가 PCP(Port Control Protocol) 또는 NAT-PMP(NAT Port Mapping Protocol) 를 지원하고 해당 기능이 활성화되어 있을 때만 작동합니다. 외부 포트는 임의(random)로 지정될 수 있습니다.</translation>
+    </message>
+    <message>
+        <source>Map port using PCP or NA&amp;T-PMP</source>
+        <translation type="unfinished">PCP 또는 NAT-PMP를 사용해서 포트를 매핑</translation>
+    </message>
     <message>
         <source>IP address of the proxy (e.g. IPv4: 127.0.0.1 / IPv6: ::1)</source>
         <translation type="unfinished">프록시 아이피 주소 (예: IPv4:127.0.0.1 / IPv6: ::1)</translation>
@@ -1583,6 +1635,14 @@ The migration process will create a backup of the wallet before migrating. This
         <source>Minimize instead of exit the application when the window is closed. When this option is enabled, the application will be closed only after selecting Exit in the menu.</source>
         <translation type="unfinished">창을 닫으면 종료 대신 축소하기. 이 옵션을 활성화하면 메뉴에서 종료를 선택한 후에만 어플리케이션이 종료됩니다.</translation>
     </message>
+    <message>
+        <source>Font in the Overview tab: </source>
+        <translation type="unfinished">개요탭에 표시된 글꼴</translation>
+    </message>
+    <message>
+        <source>Options set in this dialog are overridden by the command line:</source>
+        <translation type="unfinished">이 대화에서 지정한 설정은 다음 명령줄 옵션으로 우선 적용됩니다 :</translation>
+    </message>
     <message>
         <source>Open the %1 configuration file from the working directory.</source>
         <translation type="unfinished">작업 디렉토리에서 %1 설정 파일을 엽니다.</translation>
@@ -1806,6 +1866,11 @@ The migration process will create a backup of the wallet before migrating. This
         <extracomment>Text explaining that the settings changed will not come into effect until the client is restarted.</extracomment>
         <translation type="unfinished">변경 사항을 적용하기 위해서는 프로그램이 종료 후 재시작되어야 합니다.</translation>
     </message>
+    <message>
+        <source>Current settings will be backed up at "%1".</source>
+        <extracomment>Text explaining to the user that the client's current settings will be backed up at a specific location. %1 is a stand-in argument for the backup location's path.</extracomment>
+        <translation type="unfinished">현재 설정은 "%1" 에 백업됩니다.</translation>
+    </message>
     <message>
         <source>Client will be shut down. Do you want to proceed?</source>
         <extracomment>Text asking the user to confirm if they would like to proceed with a client shutdown.</extracomment>
@@ -1846,6 +1911,13 @@ The migration process will create a backup of the wallet before migrating. This
         <translation type="unfinished">지정한 프록시 주소가 잘못되었습니다.</translation>
     </message>
 </context>
+<context>
+    <name>OptionsModel</name>
+    <message>
+        <source>Could not read setting "%1", %2.</source>
+        <translation type="unfinished">설정 "%1"을 읽을 수 없습니다, %2.</translation>
+    </message>
+</context>
 <context>
     <name>OverviewPage</name>
     <message>
@@ -1943,9 +2015,11 @@ The migration process will create a backup of the wallet before migrating. This
         <source>Could not sign any more inputs.</source>
         <translation type="unfinished">더 이상 추가적인 입력에 대해 서명할 수 없습니다.</translation>
     </message>
-    <message>
-        <source>Signed %1 inputs, but more signatures are still required.</source>
-        <translation type="unfinished">%1 입력에 서명했지만 더 많은 서명이 필요합니다.</translation>
+    <message numerus="yes">
+        <source>Signed %n input(s), but more signatures are still required.</source>
+        <translation type="unfinished">
+            <numerusform />
+        </translation>
     </message>
     <message>
         <source>Signed transaction successfully. Transaction is ready to broadcast.</source>
@@ -1980,6 +2054,10 @@ The migration process will create a backup of the wallet before migrating. This
         <source>PSBT saved to disk.</source>
         <translation type="unfinished">PSBT가 디스크에 저장 됨</translation>
     </message>
+    <message>
+        <source>Sends %1 to %2</source>
+        <translation type="unfinished">%1을 %2에게 보냅니다.</translation>
+    </message>
     <message>
         <source>own address</source>
         <translation type="unfinished">자신의 주소</translation>
@@ -2000,9 +2078,11 @@ The migration process will create a backup of the wallet before migrating. This
         <source>or</source>
         <translation type="unfinished">또는</translation>
     </message>
-    <message>
-        <source>Transaction has %1 unsigned inputs.</source>
-        <translation type="unfinished">거래가 %1 개의 서명 되지 않은 입력을 갖고 있습니다.</translation>
+    <message numerus="yes">
+        <source>Transaction has %n unsigned input(s).</source>
+        <translation type="unfinished">
+            <numerusform />
+        </translation>
     </message>
     <message>
         <source>Transaction is missing some information about inputs.</source>
@@ -2205,6 +2285,14 @@ BIP70의 광범위한 보안 결함으로 인해 모든 가맹점에서는 지
         <source>Number of connections</source>
         <translation type="unfinished">연결 수</translation>
     </message>
+    <message>
+        <source>Local Addresses</source>
+        <translation type="unfinished">로컬 주소</translation>
+    </message>
+    <message>
+        <source>Network addresses that your Bitcoin node is currently using to communicate with other nodes.</source>
+        <translation type="unfinished">당신의 비트코인 노드가 현재 다른 노드들과 통신하기 위해 사용 중인 네트워크 주소입니다.</translation>
+    </message>
     <message>
         <source>Block chain</source>
         <translation type="unfinished">블록 체인</translation>
@@ -2253,6 +2341,18 @@ BIP70의 광범위한 보안 결함으로 인해 모든 가맹점에서는 지
         <source>Select a peer to view detailed information.</source>
         <translation type="unfinished">자세한 정보를 보려면 피어를 선택하세요.</translation>
     </message>
+    <message>
+        <source>Hide Peers Detail</source>
+        <translation type="unfinished">피어 세부 정보 숨기기</translation>
+    </message>
+    <message>
+        <source>The transport layer version: %1</source>
+        <translation type="unfinished">전송 계층 버전 : %1</translation>
+    </message>
+    <message>
+        <source>Transport</source>
+        <translation type="unfinished">전송</translation>
+    </message>
     <message>
         <source>Session ID</source>
         <translation type="unfinished">세션 ID</translation>
@@ -2262,8 +2362,12 @@ BIP70의 광범위한 보안 결함으로 인해 모든 가맹점에서는 지
         <translation type="unfinished">버전</translation>
     </message>
     <message>
-        <source>Starting Block</source>
-        <translation type="unfinished">시작된 블록</translation>
+        <source>Whether we relay transactions to this peer.</source>
+        <translation type="unfinished">이 피어에게 트랜잭션을 중계할지 결정합니다.</translation>
+    </message>
+    <message>
+        <source>Transaction Relay</source>
+        <translation type="unfinished">트랜잭션 중계</translation>
     </message>
     <message>
         <source>Synced Headers</source>
@@ -2295,6 +2399,16 @@ BIP70의 광범위한 보안 결함으로 인해 모든 가맹점에서는 지
         <extracomment>Text title for the Address Relay field in the peer details area, which displays whether we relay addresses to this peer (Yes/No).</extracomment>
         <translation type="unfinished">지갑주소를 릴레이합니다.</translation>
     </message>
+    <message>
+        <source>The total number of addresses received from this peer that were processed (excludes addresses that were dropped due to rate-limiting).</source>
+        <extracomment>Tooltip text for the Addresses Processed field in the peer details area, which displays the total number of addresses received from this peer that were processed (excludes addresses that were dropped due to rate-limiting).</extracomment>
+        <translation type="unfinished">이 피어로부터 수신되어 처리된 주소의 총 개수입니다. (속도 제한으로 인해 버려진 주소는 제외됩니다.)</translation>
+    </message>
+    <message>
+        <source>The total number of addresses received from this peer that were dropped (not processed) due to rate-limiting.</source>
+        <extracomment>Tooltip text for the Addresses Rate-Limited field in the peer details area, which displays the total number of addresses received from this peer that were dropped (not processed) due to rate-limiting.</extracomment>
+        <translation type="unfinished">속도 제한(rate-limiting)으로 인해 처리되지 않고 버려진 이 피어로부터 수신된 주소의 총 개수입니다.</translation>
+    </message>
     <message>
         <source>Addresses Processed</source>
         <extracomment>Text title for the Addresses Processed field in the peer details area, which displays the total number of addresses received from this peer that were processed (excludes addresses that were dropped due to rate-limiting).</extracomment>
@@ -2456,7 +2570,7 @@ BIP70의 광범위한 보안 결함으로 인해 모든 가맹점에서는 지
     <message>
         <source>Outbound Manual: added using RPC %1 or %2/%3 configuration options</source>
         <extracomment>Explanatory text for an outbound peer connection that was established manually through one of several methods. The numbered arguments are stand-ins for the methods available to establish manual connections.</extracomment>
-        <translation type="unfinished">아웃바운드 매뉴얼 : RPC %1 이나 %2/%3 을 사용해서 환경설정 옵션을 추가</translation>
+        <translation type="unfinished">아웃바운드 매뉴얼 : RPC 1%1 이나 2%2/3%3 을 사용해서 환경설정 옵션을 추가</translation>
     </message>
     <message>
         <source>Outbound Feeler: short-lived, for testing addresses</source>
@@ -2542,6 +2656,10 @@ BIP70의 광범위한 보안 결함으로 인해 모든 가맹점에서는 지
         <source>Executing command without any wallet</source>
         <translation type="unfinished">지갑 없이 명령 실행</translation>
     </message>
+    <message>
+        <source>Node window - [%1]</source>
+        <translation type="unfinished">노드 정보 창 - [%1]</translation>
+    </message>
     <message>
         <source>Executing command using "%1" wallet</source>
         <translation type="unfinished">"%1" 지갑을 사용하여 명령 실행</translation>
@@ -2694,6 +2812,14 @@ For more information on using this console, type %6.
         <source>Copy &amp;amount</source>
         <translation type="unfinished">복사 &amp; 금액</translation>
     </message>
+    <message>
+        <source>Not recommended due to higher fees and less protection against typos.</source>
+        <translation type="unfinished">높은 수수료와 낮은 오타 방지 보호 기능 때문에 권장되지 않습니다.</translation>
+    </message>
+    <message>
+        <source>Generates an address compatible with older wallets.</source>
+        <translation type="unfinished">구형 지갑과 호환되는 주소를 생성합니다.</translation>
+    </message>
     <message>
         <source>Generates a native segwit address (BIP-173). Some old wallets don't support it.</source>
         <translation type="unfinished">네이티브 세그윗 주소(BIP-173)를 생성합니다. 일부 오래된 지갑은 이를 지원하지 않습니다</translation>
@@ -3054,6 +3180,10 @@ Note:  Since the fee is calculated on a per-byte basis, a fee rate of "100 satos
         <extracomment>Text to inform a user attempting to create a transaction of their current options. At this stage, a user can only create a PSBT. This string is displayed when private keys are disabled and an external signer is not available.</extracomment>
         <translation type="unfinished">거래 제안을 검토해 주십시오. 이것은 당신이 저장하거나 복사한 뒤 e.g. 오프라인 %1 지갑 또는 PSBT 호환 하드웨어 지갑으로 서명할 수 있는 PSBT (부분적으로 서명된 비트코인 트랜잭션)를 생성할 것입니다.</translation>
     </message>
+    <message>
+        <source>%1 from wallet '%2'</source>
+        <translation type="unfinished">지갑 '%2'에서 %1</translation>
+    </message>
     <message>
         <source>Do you want to create this transaction?</source>
         <extracomment>Message displayed when attempting to create a transaction. Cautionary text to prompt the user to verify that the displayed transaction details represent the transaction the user intends to create.</extracomment>
@@ -3081,10 +3211,21 @@ Note:  Since the fee is calculated on a per-byte basis, a fee rate of "100 satos
         <source>Total Amount</source>
         <translation type="unfinished">총액</translation>
     </message>
+    <message>
+        <source>Unsigned Transaction</source>
+        <comment>PSBT copied</comment>
+        <extracomment>Caption of "PSBT has been copied" messagebox</extracomment>
+        <translation type="unfinished">서명하지 않은 트랜잭션</translation>
+    </message>
     <message>
         <source>The PSBT has been copied to the clipboard. You can also save it.</source>
         <translation type="unfinished">PSBT가 클립보드가 복사되었습니다. 필요하다면 저장할 수 있습니다.</translation>
     </message>
+    <message>
+        <source>PSBT saved to disk</source>
+        <translation type="unfinished">부분 서명된 비트코인 트랜잭션(PSBT)이 디스크에 저장되었습니다.
+ </translation>
+    </message>
     <message>
         <source>Confirm send coins</source>
         <translation type="unfinished">코인 전송을 확인</translation>
@@ -3101,10 +3242,6 @@ Note:  Since the fee is calculated on a per-byte basis, a fee rate of "100 satos
         <source>The amount exceeds your balance.</source>
         <translation type="unfinished">잔고를 초과하였습니다.</translation>
     </message>
-    <message>
-        <source>The total exceeds your balance when the %1 transaction fee is included.</source>
-        <translation type="unfinished">%1 의 거래 수수료를 포함하면 잔고를 초과합니다.</translation>
-    </message>
     <message>
         <source>Duplicate address found: addresses should only be used once each.</source>
         <translation type="unfinished">중복된 주소 발견: 주소는 한번만 사용되어야 합니다.</translation>
@@ -3224,6 +3361,10 @@ Note:  Since the fee is calculated on a per-byte basis, a fee rate of "100 satos
         <source>&amp;Sign Message</source>
         <translation type="unfinished">메시지 서명(&amp;S)</translation>
     </message>
+    <message>
+        <source>You can sign messages/agreements with your legacy (P2PKH) 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.</source>
+        <translation type="unfinished">레거시(P2PKH) 주소를 사용하여 메시지 혹은 동의서에 서명하면 해당 주소로 비트코인을 받을 수 있다는 사실을 증명할 수 있습니다. 다만, 모호하거나 무작위적인 내용에는 피싱 공격자가 사용자의 신원을 넘겨받도록 속이려 할 수 있기 때문에 서명을 하는것에 주의하세요. 반드시 당신이 동의하는 완전한 문구에만 서명하세요.</translation>
+    </message>
     <message>
         <source>The Bitcoin address to sign the message with</source>
         <translation type="unfinished">메세지를 서명할 비트코인 주소</translation>
@@ -3244,6 +3385,10 @@ Note:  Since the fee is calculated on a per-byte basis, a fee rate of "100 satos
         <source>Signature</source>
         <translation type="unfinished">서명</translation>
     </message>
+    <message>
+        <source>Copy the current signature to the clipboard</source>
+        <translation type="unfinished">현재 서명을 클립보드에 복사</translation>
+    </message>
     <message>
         <source>Sign the message to prove you own this Bitcoin address</source>
         <translation type="unfinished">당신이 이 비트코인 주소를 소유한다는 증명을 위해 메시지를 서명합니다</translation>
@@ -3304,6 +3449,10 @@ Note:  Since the fee is calculated on a per-byte basis, a fee rate of "100 satos
         <source>Please check the address and try again.</source>
         <translation type="unfinished">주소를 확인하고 다시 시도하십시오.</translation>
     </message>
+    <message>
+        <source>The entered address does not refer to a legacy (P2PKH) key. Message signing for SegWit and other non-P2PKH address types is not supported in this version of %1. Please check the address and try again.</source>
+        <translation type="unfinished">입력한 주소는 레거시(P2PKH) 키를 참조하지 않습니다. 세그윗(SegWit) 및 기타 비 P2PKH 주소 유형에 대한 메시지 서명 기능은 %1 버전에서 지원되지 않습니다. 주소를 확인한 후 다시 시도하십시오.</translation>
+    </message>
     <message>
         <source>Wallet unlock was cancelled.</source>
         <translation type="unfinished">지갑 잠금 해제를 취소했습니다.</translation>
@@ -3363,6 +3512,16 @@ Note:  Since the fee is calculated on a per-byte basis, a fee rate of "100 satos
         <extracomment>Text explaining the current status of a transaction, shown in the status field of the details window for this transaction. This status represents an unconfirmed transaction that conflicts with a confirmed transaction.</extracomment>
         <translation type="unfinished">%1 승인이 있는 거래와 충돌함</translation>
     </message>
+    <message>
+        <source>0/unconfirmed, in memory pool</source>
+        <extracomment>Text explaining the current status of a transaction, shown in the status field of the details window for this transaction. This status represents an unconfirmed transaction that is in the memory pool.</extracomment>
+        <translation type="unfinished">0 컨펌 상태이며 메모리풀에 있음</translation>
+    </message>
+    <message>
+        <source>0/unconfirmed, not in memory pool</source>
+        <extracomment>Text explaining the current status of a transaction, shown in the status field of the details window for this transaction. This status represents an unconfirmed transaction that is not in the memory pool.</extracomment>
+        <translation type="unfinished">0 컨펌 상태이며 메모리풀에 없음</translation>
+    </message>
     <message>
         <source>abandoned</source>
         <extracomment>Text explaining the current status of a transaction, shown in the status field of the details window for this transaction. This status represents an abandoned transaction.</extracomment>
@@ -3472,6 +3631,10 @@ Note:  Since the fee is calculated on a per-byte basis, a fee rate of "100 satos
         <source>Output index</source>
         <translation type="unfinished">출력 인덱스</translation>
     </message>
+    <message>
+        <source>%1 (Certificate was not verified)</source>
+        <translation type="unfinished">%1(증명서가 검증되지 않았습니다)</translation>
+    </message>
     <message>
         <source>Merchant</source>
         <translation type="unfinished">판매자</translation>
@@ -3858,6 +4021,10 @@ Go to File &gt; Open Wallet to load a wallet.
         <source>Could not commit transaction</source>
         <translation type="unfinished">거래를 커밋 할 수 없습니다.</translation>
     </message>
+    <message>
+        <source>Signer error</source>
+        <translation type="unfinished">서명기 오류</translation>
+    </message>
     <message>
         <source>Can't display address</source>
         <translation type="unfinished">주소를 표시할 수 없습니다.</translation>
@@ -3909,14 +4076,34 @@ Go to File &gt; Open Wallet to load a wallet.
         <source>The %s developers</source>
         <translation type="unfinished">%s 개발자들</translation>
     </message>
+    <message>
+        <source>%s failed to validate the -assumeutxo snapshot state. This indicates a hardware problem, or a bug in the software, or a bad software modification that allowed an invalid snapshot to be loaded. As a result of this, the node will shut down and stop using any state that was built on the snapshot, resetting the chain height from %d to %d. On the next restart, the node will resume syncing from %d without using any snapshot data. Please report this incident to %s, including how you obtained the snapshot. The invalid snapshot chainstate will be left on disk in case it is helpful in diagnosing the issue that caused this error.</source>
+        <translation type="unfinished">-assumeutxo 스냅샷 상태 검증하는것에 %s가 실패했습니다. 이것은 하드웨어 문제, 소프트웨어 버그, 잘못된 소프트웨어 수정으로 인해 유효하지 않은 스냅샷이 로드가 되었음을 의미합니다. 그 결과로 인해 노드는 종료되며, 해당 스냅샷을 기반으로 생성된 모든 상태의 사용을 중단하고 체인 높이를 %d에서 %d로 초기화 합니다. 다음 재시작 시, 노드는 스냅샷 데이터를 사용하지 않고 %d높이부터 동기화를 다시 시작합니다. 이 문제를 보고할 때에는 %s 스냅샷을 어떻게 획득했는지도 함께 포함하여 보고해 주십시요. 오류 원인 분석에 도움이 될 수 있도록 유효하지 않은 스냅샷의 체인 상태(chainstate)는 디스크에 그대로 남겨집니다. </translation>
+    </message>
+    <message>
+        <source>%s request to listen on port %u. This port is considered "bad" and thus it is unlikely that any peer will connect to it. See doc/p2p-bad-ports.md for details and a full list.</source>
+        <translation type="unfinished">%s가 포트 %u에서 수신 대기(listen) 요청을 했습니다. 이 포트는 “문제가 있는 포트(bad)”로 간주되므로 다른 피어들이 이 포트에 연결할 가능성은 매우 낮습니다. 자세한 내용과 전체 목록은 doc/p2p-bad-ports.md 문서를 참고하세요.</translation>
+    </message>
+    <message>
+        <source>Disk space for %s may not accommodate the block files. Approximately %u GB of data will be stored in this directory.</source>
+        <translation type="unfinished">%s의 디스크 공간이 블록 파일을 저장하기에 충분하지 않을 수 있습니다. 이 디렉터리에는 약 %uGB의 데이터가 저장될 예정입니다.</translation>
+    </message>
     <message>
         <source>Distributed under the MIT software license, see the accompanying file %s or %s</source>
         <translation type="unfinished">MIT 소프트웨어 라이센스에 따라 배포되었습니다. 첨부 파일 %s 또는 %s을 참조하십시오.</translation>
     </message>
+    <message>
+        <source>Error loading wallet. Wallet requires blocks to be downloaded, and software does not currently support loading wallets while blocks are being downloaded out of order when using assumeutxo snapshots. Wallet should be able to load successfully after node sync reaches height %s</source>
+        <translation type="unfinished">오류: 지갑을 불러오는 중 문제가 발생했습니다. 이 지갑을 사용하려면 블록이 모두 다운로드되어야 하며, 현재 소프트웨어는 assumeutxo 스냅샷(UTXO 가정 스냅샷)을 사용하는 경우 블록이 순서대로 내려받아지지 않은 상태에서는 지갑을 불러오는 기능을 지원하지 않습니다. 노드 동기화가 지정된 블록 높이 %s에 도달하면 지갑을 정상적으로 불러올 수 있게 됩니다.</translation>
+    </message>
     <message>
         <source>Error reading %s! Transaction data may be missing or incorrect. Rescanning wallet.</source>
         <translation type="unfinished">%s를 읽는데 에러가 생겼습니다. 트랜잭션 데이터가 잘못되었거나 누락되었습니다. 지갑을 다시 스캐닝합니다.</translation>
     </message>
+    <message>
+        <source>Error starting/committing db txn for wallet transactions removal process</source>
+        <translation type="unfinished">오류: 지갑의 거래 내역을 제거하는 과정에서 데이터베이스 트랜잭션(db txn)을 시작하거나 커밋하는 데 실패했습니다.</translation>
+    </message>
     <message>
         <source>Error: Dumpfile format record is incorrect. Got "%s", expected "format".</source>
         <translation type="unfinished">오류 : 덤프파일 포맷 기록이 잘못되었습니다. "포맷"이 아니라 "%s"를 얻었습니다.</translation>
@@ -3929,6 +4116,10 @@ Go to File &gt; Open Wallet to load a wallet.
         <source>Error: Dumpfile version is not supported. This version of bitcoin-wallet only supports version 1 dumpfiles. Got dumpfile with version %s</source>
         <translation type="unfinished">오류 : 덤프파일 버젼이 지원되지 않습니다. 이 비트코인 지갑 버젼은 오직 버젼1의 덤프파일을 지원합니다. %s버젼의 덤프파일을 얻었습니다.</translation>
     </message>
+    <message>
+        <source>Error: Unable to produce descriptors for this legacy wallet. Make sure to provide the wallet's passphrase if it is encrypted.</source>
+        <translation type="unfinished">오류: 이 레거시 지갑에 대해 디스크립터를 생성할 수 없습니다. 지갑이 암호화되어 있다면, 암호 구문(passphrase)을 제공했는지 확인하십시오.</translation>
+    </message>
     <message>
         <source>File %s already exists. If you are sure this is what you want, move it out of the way first.</source>
         <translation type="unfinished">%s 파일이 이미 존재합니다. 무엇을 하고자 하는지 확실하시다면, 파일을 먼저 다른 곳으로 옮기십시오.</translation>
@@ -3937,6 +4128,10 @@ Go to File &gt; Open Wallet to load a wallet.
         <source>Invalid or corrupt peers.dat (%s). If you believe this is a bug, please report it to %s. As a workaround, you can move the file (%s) out of the way (rename, move, or delete) to have a new one created on the next start.</source>
         <translation type="unfinished">유효하지 않거나 손상된 peers.dat(%s). 만약 이게 버그인 경우에, %s이쪽으로 리포트해주세요.  새로 만들어서 시작하기 위한 해결방법으로 %s파일을 옮길 수 있습니다. (이름 재설정, 파일 옮기기 혹은 삭제).</translation>
     </message>
+    <message>
+        <source>Invalid value detected for '-wallet' or '-nowallet'. '-wallet' requires a string value, while '-nowallet' accepts only '1' to disable all wallets</source>
+        <translation type="unfinished">잘못된 값이 ‘-wallet’ 또는 ‘-nowallet’ 옵션에서 감지되었습니다. ‘-wallet’ 옵션에는 문자열 값이 필요하며, ‘-nowallet’ 옵션은 모든 지갑의 비활성화를 위해 오직 ‘1’만 허용합니다.</translation>
+    </message>
     <message>
         <source>More than one onion bind address is provided. Using %s for the automatically created Tor onion service.</source>
         <translation type="unfinished">하나 이상의 양파 바인딩 주소가 제공됩니다. 자동으로 생성 된 Tor onion 서비스에 %s 사용.</translation>
@@ -3957,6 +4152,14 @@ Go to File &gt; Open Wallet to load a wallet.
         <source>Prune configured below the minimum of %d MiB.  Please use a higher number.</source>
         <translation type="unfinished">블록 축소가 최소치인 %d MiB 밑으로 설정되어 있습니다. 더 높은 값을 사용해 주십시오.</translation>
     </message>
+    <message>
+        <source>Prune mode is incompatible with -reindex-chainstate. Use full -reindex instead.</source>
+        <translation type="unfinished">프룬 모드는 -reindex-chainstate 옵션과 호환되지 않습니다. 대신 -reindex를 사용하세요.</translation>
+    </message>
+    <message>
+        <source>Rename of '%s' -&gt; '%s' failed. You should resolve this by manually moving or deleting the invalid snapshot directory %s, otherwise you will encounter the same error again on the next startup.</source>
+        <translation type="unfinished">디렉터리 이름 변경 '%s' -&gt; '%s' 에 실패했습니다. 잘못된 스냅샷 디렉터리 %s를 직접 이동하거나 삭제하여 문제를 해결해야 합니다. 그렇지 않으면 비트코인 코어를 시작할 때 동일한 오류가 다시 발생할 것입니다.</translation>
+    </message>
     <message>
         <source>SQLiteDatabase: Unknown sqlite wallet schema version %d. Only version %d is supported</source>
         <translation type="unfinished">에스큐엘라이트 데이터베이스 : 알 수 없는 에스큐엘라이트 지갑 스키마 버전 %d. %d 버전만 지원합니다.</translation>
@@ -3993,13 +4196,21 @@ Go to File &gt; Open Wallet to load a wallet.
         <source>Unable to replay blocks. You will need to rebuild the database using -reindex-chainstate.</source>
         <translation type="unfinished">블록을 재생할 수 없습니다. -reindex-chainstate를 사용하여 데이터베이스를 다시 빌드 해야 합니다.</translation>
     </message>
+    <message>
+        <source>Unsupported category-specific logging level %1$s=%2$s. Expected %1$s=&lt;category&gt;:&lt;loglevel&gt;. Valid categories: %3$s. Valid loglevels: %4$s.</source>
+        <translation type="unfinished">지원되지 않는 카테고리별 로그 레벨 %1$s=%2$s 입니다. %1$s=&lt;category&gt;:&lt;loglevel&gt;가 필요합니다. 유효한 카테고리: %3$s. 유효한 로그레벨: %4$s.</translation>
+    </message>
+    <message>
+        <source>Unsupported chainstate database format found. Please restart with -reindex-chainstate. This will rebuild the chainstate database.</source>
+        <translation type="unfinished">지원되지 않는 체인스테이트 데이터베이스 형식이 발견되었습니다. -reindex-chainstate 옵션으로 다시 시작해 주십시오. 이 작업은 체인스테이트 데이터베이스를 다시 구축합니다.</translation>
+    </message>
     <message>
         <source>Warning: Private keys detected in wallet {%s} with disabled private keys</source>
         <translation type="unfinished">경고: 비활성화된 개인키 지갑 {%s} 에서 개인키들이 발견되었습니다</translation>
     </message>
     <message>
-        <source>Warning: We do not appear to fully agree with our peers! You may need to upgrade, or other nodes may need to upgrade.</source>
-        <translation type="unfinished">경고: 현재 비트코인 버전이 다른 네트워크 참여자들과 동일하지 않은 것 같습니다. 당신 또는 다른 참여자들이 동일한 비트코인 버전으로 업그레이드 할 필요가 있습니다.</translation>
+        <source>Witness data for blocks after height %d requires validation. Please restart with -reindex.</source>
+        <translation type="unfinished">블록 높이%d 이후의 증인(witness) 데이터가 검증을 필요로 합니다. -reindex 옵션을 사용하여 다시 시작해 주십시오.</translation>
     </message>
     <message>
         <source>You need to rebuild the database using -reindex to go back to unpruned mode.  This will redownload the entire blockchain</source>
@@ -4013,6 +4224,10 @@ Go to File &gt; Open Wallet to load a wallet.
         <source>-maxmempool must be at least %d MB</source>
         <translation type="unfinished">-maxmempool은 최소한 %d MB 이어야 합니다</translation>
     </message>
+    <message>
+        <source>Cannot obtain a lock on directory %s. %s is probably already running.</source>
+        <translation type="unfinished">디렉토리 %s 에 락을 걸 수 없습니다. %s가 이미 실행 중인 것으로 보입니다.</translation>
+    </message>
     <message>
         <source>Cannot resolve -%s address: '%s'</source>
         <translation type="unfinished">%s 주소를 확인할 수 없습니다: '%s'</translation>
@@ -4025,6 +4240,48 @@ Go to File &gt; Open Wallet to load a wallet.
         <source>Cannot set -peerblockfilters without -blockfilterindex.</source>
         <translation type="unfinished">-blockfilterindex는 -peerblockfilters 없이 사용할 수 없습니다.</translation>
     </message>
+    <message>
+        <source>%s is set very high! Fees this large could be paid on a single transaction.</source>
+        <translation type="unfinished">%s의 설정값이 매우 높습니다! 이렇게 큰 수수료는 하나의 거래로도 지불 될 수 있습니다. </translation>
+    </message>
+    <message>
+        <source>Cannot provide specific connections and have addrman find outgoing connections at the same time.</source>
+        <translation type="unfinished">특정 연결을 직접 지정하면서 동시에 addrman(주소 관리자)이 아웃바운드 연결을 찾도록 할 수는 없습니다.</translation>
+    </message>
+    <message>
+        <source>Error loading %s: External signer wallet being loaded without external signer support compiled</source>
+        <translation type="unfinished">'%s'을 불러오는 중 오류가 발생 : 외부 서명기 지원이 포함되지 않은 실행 파일에서 외부 서명기 지갑을 열고 있습니다.</translation>
+    </message>
+    <message>
+        <source>Error reading %s! All keys read correctly, but transaction data or address metadata may be missing or incorrect.</source>
+        <translation type="unfinished">%s오류를 읽고있습니다! 모든 키는 올바르게 읽혔지만, 트랜잭션 데이터나 주소 메타데이터가 누락되었거나 잘못되었을 수 있습니다.</translation>
+    </message>
+    <message>
+        <source>Error: Address book data in wallet cannot be identified to belong to migrated wallets</source>
+        <translation type="unfinished">오류: 지갑의 주소록 데이터가 마이그레이션된 지갑에 속하는 것으로 식별될 수 없습니다.</translation>
+    </message>
+    <message>
+        <source>Error: Duplicate descriptors created during migration. Your wallet may be corrupted.</source>
+        <translation type="unfinished">오류: 마이그레이션을 하는 동안 중복된 디스크립터가 생성이 되었습니다. 당신의 지갑에 손상이 되었을 수 있습니다.</translation>
+    </message>
+    <message>
+        <source>Error: Transaction %s in wallet cannot be identified to belong to migrated wallets</source>
+        <translation type="unfinished">오류: 지갑에 있는 %s 트랜잭션을 마이그레이션된 지갑에 포함된 것으로 식별할 수 없습니다.</translation>
+    </message>
+    <message>
+        <source>Failed to remove snapshot chainstate dir (%s). Manually remove it before restarting.
+</source>
+        <translation type="unfinished">스냅샷 체인스테이트 디렉터리(%s)를 삭제하지 못했습니다. 다시 시작하기 전에 수동으로 해당 디렉터리를 제거해 주십시오.
+</translation>
+    </message>
+    <message>
+        <source>Failed to rename invalid peers.dat file. Please move or delete it and try again.</source>
+        <translation type="unfinished">유효하지 않은 peers.dat 파일의 이름을 변경하지 못했습니다. 해당 파일을 이동하거나 삭제한 뒤 다시 시도해 주십시오.</translation>
+    </message>
+    <message>
+        <source>Fee estimation failed. Fallbackfee is disabled. Wait a few blocks or enable %s.</source>
+        <translation type="unfinished">수수료 추정에 실패했습니다. 폴백 수수료(Fallbackfee)가 비활성화되어 있습니다. 몇 블록 기다리거나 %s을 활성화하세요.</translation>
+    </message>
     <message>
         <source>Flushing block file to disk failed. This is likely the result of an I/O error.</source>
         <translation type="unfinished">블록 파일을 디스크에 기록하는 데 실패했습니다. 이는 I/O 오류로 인한 것일 가능성이 높습니다.</translation>
@@ -4033,17 +4290,72 @@ Go to File &gt; Open Wallet to load a wallet.
         <source>Flushing undo file to disk failed. This is likely the result of an I/O error.</source>
         <translation type="unfinished">Undo 파일을 디스크에 기록하는 데 실패했습니다. 이는 I/O 오류로 인한 것일 가능성이 높습니다.</translation>
     </message>
+    <message>
+        <source>Incompatible options: -dnsseed=1 was explicitly specified, but -onlynet forbids connections to IPv4/IPv6</source>
+        <translation type="unfinished">비호환 옵션입니다: -dnsseed=1 옵션이 명시적으로 설정되었지만 -onlynet 설정이 IPv4/IPv6 연결을 금지하고 있습니다.</translation>
+    </message>
+    <message>
+        <source>Invalid amount for %s=&lt;amount&gt;: '%s' (must be at least the minrelay fee of %s to prevent stuck transactions)</source>
+        <translation type="unfinished">%s=&lt;amount&gt; 옵션에 잘못된 금액이 지정되었습니다: '%s'. 트랜잭션이 ‘stuck(멈춤)’되지 않으려면 최소 릴레이 수수료(minrelay fee)인 %s이상이어야 합니다.</translation>
+    </message>
+    <message>
+        <source>Maximum transaction weight is less than transaction weight without inputs</source>
+        <translation type="unfinished">최대 트랜잭션 가중치가 입력이 없는 트랜잭션의 가중치보다 작습니다.</translation>
+    </message>
+    <message>
+        <source>Maximum transaction weight is too low, can not accommodate change output</source>
+        <translation type="unfinished">최대 트랜잭션 가중치가 너무 낮아 거스름돈 출력을 포함할 수 없습니다.</translation>
+    </message>
+    <message>
+        <source>Option '-checkpoints' is set but checkpoints were removed. This option has no effect.</source>
+        <translation type="unfinished">‘-checkpoints’ 옵션이 설정되어 있지만 체크포인트 기능은 제거되었습니다. 이 옵션은 더 이상 아무 효과가 없습니다</translation>
+    </message>
     <message>
         <source>Outbound connections restricted to CJDNS (-onlynet=cjdns) but -cjdnsreachable is not provided</source>
         <translation type="unfinished">아웃바운드 연결이 CJDNS(-onlynet=cjdns)로 제한되었지만, -cjdnsreachable 옵션이 입력되지 않았습니다.</translation>
     </message>
+    <message>
+        <source>Outbound connections restricted to Tor (-onlynet=onion) but the proxy for reaching the Tor network is explicitly forbidden: -onion=0</source>
+        <translation type="unfinished">Tor 전용 연결(-onlynet=onion)로 아웃바운드 연결이 제한되어 있지만, Tor 네트워크에 접근하기 위한 프록시는 명시적으로 금지되어 있습니다: -onion=0</translation>
+    </message>
+    <message>
+        <source>Outbound connections restricted to Tor (-onlynet=onion) but the proxy for reaching the Tor network is not provided: none of -proxy, -onion or -listenonion is given</source>
+        <translation type="unfinished"> Tor 전용(-onlynet=onion) 네트워크 모드로 아웃바운드 연결이 제한되어 있지만,
+Tor 네트워크에 연결하기 위한 프록시 설정이 제공되지 않았습니다. -proxy, -onion, 또는 -listenonion 중 어느 옵션도 지정되지 않았습니다.</translation>
+    </message>
+    <message>
+        <source>Outbound connections restricted to i2p (-onlynet=i2p) but -i2psam is not provided</source>
+        <translation type="unfinished">아웃바운드 연결이 I2P 전용(-onlynet=i2p)으로 제한되어 있지만, I2P 네트워크에 접근하기 위한 SAM 게이트웨이(-i2psam)가 설정되지 않았습니다.</translation>
+    </message>
+    <message>
+        <source>Prune: last wallet synchronisation goes beyond pruned data. You need to -reindex (download the whole blockchain again in case of a pruned node)</source>
+        <translation type="unfinished">프루닝 모드: 마지막 지갑 동기화가 이미 프루닝된 데이터 범위를 넘어섰습니다. 이 문제를 해결하려면 -reindex가 필요합니다 (프루닝 노드인 경우 전체 블록체인을 다시 다운로드하게 됩니다).</translation>
+    </message>
+    <message>
+        <source>Rename of '%s' -&gt; '%s' failed. Cannot clean up the background chainstate leveldb directory.</source>
+        <translation type="unfinished">‘%s’ → ‘%s’ 로 이름을 변경하는 데 실패했습니다. 백그라운드 체인스테이트(chainstate) LevelDB 디렉터리를 정리 할 수 없습니다.</translation>
+    </message>
+    <message>
+        <source>Specified -blockmaxweight (%d) exceeds consensus maximum block weight (%d)</source>
+        <translation type="unfinished">지정된 -blockmaxweight 값(%d)이 합의(컨센서스)에서 허용하는 최대 블록 weight(%d)를 초과했습니다.</translation>
+    </message>
+    <message>
+        <source>Specified -blockreservedweight (%d) exceeds consensus maximum block weight (%d)</source>
+        <translation type="unfinished">지정된 -blockreservedweight 값(%d)이 합의 규칙에서 허용하는 최대 블록 weight(%d)를 초과했습니다.</translation>
+    </message>
+    <message>
+        <source>Specified -blockreservedweight (%d) is lower than minimum safety value of (%d)</source>
+        <translation type="unfinished">지정된 -blockreservedweight(%d) 값이 최소 안전값(%d)보다 낮습니다.
+
+ </translation>
+    </message>
     <message>
         <source>The combination of the pre-selected inputs and the wallet automatic inputs selection exceeds the transaction maximum weight. Please try sending a smaller amount or manually consolidating your wallet's UTXOs</source>
-        <translation type="unfinished">사전에 선택된 입력과 지갑의 자동 입력 선택이 결합되어 트랜잭션 최대 웨이트(weight)를 초과했습니다. 더 작은 금액을 보내거나 지갑의 UTXO들을 수동으로 통합하고 나서 시도해 주세요.</translation>
+        <translation type="unfinished">사전에 선택된 입력과 지갑의 자동 입력 선택이 결합되어 트랜잭션 최대 웨이트(weight)를 초과했습니다. 더 작은 금액을 보내거나 지갑의 UTXOs를 수동으로 통합하고 나서 시도해 주세요.</translation>
     </message>
     <message>
         <source>The inputs size exceeds the maximum weight. Please try sending a smaller amount or manually consolidating your wallet's UTXOs</source>
-        <translation type="unfinished">입력 크기가 최대 웨이트(weight) 를 초과했습니다. 더 작은 금액을 보내거나 지갑의 UTXO들을 수동으로 정리한 뒤 다시 시도해 주세요.</translation>
+        <translation type="unfinished">입력 크기가 최대 웨이트(weight) 를 초과했습니다. 더 작은 금액을 보내거나 지갑의 UTXOs를 수동으로 정리한 뒤 다시 시도해 주세요.</translation>
     </message>
     <message>
         <source>The preselected coins total amount does not cover the transaction target. Please allow other inputs to be automatically selected or include more coins manually</source>
@@ -4053,18 +4365,76 @@ Go to File &gt; Open Wallet to load a wallet.
         <source>UTXO snapshot failed to validate. Restart to resume normal initial block download, or try loading a different snapshot.</source>
         <translation type="unfinished">UTXO 스냅샷 검증에 실패했습니다. 정상적인 초기 블록 다운로드(IBD)를 재개하려면 다시 시작하거나 다른 스냅샷을 불러오세요.</translation>
     </message>
+    <message>
+        <source>Unconfirmed UTXOs are available, but spending them creates a chain of transactions that will be rejected by the mempool</source>
+        <translation type="unfinished">미확인 UTXOs의 사용이 가능하지만 , 그러한 UTXOs를 사용하여 소비하면 트랜잭션 체인이 형성되고 메모풀에 의해 거부될 것입니다.</translation>
+    </message>
+    <message>
+        <source>Unexpected legacy entry in descriptor wallet found. Loading wallet %s
+
+The wallet might have been tampered with or created with malicious intent.
+</source>
+        <translation type="unfinished">디스크립터 지갑에서 예상치 못한 레거시 항목이 발견되었습니다. 지갑 %s을 불러옵니다.
+
+이 지갑은 변조되었거나 악의적인 의도로 생성되었을 가능성이 있습니다.
+</translation>
+    </message>
+    <message>
+        <source>Your computer's date and time appear to be more than %d minutes out of sync with the network, this may lead to consensus failure. After you've confirmed your computer's clock, this message should no longer appear when you restart your node. Without a restart, it should stop showing automatically after you've connected to a sufficient number of new outbound peers, which may take some time. You can inspect the `timeoffset` field of the `getpeerinfo` and `getnetworkinfo` RPC methods to get more info.</source>
+        <translation type="unfinished">당신의 컴퓨터 날짜, 시간이 네트워크와 %d분 이상 동기화되지 않은 것으로 보이며 이는 합의 실패로 이어질 수 있습니다. 컴퓨터의 시계를 확인하고 수정한 후 노드를 다시 시작하면 이 메시지는 더 이상 표시되지 않을 것입니다. 재시작을 하지 않는 경우에는 충분한 수의 새로운 아웃바운드 피어로 연결된 뒤에 자동으로 표시가 중단되는데, 이 과정에서 시간이 조금 걸릴 수 있습니다. 추가 정보는 'getpeerinfo', 'getnetworkinfo' RPC 메서드의 'timeoffset' 필드를 확인해보면 알수 있습니다.</translation>
+    </message>
+    <message>
+        <source>
+Unable to cleanup failed migration</source>
+        <translation type="unfinished">
+실패한 마이그레이션을 정리하지 못했습니다.</translation>
+    </message>
+    <message>
+        <source>
+Unable to restore backup of wallet.</source>
+        <translation type="unfinished">
+지갑 백업을 복원할 수 없습니다.</translation>
+    </message>
     <message>
         <source>default wallet</source>
         <translation type="unfinished">기본 지갑</translation>
     </message>
+    <message>
+        <source>whitebind may only be used for incoming connections ("out" was passed)</source>
+        <translation type="unfinished">whitebind는 수신 연결에만 사용할 수 있습니다. (“out”이 전달되었습니다.)</translation>
+    </message>
+    <message>
+        <source>A fatal internal error occurred, see debug.log for details: </source>
+        <translation type="unfinished">치명적인 내부 오류가 발생했으니, 자세한 내용은 debug.log를 참조하세요 :</translation>
+    </message>
+    <message>
+        <source>Assumeutxo data not found for the given blockhash '%s'.</source>
+        <translation type="unfinished">오류: 지정한 블록 해시 ‘%s’의 AssumeUTXO 데이터가 존재하지 않습니다.</translation>
+    </message>
     <message>
         <source>Block verification was interrupted</source>
         <translation type="unfinished">블록 검증이 중단되었음</translation>
     </message>
+    <message>
+        <source>Can't spend unconfirmed version %d pre-selected input with a version 3 tx</source>
+        <translation type="unfinished">버전 %d의 확인되지 않은 사전 선택 입력은 버전 3 트랜잭션에서 사용할 수 없습니다.</translation>
+    </message>
+    <message>
+        <source>Can't spend unconfirmed version 3 pre-selected input with a version %d tx</source>
+        <translation type="unfinished">버전 3의 사전 선택된 입력이 아직 컨펌되지 않은 상태일 때 해당 입력을 버전 %d 트랜잭션으로는 사용할 수 없습니다.</translation>
+    </message>
+    <message>
+        <source>Cannot write to directory '%s'; check permissions.</source>
+        <translation type="unfinished">디렉터리 ‘%s’에 쓸 수 없습니다; 권한을 확인하세요.</translation>
+    </message>
     <message>
         <source>Config setting for %s only applied on %s network when in [%s] section.</source>
         <translation type="unfinished">%s의 설정은 %s 네트워크에만 적용되는 데, 이는 [%s] 항목에 있을 경우 뿐 입니다.</translation>
     </message>
+    <message>
+        <source>Corrupt block found indicating potential hardware failure.</source>
+        <translation type="unfinished">하드웨어 오류가 발생했을 가능성을 나타내는 손상된 블록이 발견되었습니다.</translation>
+    </message>
     <message>
         <source>Corrupted block database detected</source>
         <translation type="unfinished">손상된 블록 데이터베이스가 감지되었습니다</translation>
@@ -4073,10 +4443,18 @@ Go to File &gt; Open Wallet to load a wallet.
         <source>Could not find asmap file %s</source>
         <translation type="unfinished">asmap file %s 을 찾을 수 없습니다</translation>
     </message>
+    <message>
+        <source>Could not generate scriptPubKeys (cache is empty)</source>
+        <translation type="unfinished">scriptPubKey를 생성할 수 없습니다 (캐시가 비어 있음).</translation>
+    </message>
     <message>
         <source>Could not parse asmap file %s</source>
         <translation type="unfinished">asmap file %s 을 파싱할 수 없습니다</translation>
     </message>
+    <message>
+        <source>Could not top up scriptPubKeys</source>
+        <translation type="unfinished">scriptPubKey를 확보하지 못했습니다.</translation>
+    </message>
     <message>
         <source>Disk space is too low!</source>
         <translation type="unfinished">디스크 용량이 부족함!</translation>
@@ -4093,10 +4471,6 @@ Go to File &gt; Open Wallet to load a wallet.
         <source>Elliptic curve cryptography sanity check failure. %s is shutting down.</source>
         <translation type="unfinished">타원 곡선 암호(ECC) 정합성 검사 실패. %s가 종료됩니다.</translation>
     </message>
-    <message>
-        <source>Error creating %s</source>
-        <translation type="unfinished">만들기 오류 %s</translation>
-    </message>
     <message>
         <source>Error initializing block database</source>
         <translation type="unfinished">블록 데이터베이스 초기화 오류 발생</translation>
@@ -4105,10 +4479,6 @@ Go to File &gt; Open Wallet to load a wallet.
         <source>Error loading %s</source>
         <translation type="unfinished">%s 불러오기 오류 발생</translation>
     </message>
-    <message>
-        <source>Error loading %s: Private keys can only be disabled during creation</source>
-        <translation type="unfinished">%s 불러오기 오류: 개인키는 생성할때만 비활성화 할 수 있습니다</translation>
-    </message>
     <message>
         <source>Error loading %s: Wallet corrupted</source>
         <translation type="unfinished">%s 불러오기 오류: 지갑이 손상됨</translation>
@@ -4133,6 +4503,10 @@ Go to File &gt; Open Wallet to load a wallet.
         <source>Error opening coins database</source>
         <translation type="unfinished">코인 데이터 베이스 열기 오류</translation>
     </message>
+    <message>
+        <source>Error reading configuration file: %s</source>
+        <translation type="unfinished">다음 설정 파일을 읽는 중 오류가 발생했습니다 : %s</translation>
+    </message>
     <message>
         <source>Error reading from database, shutting down.</source>
         <translation type="unfinished">데이터베이스를 불러오는데 오류가 발생하였습니다, 곧 종료됩니다.</translation>
@@ -4141,10 +4515,34 @@ Go to File &gt; Open Wallet to load a wallet.
         <source>Error reading next record from wallet database</source>
         <translation type="unfinished">지갑 데이터베이스에서 다음 기록을 불러오는데 오류가 발생하였습니다.</translation>
     </message>
+    <message>
+        <source>Error: Cannot extract destination from the generated scriptpubkey</source>
+        <translation type="unfinished">오류: 생성된 scriptPubKey에서 목적 주소(destination)를 추출할 수 없습니다.</translation>
+    </message>
+    <message>
+        <source>Error: Couldn't create cursor into database</source>
+        <translation type="unfinished">오류: 데이터베이스에서 커서를 생성할 수 없습니다.</translation>
+    </message>
     <message>
         <source>Error: Disk space is low for %s</source>
         <translation type="unfinished">오류: %s 하기엔 저장공간이 부족합니다</translation>
     </message>
+    <message>
+        <source>Error: Dumpfile checksum does not match. Computed %s, expected %s</source>
+        <translation type="unfinished">오류 : 덤프파일 체크썸이 일치하지 않습니다. "%s"이 아닌 "%s"로 계산되었습니다.</translation>
+    </message>
+    <message>
+        <source>Error: Failed to create new watchonly wallet</source>
+        <translation type="unfinished">오류: 새로운 watch-only 지갑을 생성하지 못했습니다.</translation>
+    </message>
+    <message>
+        <source>Error: Got key that was not hex: %s</source>
+        <translation type="unfinished">오류: 16진수(hex) 형식이 아닌 다음의 키를 받았습니다 : %s</translation>
+    </message>
+    <message>
+        <source>Error: Got value that was not hex: %s</source>
+        <translation type="unfinished">오류: 16진수(hex) 형식이 아닌 다음의 값을 받았습니다 : %s</translation>
+    </message>
     <message>
         <source>Error: Keypool ran out, please call keypoolrefill first</source>
         <translation type="unfinished">오류: 키풀이 바닥남, 키풀 리필을 먼저 호출할 하십시오</translation>
@@ -4153,18 +4551,94 @@ Go to File &gt; Open Wallet to load a wallet.
         <source>Error: Missing checksum</source>
         <translation type="unfinished">오류: 체크섬 누락</translation>
     </message>
+    <message>
+        <source>Error: No %s addresses available.</source>
+        <translation type="unfinished">오류: %s 주소 사용 불가</translation>
+    </message>
+    <message>
+        <source>Error: Not all address book records were migrated</source>
+        <translation type="unfinished">오류: 모든 주소록(Address Book) 기록이 마이그레이션되지 않았습니다.</translation>
+    </message>
+    <message>
+        <source>Error: Not all transaction records were migrated</source>
+        <translation type="unfinished">오류: 모든 트랜잭션 기록이 마이그레이션되지 않았습니다.</translation>
+    </message>
     <message>
         <source>Error: This wallet already uses SQLite</source>
         <translation type="unfinished">오류: 이 지갑은 이미 SQLite를 사용하고 있음</translation>
     </message>
+    <message>
+        <source>Error: This wallet is already a descriptor wallet</source>
+        <translation type="unfinished">오류: 이 지갑은 이미 디스크립터 지갑입니다.</translation>
+    </message>
+    <message>
+        <source>Error: Unable to begin reading all records in the database</source>
+        <translation type="unfinished">오류: 데이터베이스에서의 모든 레코드 읽기를 시작할 수 없습니다.</translation>
+    </message>
+    <message>
+        <source>Error: Unable to make a backup of your wallet</source>
+        <translation type="unfinished">오류: 지갑의 백업을 만들 수 없습니다.</translation>
+    </message>
+    <message>
+        <source>Error: Unable to parse version %u as a uint32_t</source>
+        <translation type="unfinished">오류: 버전%u을 uint32_t로 파싱 할 수 없습니다.</translation>
+    </message>
+    <message>
+        <source>Error: Unable to read all records in the database</source>
+        <translation type="unfinished">오류: 데이터베이스에 있는 모든 기록들을 읽을 수 없습니다.</translation>
+    </message>
+    <message>
+        <source>Error: Unable to read wallet's best block locator record</source>
+        <translation type="unfinished">오류: 지갑의 최신 블록 위치 기록(best block locator) 레코드를 읽을 수 없습니다.</translation>
+    </message>
+    <message>
+        <source>Error: Unable to remove watchonly address book data</source>
+        <translation type="unfinished">오류: watch-only 주소록 데이터를 제거할 수 없습니다.</translation>
+    </message>
+    <message>
+        <source>Error: Unable to write data to disk for wallet %s</source>
+        <translation type="unfinished">오류: 지갑 %s의 데이터를 디스크에 쓸 수 없습니다.</translation>
+    </message>
     <message>
         <source>Error: Unable to write record to new wallet</source>
         <translation type="unfinished">오류: 새로운 지갑에 기록하지 못했습니다.</translation>
     </message>
+    <message>
+        <source>Error: Unable to write solvable wallet best block locator record</source>
+        <translation type="unfinished">오류: solvable 지갑의 최신 블록 위치 (best block locator) 기록을 저장할 수 없습니다.</translation>
+    </message>
+    <message>
+        <source>Error: Unable to write watchonly wallet best block locator record</source>
+        <translation type="unfinished">오류: watch-only 지갑의 최신 블록 위치(best block locator) 기록을 저장할 수 없습니다.</translation>
+    </message>
+    <message>
+        <source>Error: database transaction cannot be executed for wallet %s</source>
+        <translation type="unfinished">오류: 지갑 %s에 대해 데이터베이스 트랜잭션을 실행할 수 없습니다.</translation>
+    </message>
+    <message>
+        <source>Failed to acquire rescan reserver during wallet initialization</source>
+        <translation type="unfinished">오류: 지갑 초기화 중 리스캔 예약(rescan reserver)을 확보하지 못했습니다.</translation>
+    </message>
+    <message>
+        <source>Failed to close block undo file.</source>
+        <translation type="unfinished">되돌리기(undo) 파일을 닫는 데 실패했습니다.</translation>
+    </message>
+    <message>
+        <source>Failed to close file when writing block.</source>
+        <translation type="unfinished">블록을 기록하는 중 파일을 닫는 데 실패했습니다.</translation>
+    </message>
+    <message>
+        <source>Failed to disconnect block.</source>
+        <translation type="unfinished">ㅂ</translation>
+    </message>
     <message>
         <source>Failed to listen on any port. Use -listen=0 if you want this.</source>
         <translation type="unfinished">포트 연결에 실패하였습니다. 필요하다면 -리슨=0 옵션을 사용하십시오.</translation>
     </message>
+    <message>
+        <source>Failed to read block.</source>
+        <translation type="unfinished">블록을 읽는 데 실패했습니다.</translation>
+    </message>
     <message>
         <source>Failed to rescan the wallet during initialization</source>
         <translation type="unfinished">지갑 스캔 오류</translation>
@@ -4173,6 +4647,18 @@ Go to File &gt; Open Wallet to load a wallet.
         <source>Failed to verify database</source>
         <translation type="unfinished">데이터베이스를 검증 실패</translation>
     </message>
+    <message>
+        <source>Failed to write block.</source>
+        <translation type="unfinished">블록을 쓰는 데 실패했습니다.</translation>
+    </message>
+    <message>
+        <source>Failed to write undo data.</source>
+        <translation type="unfinished">되돌리기(undo) 데이터에 쓰기 데 실패했습니다.</translation>
+    </message>
+    <message>
+        <source>Failure removing transaction: %s</source>
+        <translation type="unfinished">다음 트랜잭션을 제거하는 데 실패했습니다: %s</translation>
+    </message>
     <message>
         <source>Fee rate (%s) is lower than the minimum fee rate setting (%s)</source>
         <translation type="unfinished">수수료율 (%s)이 최소 수수료율 설정 (%s)보다 낮습니다.</translation>
@@ -4189,6 +4675,14 @@ Go to File &gt; Open Wallet to load a wallet.
         <source>Initialization sanity check failed. %s is shutting down.</source>
         <translation type="unfinished">무결성 확인 초기화에 실패하였습니다. %s가 곧 종료됩니다.</translation>
     </message>
+    <message>
+        <source>Input not found or already spent</source>
+        <translation type="unfinished">입력을 찾을 수 없거나 이미 사용되었습니다.</translation>
+    </message>
+    <message>
+        <source>Insufficient dbcache for block verification</source>
+        <translation type="unfinished">블록 검증을 위한 db캐시(dbcache)가 부족합니다.</translation>
+    </message>
     <message>
         <source>Insufficient funds</source>
         <translation type="unfinished">잔액이 부족합니다</translation>
@@ -4209,6 +4703,10 @@ Go to File &gt; Open Wallet to load a wallet.
         <source>Invalid P2P permission: '%s'</source>
         <translation type="unfinished">잘못된 P2P 권한: '%s'</translation>
     </message>
+    <message>
+        <source>Invalid amount for %s=&lt;amount&gt;: '%s'</source>
+        <translation type="unfinished">유요하지 않은 금액 %s=&lt;amount&gt;:'%s'</translation>
+    </message>
     <message>
         <source>Invalid amount for -%s=&lt;amount&gt;: '%s'</source>
         <translation type="unfinished">유효하지 않은 금액 -%s=&lt;amount&gt;: '%s'</translation>
@@ -4217,6 +4715,14 @@ Go to File &gt; Open Wallet to load a wallet.
         <source>Invalid netmask specified in -whitelist: '%s'</source>
         <translation type="unfinished">유효하지 않은 넷마스크가 -whitelist: '%s" 를 통해 지정됨</translation>
     </message>
+    <message>
+        <source>Invalid port specified in %s: '%s'</source>
+        <translation type="unfinished">%s에서 특정 포트가 유요하지 않음: '%s'</translation>
+    </message>
+    <message>
+        <source>Listening for incoming connections failed (listen returned error %s)</source>
+        <translation type="unfinished">오류: 들어오는 연결 대기 실패 (listen 콜 오류 %s반환)</translation>
+    </message>
     <message>
         <source>Loading P2P addresses…</source>
         <translation type="unfinished">P2P 주소를 불러오는 중...</translation>
@@ -4233,10 +4739,38 @@ Go to File &gt; Open Wallet to load a wallet.
         <source>Loading wallet…</source>
         <translation type="unfinished">지갑을 불러오는 중...</translation>
     </message>
+    <message>
+        <source>Maximum transaction weight must be between %d and %d</source>
+        <translation type="unfinished">최대 트랜잭션 가중치(weight)는 반드시 %d과 %d 사이에 있어야 합니다.</translation>
+    </message>
+    <message>
+        <source>Missing amount</source>
+        <translation type="unfinished">금액이 누락되었습니다.</translation>
+    </message>
+    <message>
+        <source>Missing solving data for estimating transaction size</source>
+        <translation type="unfinished">트랜잭션 크기를 추정하기 위한 해결 데이터(solving data)가 누락되었습니다.</translation>
+    </message>
     <message>
         <source>Need to specify a port with -whitebind: '%s'</source>
         <translation type="unfinished">-whitebind: '%s' 를 이용하여 포트를 지정해야 합니다</translation>
     </message>
+    <message>
+        <source>No addresses available</source>
+        <translation type="unfinished">사용가능한 주소가 없습니다.</translation>
+    </message>
+    <message>
+        <source>Not found pre-selected input %s</source>
+        <translation type="unfinished">사전 선택된 입력 %s을 찾을 수 없습니다.</translation>
+    </message>
+    <message>
+        <source>Not solvable pre-selected input %s</source>
+        <translation type="unfinished">사전 선택된 입력 %s을 찾을 수 없습니다.</translation>
+    </message>
+    <message>
+        <source>Only direction was set, no permissions: '%s'</source>
+        <translation type="unfinished">방향만 설정되었고, 권한은 설정되지 않았습니다: '%s'</translation>
+    </message>
     <message>
         <source>Prune cannot be configured with a negative value.</source>
         <translation type="unfinished">블록 축소는 음수로 설정할 수 없습니다.</translation>
@@ -4281,6 +4815,18 @@ Go to File &gt; Open Wallet to load a wallet.
         <source>Section [%s] is not recognized.</source>
         <translation type="unfinished">[%s] 항목은 인정되지 않습니다.</translation>
     </message>
+    <message>
+        <source>Signer did not echo address</source>
+        <translation type="unfinished">서명기가 주소를 반환하지 않았습니다.</translation>
+    </message>
+    <message>
+        <source>Signer echoed unexpected address %s</source>
+        <translation type="unfinished">서명기가 예상치 못한 주소 %s를 반환했습니다.</translation>
+    </message>
+    <message>
+        <source>Signer returned error: %s</source>
+        <translation type="unfinished">서명기가 다음 오류를 반환했습니다 : %s</translation>
+    </message>
     <message>
         <source>Signing transaction failed</source>
         <translation type="unfinished">거래 서명에 실패했습니다</translation>
@@ -4301,22 +4847,54 @@ Go to File &gt; Open Wallet to load a wallet.
         <source>Specified blocks directory "%s" does not exist.</source>
         <translation type="unfinished">지정한 블록 디렉토리 "%s" 가 존재하지 않습니다.</translation>
     </message>
+    <message>
+        <source>Specified data directory "%s" does not exist.</source>
+        <translation type="unfinished">특정 데이터 경로 "%s"가 존재하지 않습니다.</translation>
+    </message>
     <message>
         <source>Starting network threads…</source>
         <translation type="unfinished">네트워크 스레드 시작중...</translation>
     </message>
+    <message>
+        <source>System error while flushing: %s</source>
+        <translation type="unfinished">플러싱을 하는동안 다음 시스템 에러가 발생했습니다 : %s</translation>
+    </message>
+    <message>
+        <source>System error while loading external block file: %s</source>
+        <translation type="unfinished">외부 블록 파일을 로딩하면서 다음 시스템 오류가 발생했습니다 : %s </translation>
+    </message>
+    <message>
+        <source>System error while saving block to disk: %s</source>
+        <translation type="unfinished">디스크에 블록을 저장하면서 다음 시스템 오류가 발생했습니다 : %s </translation>
+    </message>
+    <message>
+        <source>The %s path uses exFAT, which is known to have intermittent corruption problems on macOS. Move this directory to a different filesystem to avoid data loss.</source>
+        <translation type="unfinished">%s 경로는 exFAT 파일 시스템을 사용하고 있이며 이 파일 시스템은 macOS에서 간헐적으로 데이터 손상 문제가 발생하는 것으로 알려져 있습니다. 데이터 손실을 방지하려면 이 디렉터리를 다른 파일 시스템으로 옮기세요.</translation>
+    </message>
     <message>
         <source>The source code is available from %s.</source>
         <translation type="unfinished">소스코드는 %s 에서 확인하실 수 있습니다.</translation>
     </message>
+    <message>
+        <source>The specified config file %s does not exist</source>
+        <translation type="unfinished">특정 구성파일 %s은 존재하지 않습니다.</translation>
+    </message>
     <message>
         <source>The transaction amount is too small to pay the fee</source>
         <translation type="unfinished">거래액이 수수료를 지불하기엔 너무 작습니다</translation>
     </message>
+    <message>
+        <source>The transactions removal process can only be executed within a db txn</source>
+        <translation type="unfinished">트랜잭션 제거 프로세스는 데이터베이스 트랜잭션 내에서만 실행할 수 있습니다.</translation>
+    </message>
     <message>
         <source>The wallet will avoid paying less than the minimum relay fee.</source>
         <translation type="unfinished">지갑은 최소 중계 수수료보다 적은 금액을 지불하는 것을 피할 것입니다.</translation>
     </message>
+    <message>
+        <source>There is no ScriptPubKeyManager for this address</source>
+        <translation type="unfinished">이 주소에 대해 ScriptPubKeyManager가 존재하지 않습니다.</translation>
+    </message>
     <message>
         <source>This is experimental software.</source>
         <translation type="unfinished">이 소프트웨어는 시험적입니다.</translation>
@@ -4326,8 +4904,8 @@ Go to File &gt; Open Wallet to load a wallet.
         <translation type="unfinished">이것은 모든 거래에서 지불하는 최소 거래 수수료입니다.</translation>
     </message>
     <message>
-        <source>This is the transaction fee you will pay if you send a transaction.</source>
-        <translation type="unfinished">이것은 거래를 보낼 경우 지불 할 거래 수수료입니다.</translation>
+        <source>Transaction %s does not belong to this wallet</source>
+        <translation type="unfinished">%s 트랜잭션은 이 지갑에 포함되지 않습니다.</translation>
     </message>
     <message>
         <source>Transaction amount too small</source>
@@ -4337,10 +4915,18 @@ Go to File &gt; Open Wallet to load a wallet.
         <source>Transaction amounts must not be negative</source>
         <translation type="unfinished">거래액은 반드시 0보다 큰 값이어야 합니다.</translation>
     </message>
+    <message>
+        <source>Transaction change output index out of range</source>
+        <translation type="unfinished">트랜잭션의 잔돈은 출력 인덱스 범위를 벗어났습니다.</translation>
+    </message>
     <message>
         <source>Transaction must have at least one recipient</source>
         <translation type="unfinished">거래에는 최소한 한명의 수령인이 있어야 합니다.</translation>
     </message>
+    <message>
+        <source>Transaction needs a change address, but we can't generate it.</source>
+        <translation type="unfinished">트랜잭션에 거스름돈 주소가 필요하지만 이를 생성할 수 없습니다.</translation>
+    </message>
     <message>
         <source>Transaction too large</source>
         <translation type="unfinished">거래가 너무 큽니다</translation>
@@ -4365,6 +4951,10 @@ Go to File &gt; Open Wallet to load a wallet.
         <source>Unable to open %s for writing</source>
         <translation type="unfinished">%s을 쓰기 위하여 열 수 없습니다.</translation>
     </message>
+    <message>
+        <source>Unable to parse -maxuploadtarget: '%s'</source>
+        <translation type="unfinished">-maxuploadtarget 의 다음 값을 파싱 할 수 없습니다 : '%s'</translation>
+    </message>
     <message>
         <source>Unable to start HTTP server. See debug log for details.</source>
         <translation type="unfinished">HTTP 서버를 시작할 수 없습니다. 자세한 사항은 디버그 로그를 확인 하세요.</translation>
@@ -4389,10 +4979,61 @@ Go to File &gt; Open Wallet to load a wallet.
         <source>Unknown new rules activated (versionbit %i)</source>
         <translation type="unfinished">알 수 없는 새로운 규칙이 활성화 되었습니다. (versionbit %i)</translation>
     </message>
+    <message>
+        <source>Unrecognised option "%s" provided in -test=&lt;option&gt;.</source>
+        <translation type="unfinished">-test=&lt;option&gt; 옵션에 인식할 수 없는 값“%s”이 제공되었습니다.</translation>
+    </message>
+    <message>
+        <source>Unsupported global logging level %s=%s. Valid values: %s.</source>
+        <translation type="unfinished">지원되지 않는 전역 로깅 레벨 %s=%s입니다. 유효한 값은 다음과 같습니다: %s.</translation>
+    </message>
+    <message>
+        <source>Wallet file creation failed: %s</source>
+        <translation type="unfinished">다음 지갑 파일 생성에 실패했습니다. :%s</translation>
+    </message>
+    <message>
+        <source>acceptstalefeeestimates is not supported on %s chain.</source>
+        <translation type="unfinished">acceptstalefeeestimates 는 %s 체인에서 지원되지 않습니다.</translation>
+    </message>
     <message>
         <source>Unsupported logging category %s=%s.</source>
         <translation type="unfinished">지원되지 않는 로깅 카테고리 %s = %s.</translation>
     </message>
+    <message>
+        <source>Error loading %s: Wallet is a legacy wallet. Please migrate to a descriptor wallet using the migration tool (migratewallet RPC).</source>
+        <translation type="unfinished">%s을 불러오는 중 오류: 해당 지갑은 ‘레거시(legacy) 지갑’입니다. migratewallet RPC를 사용하여 디스크립터(Descriptor) 지갑으로 마이그레이션 하세요.
+
+ </translation>
+    </message>
+    <message>
+        <source>Error: Dumpfile specifies an unsupported database format (%s). Only sqlite database dumps are supported</source>
+        <translation type="unfinished">오류: 덤프파일은 지원되지 않는 데이터베이스 형식(%s)지정하고 있습니다. 오직 SQLite 데이터베이스 덤프만 지원됩니다.</translation>
+    </message>
+    <message>
+        <source>Failed to calculate bump fees, because unconfirmed UTXOs depend on an enormous cluster of unconfirmed transactions.</source>
+        <translation type="unfinished">미확정 UTXO가 거대한 규모의 미확정 트랜잭션 클러스터에 의존하고 있기 때문에 수수료 인상 계산에 실패했습니다.</translation>
+    </message>
+    <message>
+        <source>Transaction requires one destination of non-zero value, a non-zero feerate, or a pre-selected input</source>
+        <translation type="unfinished">트랜잭션에는 0이 아닌 값의 하나 이상의 목적지 주소, 0이 아닌 수수료율, 또는 사전에 선택된 입력이 필요합니다.</translation>
+    </message>
+    <message>
+        <source>Unrecognized descriptor found. Loading wallet %s
+
+The wallet might have been created on a newer version.
+Please try running the latest software version.
+</source>
+        <translation type="unfinished">인식할 수 없는 디스크립터가 발견되었습니다. 지갑 %s를 불러옵니다. 이 지갑은 더 최신 버전의 소프트웨어에서 생성되었을 수 있습니다. 최신 버전의 소프트웨어를 실행해보세요.
+</translation>
+    </message>
+    <message>
+        <source>Do you want to rebuild the databases now?</source>
+        <translation type="unfinished">지금 데이터베이스를 다시 빌드하시겠습니까?</translation>
+    </message>
+    <message>
+        <source>Error: Could not add watchonly tx %s to watchonly wallet</source>
+        <translation type="unfinished">오류: 보기 전용 트랜잭션%s을 보기 전용 지갑에 추가할 수 없습니다.</translation>
+    </message>
     <message>
         <source>Error: Could not delete watchonly transactions. </source>
         <translation type="unfinished">오류: 보기전용 트랜젝션을 제거할 수 없습니다.</translation>
@@ -4405,6 +5046,22 @@ Go to File &gt; Open Wallet to load a wallet.
         <source>Error: cannot remove legacy wallet records</source>
         <translation type="unfinished">오류: 기존 지갑 기록을 삭제할 수 없습니다</translation>
     </message>
+    <message>
+        <source>Failed to start indexes, shutting down…</source>
+        <translation type="unfinished">인덱스를 시작하는 데 실패해서 종료합니다…</translation>
+    </message>
+    <message>
+        <source>Invalid -proxy address or hostname, ends with '=': '%s'</source>
+        <translation type="unfinished">잘못된 -proxy 주소 또는 호스트 이름입니다. '='로 끝납니다: ‘%s’</translation>
+    </message>
+    <message>
+        <source>Not enough file descriptors available. %d available, %d required.</source>
+        <translation type="unfinished">사용 가능한 파일 디스크립터가 충분하지 않습니다. %d개가 사용가능하고 필요한 개수는%d입니다.</translation>
+    </message>
+    <message>
+        <source>Unrecognized network in -proxy='%s': '%s'</source>
+        <translation type="unfinished">-proxy='%s'에서 인식할 수 없는 네트워크입니다: '%s'</translation>
+    </message>
     <message>
         <source>User Agent comment (%s) contains unsafe characters.</source>
         <translation type="unfinished">사용자 정의 코멘트 (%s)에 안전하지 못한 글자가 포함되어 있습니다.</translation>
diff --git a/src/qt/locale/bitcoin_ku.ts b/src/qt/locale/bitcoin_ku.ts
index 00f9fc1b13ae..b63e6af2f117 100644
--- a/src/qt/locale/bitcoin_ku.ts
+++ b/src/qt/locale/bitcoin_ku.ts
@@ -259,7 +259,7 @@ Signing is only possible with addresses of the type 'legacy'.</source>
     </message>
     <message>
         <source>Information</source>
-        <translation type="unfinished">Agahî</translation>
+        <translation type="unfinished">زانیاری</translation>
     </message>
     <message numerus="yes">
         <source>%n active connection(s) to Bitcoin network.</source>
@@ -435,10 +435,24 @@ Signing is only possible with addresses of the type 'legacy'.</source>
 </context>
 <context>
     <name>PSBTOperationsDialog</name>
+    <message numerus="yes">
+        <source>Signed %n input(s), but more signatures are still required.</source>
+        <translation type="unfinished">
+            <numerusform />
+            <numerusform />
+        </translation>
+    </message>
     <message>
         <source>or</source>
         <translation type="unfinished">یان</translation>
     </message>
+    <message numerus="yes">
+        <source>Transaction has %n unsigned input(s).</source>
+        <translation type="unfinished">
+            <numerusform />
+            <numerusform />
+        </translation>
+    </message>
     </context>
 <context>
     <name>PaymentServer</name>
diff --git a/src/qt/locale/bitcoin_ku_IQ.ts b/src/qt/locale/bitcoin_ku_IQ.ts
index 5bef2f75c2bc..da717d7024eb 100644
--- a/src/qt/locale/bitcoin_ku_IQ.ts
+++ b/src/qt/locale/bitcoin_ku_IQ.ts
@@ -435,10 +435,24 @@ Signing is only possible with addresses of the type 'legacy'.</source>
 </context>
 <context>
     <name>PSBTOperationsDialog</name>
+    <message numerus="yes">
+        <source>Signed %n input(s), but more signatures are still required.</source>
+        <translation type="unfinished">
+            <numerusform />
+            <numerusform />
+        </translation>
+    </message>
     <message>
         <source>or</source>
         <translation type="unfinished">یان</translation>
     </message>
+    <message numerus="yes">
+        <source>Transaction has %n unsigned input(s).</source>
+        <translation type="unfinished">
+            <numerusform />
+            <numerusform />
+        </translation>
+    </message>
     </context>
 <context>
     <name>PaymentServer</name>
diff --git a/src/qt/locale/bitcoin_lt.ts b/src/qt/locale/bitcoin_lt.ts
index e528a534d895..0c22093945bd 100644
--- a/src/qt/locale/bitcoin_lt.ts
+++ b/src/qt/locale/bitcoin_lt.ts
@@ -1434,6 +1434,14 @@ Pasirašymas galimas tik su 'legacy' tipo adresais.</translation>
         <source>Close</source>
         <translation type="unfinished">Uždaryti</translation>
     </message>
+    <message numerus="yes">
+        <source>Signed %n input(s), but more signatures are still required.</source>
+        <translation type="unfinished">
+            <numerusform />
+            <numerusform />
+            <numerusform />
+        </translation>
+    </message>
     <message>
         <source>own address</source>
         <translation type="unfinished">savo adresas</translation>
@@ -1446,6 +1454,14 @@ Pasirašymas galimas tik su 'legacy' tipo adresais.</translation>
         <source>or</source>
         <translation type="unfinished">ar</translation>
     </message>
+    <message numerus="yes">
+        <source>Transaction has %n unsigned input(s).</source>
+        <translation type="unfinished">
+            <numerusform />
+            <numerusform />
+            <numerusform />
+        </translation>
+    </message>
     </context>
 <context>
     <name>PaymentServer</name>
@@ -1632,10 +1648,6 @@ Pasirašymas galimas tik su 'legacy' tipo adresais.</translation>
         <source>Version</source>
         <translation type="unfinished">Versija</translation>
     </message>
-    <message>
-        <source>Starting Block</source>
-        <translation type="unfinished">Pradinis blokas</translation>
-    </message>
     <message>
         <source>Synced Headers</source>
         <translation type="unfinished">Sinchronizuotos antraštės</translation>
@@ -2149,10 +2161,6 @@ Pasirašymas galimas tik su 'legacy' tipo adresais.</translation>
         <source>The amount exceeds your balance.</source>
         <translation type="unfinished">Ši suma viršija jūsų balansą.</translation>
     </message>
-    <message>
-        <source>The total exceeds your balance when the %1 transaction fee is included.</source>
-        <translation type="unfinished">Bendra suma viršija jūsų balansą, kai įtraukiamas %1 sandorio mokestis.</translation>
-    </message>
     <message>
         <source>Duplicate address found: addresses should only be used once each.</source>
         <translation type="unfinished">Rastas dublikatas: adresai turėtų būti naudojami tik vieną kartą.</translation>
@@ -2848,10 +2856,6 @@ Pasirašymas galimas tik su 'legacy' tipo adresais.</translation>
         <source>Error loading %s</source>
         <translation type="unfinished">Klaida įkeliant %s</translation>
     </message>
-    <message>
-        <source>Error loading %s: Private keys can only be disabled during creation</source>
-        <translation type="unfinished">Klaida įkeliant %s: Privatūs raktai gali būti išjungti tik kūrimo metu</translation>
-    </message>
     <message>
         <source>Error loading %s: Wallet corrupted</source>
         <translation type="unfinished">Klaida įkeliant %s: Piniginės failas pažeistas</translation>
@@ -2892,10 +2896,6 @@ Pasirašymas galimas tik su 'legacy' tipo adresais.</translation>
         <source>This is the minimum transaction fee you pay on every transaction.</source>
         <translation type="unfinished">Tai yra minimalus transakcijos mokestis, kurį jūs mokate kiekvieną transakciją.</translation>
     </message>
-    <message>
-        <source>This is the transaction fee you will pay if you send a transaction.</source>
-        <translation type="unfinished">Tai yra sandorio mokestis, kurį mokėsite, jei siunčiate sandorį.</translation>
-    </message>
     <message>
         <source>Transaction amount too small</source>
         <translation type="unfinished">Transakcijos suma per maža</translation>
diff --git a/src/qt/locale/bitcoin_lv.ts b/src/qt/locale/bitcoin_lv.ts
index 53d49decc07a..8e5f1857632f 100644
--- a/src/qt/locale/bitcoin_lv.ts
+++ b/src/qt/locale/bitcoin_lv.ts
@@ -560,6 +560,14 @@
         <translation type="unfinished">Izveidot maku</translation>
     </message>
     </context>
+<context>
+    <name>MigrateWalletActivity</name>
+    <message>
+        <source>Restore Wallet</source>
+        <extracomment>Title of progress window which is displayed when wallets are being restored.</extracomment>
+        <translation type="unfinished">Atjaunot maku</translation>
+    </message>
+    </context>
 <context>
     <name>OpenWalletActivity</name>
     <message>
@@ -935,10 +943,26 @@
         <source>Close</source>
         <translation type="unfinished">Aiztaisīt</translation>
     </message>
+    <message numerus="yes">
+        <source>Signed %n input(s), but more signatures are still required.</source>
+        <translation type="unfinished">
+            <numerusform />
+            <numerusform />
+            <numerusform />
+        </translation>
+    </message>
     <message>
         <source>or</source>
         <translation type="unfinished">vai</translation>
     </message>
+    <message numerus="yes">
+        <source>Transaction has %n unsigned input(s).</source>
+        <translation type="unfinished">
+            <numerusform />
+            <numerusform />
+            <numerusform />
+        </translation>
+    </message>
     </context>
 <context>
     <name>PeerTableModel</name>
diff --git a/src/qt/locale/bitcoin_mi.ts b/src/qt/locale/bitcoin_mi.ts
index dfcb5b231d27..d5aaa4717126 100644
--- a/src/qt/locale/bitcoin_mi.ts
+++ b/src/qt/locale/bitcoin_mi.ts
@@ -362,6 +362,25 @@ Ko te whakakī i ēnei whakaaronga e taea ana anake ki ngā whakararuraru o te m
         </translation>
     </message>
     </context>
+<context>
+    <name>PSBTOperationsDialog</name>
+    <message numerus="yes">
+        <source>Signed %n input(s), but more signatures are still required.</source>
+        <translation type="unfinished">
+            <numerusform />
+            <numerusform />
+            <numerusform />
+        </translation>
+    </message>
+    <message numerus="yes">
+        <source>Transaction has %n unsigned input(s).</source>
+        <translation type="unfinished">
+            <numerusform />
+            <numerusform />
+            <numerusform />
+        </translation>
+    </message>
+    </context>
 <context>
     <name>PeerTableModel</name>
     <message>
@@ -467,10 +486,6 @@ Ko te whakakī i ēnei whakaaronga e taea ana anake ki ngā whakararuraru o te m
         <source>Invalid P2P permission: '%s'</source>
         <translation type="unfinished">Invalid P2P whakaaetanga: '%s'</translation>
     </message>
-    <message>
-        <source>Invalid amount for %s=&lt;amount&gt;: '%s' (must be at least %s)</source>
-        <translation type="unfinished">He whakararuraru te whiwhinga mō %s = &lt;amount&gt;: '%s' (me whakarite i te mea atu i te %s)</translation>
-    </message>
     <message>
         <source>Invalid amount for %s=&lt;amount&gt;: '%s'</source>
         <translation type="unfinished">Kore whiwhinga mō te %s=&lt;amount&gt;: '%s'</translation>
@@ -595,10 +610,6 @@ Ko te whakakī i ēnei whakaaronga e taea ana anake ki ngā whakararuraru o te m
         <source>This is the minimum transaction fee you pay on every transaction.</source>
         <translation type="unfinished">Ko tēnei te utu whakaritenga iti rawa ka whiwhi koe i ia whakaritenga.</translation>
     </message>
-    <message>
-        <source>This is the transaction fee you will pay if you send a transaction.</source>
-        <translation type="unfinished">Ko te utu whakawhiti tāuta tēnei ka utu e whiwhi ana koe ki te tuku i tētahi tāuta.</translation>
-    </message>
     <message>
         <source>Transaction amount too small</source>
         <translation type="unfinished">He iti rawa te moni whakaritenga</translation>
diff --git a/src/qt/locale/bitcoin_mk.ts b/src/qt/locale/bitcoin_mk.ts
index bb9dac369a82..7a65ad9883b0 100644
--- a/src/qt/locale/bitcoin_mk.ts
+++ b/src/qt/locale/bitcoin_mk.ts
@@ -887,6 +887,14 @@ Signing is only possible with addresses of the type 'legacy'.</source>
         <translation type="unfinished">(без етикета)</translation>
     </message>
     </context>
+<context>
+    <name>MigrateWalletActivity</name>
+    <message>
+        <source>Restore Wallet</source>
+        <extracomment>Title of progress window which is displayed when wallets are being restored.</extracomment>
+        <translation type="unfinished">Обновување на паричникот</translation>
+    </message>
+    </context>
 <context>
     <name>OpenWalletActivity</name>
     <message>
@@ -1040,6 +1048,25 @@ Signing is only possible with addresses of the type 'legacy'.</source>
         <translation type="unfinished">Вкупно:</translation>
     </message>
     </context>
+<context>
+    <name>PSBTOperationsDialog</name>
+    <message numerus="yes">
+        <source>Signed %n input(s), but more signatures are still required.</source>
+        <translation type="unfinished">
+            <numerusform />
+            <numerusform />
+            <numerusform />
+        </translation>
+    </message>
+    <message numerus="yes">
+        <source>Transaction has %n unsigned input(s).</source>
+        <translation type="unfinished">
+            <numerusform />
+            <numerusform />
+            <numerusform />
+        </translation>
+    </message>
+    </context>
 <context>
     <name>PeerTableModel</name>
     <message>
diff --git a/src/qt/locale/bitcoin_ml.ts b/src/qt/locale/bitcoin_ml.ts
index b6c040f245f7..c95e305e3948 100644
--- a/src/qt/locale/bitcoin_ml.ts
+++ b/src/qt/locale/bitcoin_ml.ts
@@ -549,10 +549,6 @@ Signing is only possible with addresses of the type 'legacy'.</source>
             <numerusform />
         </translation>
     </message>
-    <message>
-        <source>%1 behind</source>
-        <translation type="unfinished">%1 പുറകിൽ</translation>
-    </message>
     <message>
         <source>Last received block was generated %1 ago.</source>
         <translation type="unfinished">അവസാനം ലഭിച്ച ബ്ലോക്ക് %1 മുമ്പ് സൃഷ്ടിച്ചു.</translation>
@@ -900,6 +896,11 @@ Signing is only possible with addresses of the type 'legacy'.</source>
         <source>Migrate Wallet</source>
         <translation type="unfinished">വാലറ്റ് മൈഗ്രേറ്റ് ചെയ്യുക</translation>
     </message>
+    <message>
+        <source>Restore Wallet</source>
+        <extracomment>Title of progress window which is displayed when wallets are being restored.</extracomment>
+        <translation type="unfinished">വാലറ്റ് പുനഃസ്ഥാപിക്കുക</translation>
+    </message>
     </context>
 <context>
     <name>OpenWalletActivity</name>
@@ -1178,6 +1179,13 @@ Signing is only possible with addresses of the type 'legacy'.</source>
         <source>Close</source>
         <translation type="unfinished">അവസാനിപ്പിക്കുക</translation>
     </message>
+    <message numerus="yes">
+        <source>Signed %n input(s), but more signatures are still required.</source>
+        <translation type="unfinished">
+            <numerusform />
+            <numerusform />
+        </translation>
+    </message>
     <message>
         <source>Signed transaction successfully. Transaction is ready to broadcast.</source>
         <translation type="unfinished">ഇടപാട് വിജയകരമായി ഒപ്പിട്ടു.  ഇടപാട് പ്രക്ഷേപണത്തിന് തയ്യാറാണ്</translation>
@@ -1186,6 +1194,13 @@ Signing is only possible with addresses of the type 'legacy'.</source>
         <source>Total Amount</source>
         <translation type="unfinished">മുഴുവന്‍ തുക </translation>
     </message>
+    <message numerus="yes">
+        <source>Transaction has %n unsigned input(s).</source>
+        <translation type="unfinished">
+            <numerusform />
+            <numerusform />
+        </translation>
+    </message>
     </context>
 <context>
     <name>PaymentServer</name>
@@ -1203,7 +1218,7 @@ Signing is only possible with addresses of the type 'legacy'.</source>
     </message>
     <message>
         <source>URI cannot be parsed! This can be caused by an invalid Bitcoin address or malformed URI parameters.</source>
-        <translation type="unfinished">യു‌ആർ‌ഐ പാഴ്‌സുചെയ്യാൻ‌ കഴിയില്ല! അസാധുവായ ബിറ്റ്കോയിൻ വിലാസം അല്ലെങ്കിൽ തെറ്റായ യു‌ആർ‌ഐ പാരാമീറ്ററുകൾ കാരണം ഇത് സംഭവിക്കാം.</translation>
+        <translation type="unfinished">യു‌ആർ‌ഐ പാഴ്‌സുചെയ്യാൻ‌ കഴിയില്ല! അസാധുവായ ബിറ്റ്കോയിൻ വിലാസം അല്ലെങ്കിൽ കേടായ യു‌ആർ‌ഐ പാരാമീറ്ററുകൾ കാരണം ഇത് സംഭവിക്കാം.</translation>
     </message>
     <message>
         <source>Payment request file handling</source>
diff --git a/src/qt/locale/bitcoin_mn.ts b/src/qt/locale/bitcoin_mn.ts
index 5242fff65fd0..6da8d9e74fb2 100644
--- a/src/qt/locale/bitcoin_mn.ts
+++ b/src/qt/locale/bitcoin_mn.ts
@@ -604,10 +604,24 @@
     </context>
 <context>
     <name>PSBTOperationsDialog</name>
+    <message numerus="yes">
+        <source>Signed %n input(s), but more signatures are still required.</source>
+        <translation type="unfinished">
+            <numerusform />
+            <numerusform />
+        </translation>
+    </message>
     <message>
         <source>or</source>
         <translation type="unfinished">эсвэл</translation>
     </message>
+    <message numerus="yes">
+        <source>Transaction has %n unsigned input(s).</source>
+        <translation type="unfinished">
+            <numerusform />
+            <numerusform />
+        </translation>
+    </message>
     </context>
 <context>
     <name>PeerTableModel</name>
@@ -821,10 +835,6 @@
         <source>The amount exceeds your balance.</source>
         <translation type="unfinished">Энэ хэмжээ таны балансаас хэтэрсэн байна.</translation>
     </message>
-    <message>
-        <source>The total exceeds your balance when the %1 transaction fee is included.</source>
-        <translation type="unfinished">Гүйлгээний тѳлбѳр %1-ийг тооцхоор нийт дүн нь таны балансаас хэтрээд байна.</translation>
-    </message>
     <message numerus="yes">
         <source>Estimated to begin confirmation within %n block(s).</source>
         <translation type="unfinished">
diff --git a/src/qt/locale/bitcoin_ms.ts b/src/qt/locale/bitcoin_ms.ts
index 0671d21bc0cf..778d4111158d 100644
--- a/src/qt/locale/bitcoin_ms.ts
+++ b/src/qt/locale/bitcoin_ms.ts
@@ -537,6 +537,11 @@ Jika dompet ini mengandungi sebarang skrip yang boleh diselesaikan tetapi tidak
         <source>Migrate Wallet</source>
         <translation type="unfinished">Pindah Dompet</translation>
     </message>
+    <message>
+        <source>Restore Wallet</source>
+        <extracomment>Title of progress window which is displayed when wallets are being restored.</extracomment>
+        <translation type="unfinished">Pulih Dompet</translation>
+    </message>
     </context>
 <context>
     <name>OpenWalletActivity</name>
@@ -618,6 +623,21 @@ Jika dompet ini mengandungi sebarang skrip yang boleh diselesaikan tetapi tidak
         <translation type="unfinished">Ralat</translation>
     </message>
     </context>
+<context>
+    <name>PSBTOperationsDialog</name>
+    <message numerus="yes">
+        <source>Signed %n input(s), but more signatures are still required.</source>
+        <translation type="unfinished">
+            <numerusform />
+        </translation>
+    </message>
+    <message numerus="yes">
+        <source>Transaction has %n unsigned input(s).</source>
+        <translation type="unfinished">
+            <numerusform />
+        </translation>
+    </message>
+    </context>
 <context>
     <name>PeerTableModel</name>
     <message>
diff --git a/src/qt/locale/bitcoin_mt.ts b/src/qt/locale/bitcoin_mt.ts
index 214020b2ca76..10ea1a5bb516 100644
--- a/src/qt/locale/bitcoin_mt.ts
+++ b/src/qt/locale/bitcoin_mt.ts
@@ -3,7 +3,7 @@
     <name>AddressBookPage</name>
     <message>
         <source>Right-click to edit address or label</source>
-        <translation type="unfinished">Ikklikkja bil-lemin tal-maws biex teditja l-indirizz jew it-tikketta</translation>
+        <translation type="unfinished">Ikklikkja bil-buttuna tal-lemin tal-maws biex taġġorna l-indirizz jew it-tikketta</translation>
     </message>
     <message>
         <source>Create a new address</source>
@@ -15,11 +15,11 @@
     </message>
     <message>
         <source>&amp;Copy</source>
-        <translation type="unfinished">&amp;Kopja</translation>
+        <translation type="unfinished">&amp;Ikkopja</translation>
     </message>
     <message>
         <source>C&amp;lose</source>
-        <translation type="unfinished">Qrib</translation>
+        <translation type="unfinished">Q&amp;rib</translation>
     </message>
     <message>
         <source>Delete the currently selected address from the list</source>
@@ -29,13 +29,17 @@
         <source>Enter address or label to search</source>
         <translation type="unfinished">Daħħal l-indirizz jew it-tikketta biex tfittex</translation>
     </message>
+    <message>
+        <source>Copy the currently selected address to the clipboard</source>
+        <translation type="unfinished">Ikkopja l-indirizz magħżul bħalissa għal ġol-clipboard</translation>
+    </message>
     <message>
         <source>Export the data in the current tab to a file</source>
         <translation type="unfinished">Esporta d-dejta fit-tab kurrenti għal fajl</translation>
     </message>
     <message>
         <source>&amp;Export</source>
-        <translation type="unfinished">&amp;Esportazzjoni</translation>
+        <translation type="unfinished">&amp;Esporta</translation>
     </message>
     <message>
         <source>&amp;Delete</source>
@@ -51,11 +55,11 @@
     </message>
     <message>
         <source>C&amp;hoose</source>
-        <translation type="unfinished">Agħżel</translation>
+        <translation type="unfinished">A&amp;għżel</translation>
     </message>
     <message>
         <source>These are your Bitcoin addresses for sending payments. Always check the amount and the receiving address before sending coins.</source>
-        <translation type="unfinished">Dawn huma l-indirizzi Bitcoin tiegħek biex tibgħat il-ħlasijiet. Dejjem iċċekkja l-ammont u l-indirizz li tirċievi qabel ma tibgħat muniti.</translation>
+        <translation type="unfinished">Dawn huma l-indirizzi tal-Bitcoin tiegħek biex tibgħat il-ħlasijiet. Dejjem iċċekkja l-ammont u l-indirizz li tirċievi qabel ma tibgħat muniti.</translation>
     </message>
     <message>
         <source>These are your Bitcoin addresses for receiving payments. Use the 'Create new receiving address' button in the receive tab to create new addresses.
@@ -65,19 +69,19 @@ L-iffirmar huwa possibbli biss b'indirizzi tat-tip 'legacy'.</translation>
     </message>
     <message>
         <source>&amp;Copy Address</source>
-        <translation type="unfinished">&amp;Kopja l-Indirizz</translation>
+        <translation type="unfinished">&amp;Ikkopja l-Indirizz</translation>
     </message>
     <message>
         <source>Copy &amp;Label</source>
-        <translation type="unfinished">Kopja &amp; Tikketta</translation>
+        <translation type="unfinished">Ikkopja &amp; Agħti Tikketta</translation>
     </message>
     <message>
         <source>&amp;Edit</source>
-        <translation type="unfinished">&amp;Editja</translation>
+        <translation type="unfinished">&amp;Aġġorna</translation>
     </message>
     <message>
         <source>Export Address List</source>
-        <translation type="unfinished">Lista ta' Indirizzi ta' Esportazzjoni</translation>
+        <translation type="unfinished">Esporta Lista ta' Indirizzi</translation>
     </message>
     <message>
         <source>Comma separated file</source>
@@ -87,7 +91,15 @@ L-iffirmar huwa possibbli biss b'indirizzi tat-tip 'legacy'.</translation>
     <message>
         <source>There was an error trying to save the address list to %1. Please try again.</source>
         <extracomment>An error message. %1 is a stand-in argument for the name of the file we attempted to save to.</extracomment>
-        <translation type="unfinished">Kien hemm żball meta ppruvaw issalva l-lista tal-indirizzi f'%1. Jekk jogħġbok erġa pprova.</translation>
+        <translation type="unfinished">Kien hemm żball meta pruvajt issalva l-lista tal-indirizzi f'%1. Jekk jogħġbok erġa pprova.</translation>
+    </message>
+    <message>
+        <source>Sending addresses - %1</source>
+        <translation type="unfinished">Qed jintbagħtu l-indirizzi: %1</translation>
+    </message>
+    <message>
+        <source>Receiving addresses - %1</source>
+        <translation type="unfinished">Qed jiċu riċevuti l-indirizzi - %1</translation>
     </message>
     <message>
         <source>Exporting Failed</source>
@@ -113,7 +125,7 @@ L-iffirmar huwa possibbli biss b'indirizzi tat-tip 'legacy'.</translation>
     <name>AskPassphraseDialog</name>
     <message>
         <source>Passphrase Dialog</source>
-        <translation type="unfinished">Passphrase Djalogu</translation>
+        <translation type="unfinished">Djalogu tal-Passphrase</translation>
     </message>
     <message>
         <source>Enter passphrase</source>
@@ -129,11 +141,11 @@ L-iffirmar huwa possibbli biss b'indirizzi tat-tip 'legacy'.</translation>
     </message>
     <message>
         <source>Show passphrase</source>
-        <translation type="unfinished">Uri passphrase</translation>
+        <translation type="unfinished">Uri l-passphrase</translation>
     </message>
     <message>
         <source>Encrypt wallet</source>
-        <translation type="unfinished">Kriptaġġ kartiera</translation>
+        <translation type="unfinished">Kripta l-kartiera</translation>
     </message>
     <message>
         <source>This operation needs your wallet passphrase to unlock the wallet.</source>
@@ -141,11 +153,11 @@ L-iffirmar huwa possibbli biss b'indirizzi tat-tip 'legacy'.</translation>
     </message>
     <message>
         <source>Unlock wallet</source>
-        <translation type="unfinished">Nisfruttaw il-kartiera</translation>
+        <translation type="unfinished">Iftaħ il-kartiera</translation>
     </message>
     <message>
         <source>Change passphrase</source>
-        <translation type="unfinished">Ibdel passphrase</translation>
+        <translation type="unfinished">Ibdel il-passphrase</translation>
     </message>
     <message>
         <source>Confirm wallet encryption</source>
@@ -157,31 +169,39 @@ L-iffirmar huwa possibbli biss b'indirizzi tat-tip 'legacy'.</translation>
     </message>
     <message>
         <source>Are you sure you wish to encrypt your wallet?</source>
-        <translation type="unfinished">Int żgur li tixtieq tikkodifika l-kartiera tiegħek?</translation>
+        <translation type="unfinished">Int żgur li tixtieq tikkripta l-kartiera tiegħek?</translation>
     </message>
     <message>
         <source>Wallet encrypted</source>
-        <translation type="unfinished">Kartiera encrypted</translation>
+        <translation type="unfinished">Kartiera kriptata</translation>
     </message>
     <message>
         <source>Enter the new passphrase for the wallet.&lt;br/&gt;Please use a passphrase of &lt;b&gt;ten or more random characters&lt;/b&gt;, or &lt;b&gt;eight or more words&lt;/b&gt;.</source>
-        <translation type="unfinished">Daħħal il-passphrase l-ġdida għall-kartiera.&lt;br/&gt;Jekk jogħġbok uża passphrase ta' &lt;b&gt;għaxar karattri jew aktar każwali&lt;/b&gt;, jew &lt;b&gt; tmien kelmiet jew aktar&lt;/b&gt;.</translation>
+        <translation type="unfinished">Daħħal il-passphrase l-ġdida għall-kartiera.&lt;br/&gt;Jekk jogħġbok uża passphrase ta' &lt;b&gt;għaxar karattri jew aktar aleatorji &lt;/b&gt;, jew &lt;b&gt; tmien kelmiet jew aktar&lt;/b&gt;.</translation>
     </message>
     <message>
         <source>Enter the old passphrase and new passphrase for the wallet.</source>
         <translation type="unfinished">Daħħal il-passphrase l-antika u l-passphrase ġdida għall-kartiera.</translation>
     </message>
+    <message>
+        <source>Continue</source>
+        <translation type="unfinished">Kompli</translation>
+    </message>
+    <message>
+        <source>Back</source>
+        <translation type="unfinished">Mur Lura</translation>
+    </message>
     <message>
         <source>Remember that encrypting your wallet cannot fully protect your bitcoins from being stolen by malware infecting your computer.</source>
         <translation type="unfinished">Ftakar li l-kriptaġġ tal-kartiera tiegħek ma jistax jipproteġi bis-sħiħ il-bitcoins tiegħek milli jinsterqu minn malware li jinfetta l-kompjuter tiegħek.</translation>
     </message>
     <message>
         <source>Wallet to be encrypted</source>
-        <translation type="unfinished">Kartiera għandha tiġi encrypted</translation>
+        <translation type="unfinished">Kartiera li għandha tiġi kriptata</translation>
     </message>
     <message>
         <source>Your wallet is about to be encrypted. </source>
-        <translation type="unfinished">Il-kartiera tiegħek waslet biex tiġi encrypted.</translation>
+        <translation type="unfinished">Il-kartiera tiegħek waslet biex tiġi kriptata.</translation>
     </message>
     <message>
         <source>Your wallet is now encrypted. </source>
@@ -197,7 +217,7 @@ L-iffirmar huwa possibbli biss b'indirizzi tat-tip 'legacy'.</translation>
     </message>
     <message>
         <source>Wallet encryption failed due to an internal error. Your wallet was not encrypted.</source>
-        <translation type="unfinished">Il-kriptaġġ tal-kartiera falla minħabba żball intern. Il-kartiera tiegħek ma kinitx encrypted.</translation>
+        <translation type="unfinished">Il-kriptaġġ tal-kartiera falla minħabba żball intern. Il-kartiera tiegħek ma ġietx kriptata.</translation>
     </message>
     <message>
         <source>The supplied passphrases do not match.</source>
@@ -213,7 +233,7 @@ L-iffirmar huwa possibbli biss b'indirizzi tat-tip 'legacy'.</translation>
     </message>
     <message>
         <source>The passphrase entered for the wallet decryption is incorrect. It contains a null character (ie - a zero byte). If the passphrase was set with a version of this software prior to 25.0, please try again with only the characters up to — but not including — the first null character. If this is successful, please set a new passphrase to avoid this issue in the future.</source>
-        <translation type="unfinished">Il-passphrase mdaħħla għad-decryption tal-kartiera mhix korretta. Fiha karattru null (jiġifieri - byte żero). Jekk il-passphrase ġiet issettjata b'verżjoni ta' dan is-software qabel 25.0, jekk jogħġbok erġa' pprova bil-karattri biss sa — iżda mhux inkluż — l-ewwel karattru null. Jekk dan jirnexxi, jekk jogħġbok waqqaf passphrase ġdida biex tevita din il-kwistjoni fil-futur.</translation>
+        <translation type="unfinished">Il-passphrase mdaħħla għad-decryption tal-kartiera mhix korretta. Fiha karattru null (jiġifieri - byte żero). Jekk il-passphrase ġiet issettjata b'verżjoni ta' dan il-programm qabel 25.0, jekk jogħġbok erġa' pprova bil-karattri biss sa — iżda mhux inkluż — l-ewwel karattru null. Jekk dan jirnexxi, jekk jogħġbok oħloq passphrase ġdida biex tevita din il-kwistjoni fil-futur.</translation>
     </message>
     <message>
         <source>Wallet passphrase was successfully changed.</source>
@@ -236,7 +256,7 @@ L-iffirmar huwa possibbli biss b'indirizzi tat-tip 'legacy'.</translation>
     <name>BanTableModel</name>
     <message>
         <source>Banned Until</source>
-        <translation type="unfinished">Ipprojbit Sa</translation>
+        <translation type="unfinished">Ipprojbit Sa/Sal-</translation>
     </message>
 </context>
 <context>
@@ -259,7 +279,7 @@ L-iffirmar huwa possibbli biss b'indirizzi tat-tip 'legacy'.</translation>
     </message>
     <message>
         <source>An internal error occurred. %1 will attempt to continue safely. This is an unexpected bug which can be reported as described below.</source>
-        <translation type="unfinished">Sar żball intern. %1se jipprova jkompli mingħajr periklu. Dan huwa bug mhux mistenni li jista 'jiġi rrappurtat kif deskritt hawn taħt.</translation>
+        <translation type="unfinished">Sar żball intern. %1se jipprova jkompli mingħajr periklu. Dan huwa bug mhux mistenni li jista' jiġi rrappurtat kif deskritt hawn taħt.</translation>
     </message>
 </context>
 <context>
@@ -267,7 +287,7 @@ L-iffirmar huwa possibbli biss b'indirizzi tat-tip 'legacy'.</translation>
     <message>
         <source>Do you want to reset settings to default values, or to abort without making changes?</source>
         <extracomment>Explanatory text shown on startup when the settings file cannot be read. Prompts user to make a choice between resetting or aborting.</extracomment>
-        <translation type="unfinished">Trid tirrisettja s-settings għal valuri awtomatiċi, jew taborta mingħajr ma tagħmel bidliet?</translation>
+        <translation type="unfinished">Trid tirrisettja s-settings għal valuri prestabbiliti, jew taborta mingħajr ma tagħmel bidliet?</translation>
     </message>
     <message>
         <source>A fatal error occurred. Check that settings file is writable, or try running with -nosettings.</source>
@@ -282,6 +302,41 @@ L-iffirmar huwa possibbli biss b'indirizzi tat-tip 'legacy'.</translation>
         <source>%1 didn't yet exit safely…</source>
         <translation type="unfinished">%1għadu ma ħariġx b'mod sikur...</translation>
     </message>
+    <message>
+        <source>unknown</source>
+        <translation type="unfinished">mhux magħruf</translation>
+    </message>
+    <message>
+        <source>Custom…</source>
+        <translation type="unfinished">Personalizzat...</translation>
+    </message>
+    <message>
+        <source>Amount</source>
+        <translation type="unfinished">Ammont</translation>
+    </message>
+    <message>
+        <source>Unroutable</source>
+        <translation type="unfinished">Mhux rottibli</translation>
+    </message>
+    <message>
+        <source>Inbound</source>
+        <extracomment>An inbound connection from a peer. An inbound connection is a connection initiated by a peer.</extracomment>
+        <translation type="unfinished">Dieħel</translation>
+    </message>
+    <message>
+        <source>Outbound</source>
+        <extracomment>An outbound connection to a peer. An outbound connection is a connection initiated by us.</extracomment>
+        <translation type="unfinished">Ħiereġ</translation>
+    </message>
+    <message>
+        <source>Manual</source>
+        <extracomment>Peer connection type established manually through one of several methods.</extracomment>
+        <translation type="unfinished">Manwali</translation>
+    </message>
+    <message>
+        <source>None</source>
+        <translation type="unfinished">Xejn</translation>
+    </message>
     <message numerus="yes">
         <source>%n second(s)</source>
         <translation type="unfinished">
@@ -338,7 +393,7 @@ L-iffirmar huwa possibbli biss b'indirizzi tat-tip 'legacy'.</translation>
     </message>
     <message>
         <source>default wallet</source>
-        <translation type="unfinished">kartiera default</translation>
+        <translation type="unfinished">kartiera prestabbilita</translation>
     </message>
 </context>
 <context>
@@ -591,7 +646,7 @@ L-iffirmar huwa possibbli biss b'indirizzi tat-tip 'legacy'.</translation>
     </message>
     <message>
         <source>&amp;Sending addresses</source>
-        <translation type="unfinished">&amp; Tibgħat indirizzi</translation>
+        <translation type="unfinished">&amp;Indirizzi li tibgħat minnhom</translation>
     </message>
     <message>
         <source>&amp;Receiving addresses</source>
@@ -627,6 +682,14 @@ L-iffirmar huwa possibbli biss b'indirizzi tat-tip 'legacy'.</translation>
         <source>Close all wallets</source>
         <translation type="unfinished">Agħlaq il-kartieri kollha</translation>
     </message>
+    <message>
+        <source>Migrate Wallet</source>
+        <translation type="unfinished">Emigra Kartiera</translation>
+    </message>
+    <message>
+        <source>Migrate a wallet</source>
+        <translation type="unfinished">Emigra Kartiera</translation>
+    </message>
     <message>
         <source>Show the %1 help message to get a list with possible Bitcoin command-line options</source>
         <translation type="unfinished">Uri %1l-messaġġ ta 'għajnuna biex tikseb lista b'għażliet possibbli tal-linja tal-kmand Bitcoin</translation>
@@ -828,247 +891,1340 @@ L-iffirmar huwa possibbli biss b'indirizzi tat-tip 'legacy'.</translation>
         <translation type="unfinished">Bidla:</translation>
     </message>
     <message>
-        <source>(no label)</source>
-        <translation type="unfinished">(l-ebda tikketta)</translation>
+        <source>(un)select all</source>
+        <translation type="unfinished">agħżel kollox / neħħi kollox mill-għażla</translation>
     </message>
-    </context>
-<context>
-    <name>OpenWalletActivity</name>
     <message>
-        <source>Open Wallet</source>
-        <extracomment>Title of window indicating the progress of opening of a wallet.</extracomment>
-        <translation type="unfinished">Iftaħ Kartiera</translation>
+        <source>Tree mode</source>
+        <translation type="unfinished">Siġra</translation>
     </message>
-    </context>
-<context>
-    <name>RestoreWalletActivity</name>
     <message>
-        <source>Restore Wallet</source>
-        <extracomment>Title of progress window which is displayed when wallets are being restored.</extracomment>
-        <translation type="unfinished">Irrestawra Kartiera</translation>
+        <source>List mode</source>
+        <translation type="unfinished">Lista</translation>
     </message>
-    </context>
-<context>
-    <name>WalletController</name>
     <message>
-        <source>Close wallet</source>
-        <translation type="unfinished">Agħlaq il-kartiera</translation>
+        <source>Amount</source>
+        <translation type="unfinished">Ammont</translation>
     </message>
     <message>
-        <source>Close all wallets</source>
-        <translation type="unfinished">Agħlaq il-kartieri kollha</translation>
+        <source>Received with label</source>
+        <translation type="unfinished">Riċevut/a bit-tikketta</translation>
     </message>
-    </context>
-<context>
-    <name>CreateWalletDialog</name>
     <message>
-        <source>Wallet Name</source>
-        <translation type="unfinished">Isem tal-Kartiera</translation>
+        <source>Received with address</source>
+        <translation type="unfinished">Riċevut/a bl-indirizz</translation>
     </message>
-    </context>
-<context>
-    <name>Intro</name>
-    <message numerus="yes">
-        <source>%n GB of space available</source>
-        <translation type="unfinished">
-            <numerusform />
-            <numerusform />
-            <numerusform />
-            <numerusform />
-        </translation>
+    <message>
+        <source>Date</source>
+        <translation type="unfinished">Data</translation>
     </message>
-    <message numerus="yes">
-        <source>(of %n GB needed)</source>
-        <translation type="unfinished">
-            <numerusform />
-            <numerusform />
-            <numerusform />
-            <numerusform />
-        </translation>
+    <message>
+        <source>Confirmations</source>
+        <translation type="unfinished">Konfermazzjonijiet</translation>
     </message>
-    <message numerus="yes">
-        <source>(%n GB needed for full chain)</source>
-        <translation type="unfinished">
-            <numerusform />
-            <numerusform />
-            <numerusform />
-            <numerusform />
-        </translation>
+    <message>
+        <source>Confirmed</source>
+        <translation type="unfinished">Ikkonfermat/a</translation>
     </message>
-    <message numerus="yes">
-        <source>(sufficient to restore backups %n day(s) old)</source>
-        <extracomment>Explanatory text on the capability of the current prune target.</extracomment>
-        <translation type="unfinished">
-            <numerusform />
-            <numerusform />
-            <numerusform />
-            <numerusform />
-        </translation>
+    <message>
+        <source>Copy amount</source>
+        <translation type="unfinished">Ikkopja l-ammont</translation>
     </message>
     <message>
-        <source>Error</source>
-        <translation type="unfinished">Żball</translation>
+        <source>&amp;Copy address</source>
+        <translation type="unfinished">&amp;Ikkopja l-indirizz</translation>
     </message>
-</context>
-<context>
-    <name>OptionsDialog</name>
     <message>
-        <source>&amp;Window</source>
-        <translation type="unfinished">&amp; Tieqa</translation>
+        <source>Copy &amp;label</source>
+        <translation type="unfinished">Ikkopja &amp;it-tikketta</translation>
     </message>
     <message>
-        <source>Error</source>
-        <translation type="unfinished">Żball</translation>
+        <source>Copy &amp;amount</source>
+        <translation type="unfinished">Ikkopja &amp;l-ammont</translation>
     </message>
-    </context>
-<context>
-    <name>PeerTableModel</name>
     <message>
-        <source>Address</source>
-        <extracomment>Title of Peers Table column which contains the IP/Onion/I2P address of the connected peer.</extracomment>
-        <translation type="unfinished">Indirizz</translation>
+        <source>Copy transaction &amp;ID and output index</source>
+        <translation type="unfinished">Ikkopja l-&amp;ID tat-transazzjoni u uri l-indiċi</translation>
     </message>
-    </context>
-<context>
-    <name>RPCConsole</name>
     <message>
-        <source>Node window</source>
-        <translation type="unfinished">Tieqa tan-node</translation>
+        <source>L&amp;ock unspent</source>
+        <translation type="unfinished">S&amp;akkar dak li mhux minfuq</translation>
     </message>
-    </context>
-<context>
-    <name>ReceiveRequestDialog</name>
     <message>
-        <source>Amount:</source>
-        <translation type="unfinished">Ammont:</translation>
+        <source>&amp;Unlock unspent</source>
+        <translation type="unfinished">&amp;Iftaħ dak li mhux minfuq</translation>
     </message>
     <message>
-        <source>Wallet:</source>
-        <translation type="unfinished">Kartiera:</translation>
+        <source>Copy quantity</source>
+        <translation type="unfinished">Ikkopja l-kwantità</translation>
     </message>
-    </context>
-<context>
-    <name>RecentRequestsTableModel</name>
     <message>
-        <source>Label</source>
-        <translation type="unfinished">Tikketta</translation>
+        <source>Copy fee</source>
+        <translation type="unfinished">Ikkopja l-ħlas</translation>
+    </message>
+    <message>
+        <source>Copy after fee</source>
+        <translation type="unfinished">Ikkopja wara l-ħlas</translation>
+    </message>
+    <message>
+        <source>Copy bytes</source>
+        <translation type="unfinished">Ikkopja l-bytes</translation>
+    </message>
+    <message>
+        <source>Copy change</source>
+        <translation type="unfinished">Ikkopja l-bidla</translation>
+    </message>
+    <message>
+        <source>(%1 locked)</source>
+        <translation type="unfinished">(%1 imsakkar)</translation>
+    </message>
+    <message>
+        <source>Can vary +/- %1 satoshi(s) per input.</source>
+        <translation type="unfinished">Tista' tvarja +/- %1 satoshi/jiet għal kull input</translation>
     </message>
     <message>
         <source>(no label)</source>
         <translation type="unfinished">(l-ebda tikketta)</translation>
     </message>
-    </context>
-<context>
-    <name>SendCoinsDialog</name>
     <message>
-        <source>Quantity:</source>
-        <translation type="unfinished">Kwantità:</translation>
+        <source>change from %1 (%2)</source>
+        <translation type="unfinished">biddel minn %1 (%2)</translation>
     </message>
     <message>
-        <source>Amount:</source>
-        <translation type="unfinished">Ammont:</translation>
+        <source>(change)</source>
+        <translation type="unfinished">(biddel)</translation>
     </message>
+</context>
+<context>
+    <name>CreateWalletActivity</name>
     <message>
-        <source>Fee:</source>
-        <translation type="unfinished">Tariffa:</translation>
+        <source>Create Wallet</source>
+        <extracomment>Title of window indicating the progress of creation of a new wallet.</extracomment>
+        <translation type="unfinished">Oħloq Kartiera</translation>
     </message>
     <message>
-        <source>After Fee:</source>
-        <translation type="unfinished">Wara Ħlas:</translation>
+        <source>Creating Wallet &lt;b&gt;%1&lt;/b&gt;…</source>
+        <extracomment>Descriptive text of the create wallet progress window which indicates to the user which wallet is currently being created.</extracomment>
+        <translation type="unfinished">Qed Tinħolaq il-Kartiera &lt;b&gt;%1&lt;/b&gt; ...</translation>
     </message>
     <message>
-        <source>Change:</source>
-        <translation type="unfinished">Bidla:</translation>
+        <source>Create wallet failed</source>
+        <translation type="unfinished">Il-kartiera ma setgħatx tinħalaq</translation>
     </message>
-    <message numerus="yes">
-        <source>Estimated to begin confirmation within %n block(s).</source>
-        <translation type="unfinished">
-            <numerusform />
-            <numerusform />
-            <numerusform />
-            <numerusform />
-        </translation>
+    <message>
+        <source>Create wallet warning</source>
+        <translation type="unfinished">Il-kartiera nħalqet bi twissija</translation>
     </message>
     <message>
-        <source>(no label)</source>
-        <translation type="unfinished">(l-ebda tikketta)</translation>
+        <source>Can't list signers</source>
+        <translation type="unfinished">Mhux possiblil jiġu mniżżla l-firmatarji</translation>
+    </message>
+    <message>
+        <source>Too many external signers found</source>
+        <translation type="unfinished">Instabu wisq firmatarji esterni</translation>
     </message>
 </context>
 <context>
-    <name>TransactionDesc</name>
-    <message numerus="yes">
-        <source>matures in %n more block(s)</source>
-        <translation type="unfinished">
-            <numerusform />
-            <numerusform />
-            <numerusform />
-            <numerusform />
-        </translation>
+    <name>LoadWalletsActivity</name>
+    <message>
+        <source>Load Wallets</source>
+        <extracomment>Title of progress window which is displayed when wallets are being loaded.</extracomment>
+        <translation type="unfinished">Tagħbija tal-Kartieri</translation>
     </message>
-    </context>
+    <message>
+        <source>Loading wallets…</source>
+        <extracomment>Descriptive text of the load wallets progress window which indicates to the user that wallets are currently being loaded.</extracomment>
+        <translation type="unfinished">Qed jitgħabbu l-kartieri...</translation>
+    </message>
+</context>
 <context>
-    <name>TransactionTableModel</name>
+    <name>MigrateWalletActivity</name>
     <message>
-        <source>Label</source>
-        <translation type="unfinished">Tikketta</translation>
+        <source>Migrate wallet</source>
+        <translation type="unfinished">Emigra l-kartiera</translation>
     </message>
     <message>
-        <source>(no label)</source>
-        <translation type="unfinished">(l-ebda tikketta)</translation>
+        <source>Are you sure you wish to migrate the wallet &lt;i&gt;%1&lt;/i&gt;?</source>
+        <translation type="unfinished">Ċert/a li trid temigra l-kartiera &lt;i&gt;%1&lt;/i&gt;</translation>
     </message>
-    </context>
-<context>
-    <name>TransactionView</name>
     <message>
-        <source>Comma separated file</source>
-        <extracomment>Expanded name of the CSV file format. See: https://en.wikipedia.org/wiki/Comma-separated_values.</extracomment>
-        <translation type="unfinished">Fajl separat bil-virgola</translation>
+        <source>Migrate Wallet</source>
+        <translation type="unfinished">Emigra Kartiera</translation>
     </message>
     <message>
-        <source>Label</source>
-        <translation type="unfinished">Tikketta</translation>
+        <source>Migrating Wallet &lt;b&gt;%1&lt;/b&gt;…</source>
+        <translation type="unfinished">Qed tiġi Emigrata l-Kartiera &lt;b&gt;%1&lt;/b&gt; ...</translation>
     </message>
     <message>
-        <source>Address</source>
-        <translation type="unfinished">Indirizz</translation>
+        <source>The wallet '%1' was migrated successfully.</source>
+        <translation type="unfinished">Il-kartiera '%1' ġiet emigrata b'suċċess.</translation>
     </message>
     <message>
-        <source>Exporting Failed</source>
-        <translation type="unfinished">L-esportazzjoni falliet</translation>
+        <source>Watchonly scripts have been migrated to a new wallet named '%1'.</source>
+        <translation type="unfinished">Is-skriptijiet 'watchonly' ġew emigrati lejn kartiera ġdida jisimha '%1'.</translation>
     </message>
-    </context>
+    <message>
+        <source>Solvable but not watched scripts have been migrated to a new wallet named '%1'.</source>
+        <translation type="unfinished">Skriptijiet solvibbli imma li mhumiex imħarsa ġew emigrati lejn kartiera ġdida jisimha '%1'.</translation>
+    </message>
+    <message>
+        <source>Restore Wallet</source>
+        <extracomment>Title of progress window which is displayed when wallets are being restored.</extracomment>
+        <translation type="unfinished">Irrestawra Kartiera</translation>
+    </message>
+    <message>
+        <source>Restoring Wallet &lt;b&gt;%1&lt;/b&gt;…</source>
+        <extracomment>Descriptive text of the restore wallets progress window which indicates to the user that wallets are currently being restored.</extracomment>
+        <translation type="unfinished">Qed Tiġi Rrestawrata l-Kartiera &lt;b&gt;%1&lt;/b&gt; ...</translation>
+    </message>
+    <message>
+        <source>Migration failed</source>
+        <translation type="unfinished">Il-migrazzjoni falliet</translation>
+    </message>
+    <message>
+        <source>Migration Successful</source>
+        <translation type="unfinished">Il-migrazzjoni Rnexxiet</translation>
+    </message>
+</context>
 <context>
-    <name>WalletFrame</name>
+    <name>OpenWalletActivity</name>
     <message>
-        <source>Create a new wallet</source>
-        <translation type="unfinished">Oħloq kartiera ġdida</translation>
+        <source>Open wallet failed</source>
+        <translation type="unfinished">Il-kartiera ma setgħatx tinfetaħ</translation>
     </message>
     <message>
-        <source>Error</source>
-        <translation type="unfinished">Żball</translation>
+        <source>Open wallet warning</source>
+        <translation type="unfinished">Il-kartiera nfetħet bi twissija</translation>
     </message>
-    </context>
+    <message>
+        <source>Open Wallet</source>
+        <extracomment>Title of window indicating the progress of opening of a wallet.</extracomment>
+        <translation type="unfinished">Iftaħ Kartiera</translation>
+    </message>
+    <message>
+        <source>Opening Wallet &lt;b&gt;%1&lt;/b&gt;…</source>
+        <extracomment>Descriptive text of the open wallet progress window which indicates to the user which wallet is currently being opened.</extracomment>
+        <translation type="unfinished">Qed Tinfetaħ il-Kartiera &lt;b&gt;%1&lt;/b&gt; ...</translation>
+    </message>
+</context>
 <context>
-    <name>WalletView</name>
+    <name>RestoreWalletActivity</name>
     <message>
-        <source>&amp;Export</source>
-        <translation type="unfinished">&amp;Esportazzjoni</translation>
+        <source>Restore Wallet</source>
+        <extracomment>Title of progress window which is displayed when wallets are being restored.</extracomment>
+        <translation type="unfinished">Irrestawra Kartiera</translation>
     </message>
     <message>
-        <source>Export the data in the current tab to a file</source>
-        <translation type="unfinished">Esporta d-dejta fit-tab kurrenti għal fajl</translation>
+        <source>Restoring Wallet &lt;b&gt;%1&lt;/b&gt;…</source>
+        <extracomment>Descriptive text of the restore wallets progress window which indicates to the user that wallets are currently being restored.</extracomment>
+        <translation type="unfinished">Qed Tiġi Rrestawrata l-Kartiera &lt;b&gt;%1&lt;/b&gt; ...</translation>
     </message>
     <message>
-        <source>Wallet Data</source>
-        <extracomment>Name of the wallet data file format.</extracomment>
-        <translation type="unfinished">Dejta tal-Kartiera</translation>
+        <source>Restore wallet failed</source>
+        <extracomment>Title of message box which is displayed when the wallet could not be restored.</extracomment>
+        <translation type="unfinished">Il-kartiera ma setgħatx tiġi rrestawrata</translation>
     </message>
-    </context>
+    <message>
+        <source>Restore wallet warning</source>
+        <extracomment>Title of message box which is displayed when the wallet is restored with some warning.</extracomment>
+        <translation type="unfinished">Il-kartiera ġiet irrestawrata bi twissija</translation>
+    </message>
+    <message>
+        <source>Restore wallet message</source>
+        <extracomment>Title of message box which is displayed when the wallet is successfully restored.</extracomment>
+        <translation type="unfinished">Il-kartiera ġiet irrestawrata b'messaġ</translation>
+    </message>
+</context>
 <context>
-    <name>bitcoin-core</name>
+    <name>WalletController</name>
     <message>
-        <source>default wallet</source>
-        <translation type="unfinished">kartiera default</translation>
+        <source>Close wallet</source>
+        <translation type="unfinished">Agħlaq il-kartiera</translation>
+    </message>
+    <message>
+        <source>Are you sure you wish to close the wallet &lt;i&gt;%1&lt;/i&gt;?</source>
+        <translation type="unfinished">Ċert/a li trid tagħlaq il-kartiera &lt;i&gt;%1&lt;/i&gt;?</translation>
+    </message>
+    <message>
+        <source>Closing the wallet for too long can result in having to resync the entire chain if pruning is enabled.</source>
+        <translation type="unfinished">Jekk tagħlaq il-kartiera għal żmien twil wisq, jaf ikollok bżonn terġa tissyncja l-katina kollha jekk il-prunar qed isir.</translation>
+    </message>
+    <message>
+        <source>Close all wallets</source>
+        <translation type="unfinished">Agħlaq il-kartieri kollha</translation>
+    </message>
+    <message>
+        <source>Are you sure you wish to close all wallets?</source>
+        <translation type="unfinished">Ċert/a li trid tagħlaq il-kartieri kollha?</translation>
+    </message>
+</context>
+<context>
+    <name>CreateWalletDialog</name>
+    <message>
+        <source>Create Wallet</source>
+        <translation type="unfinished">Oħloq Kartiera</translation>
+    </message>
+    <message>
+        <source>You are one step away from creating your new wallet!</source>
+        <translation type="unfinished">Qiegħed/Qiegħda pass wieħed biss 'il bogħod milli tikkrea l-kartiera l-ġdida tiegħek!</translation>
+    </message>
+    <message>
+        <source>Please provide a name and, if desired, enable any advanced options</source>
+        <translation type="unfinished">Jekk jgħoġbok provdi isem u, jekk trid, ixgħel għażliet avvanzati</translation>
+    </message>
+    <message>
+        <source>Wallet Name</source>
+        <translation type="unfinished">Isem tal-Kartiera</translation>
+    </message>
+    <message>
+        <source>Wallet</source>
+        <translation type="unfinished">Kartiera</translation>
+    </message>
+    <message>
+        <source>Encrypt the wallet. The wallet will be encrypted with a passphrase of your choice.</source>
+        <translation type="unfinished">Kripta l-kartiera. Il-kartiera se tiġi kriptata b'passphrase tal-għażla tiegħek.</translation>
+    </message>
+    <message>
+        <source>Encrypt Wallet</source>
+        <translation type="unfinished">Kripta l-Kartiera</translation>
+    </message>
+    <message>
+        <source>Advanced Options</source>
+        <translation type="unfinished">Għażliet Avvanzati</translation>
+    </message>
+    <message>
+        <source>Disable private keys for this wallet. Wallets with private keys disabled will have no private keys and cannot have an HD seed or imported private keys. This is ideal for watch-only wallets.</source>
+        <translation type="unfinished">Itfi ċ-ċwievet privati għal din il-kartiera. Kartieri bi ċwievet privati mitfijin tfisser li ma jkollhomx ċwievet privati u ma jistgħux ikollhom ċwievet privati tat-tip 'HD seed' jew importati. Din hija ideali għal kartieri 'watch-only'.</translation>
+    </message>
+    <message>
+        <source>Disable Private Keys</source>
+        <translation type="unfinished">Itfi ċ-Ċwievet Privati</translation>
+    </message>
+    <message>
+        <source>Make Blank Wallet</source>
+        <translation type="unfinished">Oħloq Kartiera Vojta</translation>
+    </message>
+    <message>
+        <source>Use an external signing device such as a hardware wallet. Configure the external signer script in wallet preferences first.</source>
+        <translation type="unfinished">Uża inġenju tal-iffirmar esternali, pereżempju kartiera fiżika. Ikkonfigura is-skript tal-iffirmar esternali fil-preferenzi tal-kartiera l-ewwel.</translation>
+    </message>
+    <message>
+        <source>External signer</source>
+        <translation type="unfinished">Firmatarju/a estern/a</translation>
+    </message>
+    <message>
+        <source>Create</source>
+        <translation type="unfinished">Oħloq/Ikkrea</translation>
+    </message>
+    <message>
+        <source>Compiled without external signing support (required for external signing)</source>
+        <extracomment>"External signing" means using devices such as hardware wallets.</extracomment>
+        <translation type="unfinished">Ġie/t ikkompilat/a mingħajr sapport estern (li hemm bżonnu biex isir iffirmar estern)</translation>
+    </message>
+</context>
+<context>
+    <name>EditAddressDialog</name>
+    <message>
+        <source>Edit Address</source>
+        <translation type="unfinished">Aġġorna l-Indirizz</translation>
+    </message>
+    <message>
+        <source>&amp;Label</source>
+        <translation type="unfinished">&amp;Tikketta</translation>
+    </message>
+    <message>
+        <source>The label associated with this address list entry</source>
+        <translation type="unfinished">It-tikketta assoċjata ma' dan ir-rekord fil-lista tal-indirizzi</translation>
+    </message>
+    <message>
+        <source>The address associated with this address list entry. This can only be modified for sending addresses.</source>
+        <translation type="unfinished">L-indirizz assoċjat ma' dan ir-rekord fil-lista tal-indirizzi. Dan jista' jiġi mmodifikat biss għall-indirizzi li tibgħat minnhom.</translation>
+    </message>
+    <message>
+        <source>&amp;Address</source>
+        <translation type="unfinished">&amp;Indiriz</translation>
+    </message>
+    <message>
+        <source>New sending address</source>
+        <translation type="unfinished">Indirizz ġdid li tibgħat minnu</translation>
+    </message>
+    <message>
+        <source>Edit receiving address</source>
+        <translation type="unfinished">Aġġorna indirizz li fih tirċievi</translation>
+    </message>
+    <message>
+        <source>Edit sending address</source>
+        <translation type="unfinished">Aġġorna indirizz li tibgħat minnu</translation>
+    </message>
+    <message>
+        <source>The entered address "%1" is not a valid Bitcoin address.</source>
+        <translation type="unfinished">L-indirizz li ktibt "%1" mhuwiex indirizz validu tal-Bitcoin.</translation>
+    </message>
+    <message>
+        <source>Address "%1" already exists as a receiving address with label "%2" and so cannot be added as a sending address.</source>
+        <translation type="unfinished">L-indirizz "%1" diġà jeżisti bħala indirizz li tirċievi fiħ bit-tikketta "%2", u għalhekk ma jistax jiġi miżjud bħala indirizz li tibgħat minnu.</translation>
+    </message>
+    <message>
+        <source>The entered address "%1" is already in the address book with label "%2".</source>
+        <translation type="unfinished">L-indiriżż li ktibt "%1" diġa qiegħed fil-ktieb tal-indirizzi bit-tikketta "%2".</translation>
+    </message>
+    <message>
+        <source>Could not unlock wallet.</source>
+        <translation type="unfinished">Ma jistax tiġi miftuħa l-kartiera.</translation>
+    </message>
+    <message>
+        <source>New key generation failed.</source>
+        <translation type="unfinished">Il-ġenerazzjoni ta' ċavetta ġdida falliet.</translation>
+    </message>
+</context>
+<context>
+    <name>FreespaceChecker</name>
+    <message>
+        <source>A new data directory will be created.</source>
+        <translation type="unfinished">Direttorju ġdid tad-dejta se jiġi kkreat.</translation>
+    </message>
+    <message>
+        <source>name</source>
+        <translation type="unfinished">isem</translation>
+    </message>
+    <message>
+        <source>Directory already exists. Add %1 if you intend to create a new directory here.</source>
+        <translation type="unfinished">Id-direttorju diġa jeżisti. Żid %1 jekk kellek l-intenzjoni li toħloq direttorju ġdid hawnhekk.</translation>
+    </message>
+    <message>
+        <source>Path already exists, and is not a directory.</source>
+        <translation type="unfinished">Il-path teżisti diġa, u mhijiex direttorju.</translation>
+    </message>
+    <message>
+        <source>Cannot create data directory here.</source>
+        <translation type="unfinished">Ma tistax toħloq direttorju tad-dejta hawnhekk.</translation>
+    </message>
+</context>
+<context>
+    <name>HelpMessageDialog</name>
+    <message>
+        <source>version</source>
+        <translation type="unfinished">verżjoni</translation>
+    </message>
+    <message>
+        <source>About %1</source>
+        <translation type="unfinished">Dwar %1</translation>
+    </message>
+    <message>
+        <source>Command-line options</source>
+        <translation type="unfinished">Preferenzi tal-linja tal-kmand</translation>
+    </message>
+</context>
+<context>
+    <name>ShutdownWindow</name>
+    <message>
+        <source>%1 is shutting down…</source>
+        <translation type="unfinished">%1 qed jintefa' ...</translation>
+    </message>
+    <message>
+        <source>Do not shut down the computer until this window disappears.</source>
+        <translation type="unfinished">Titfix il-kompjuter sakemm tisparixxi din.</translation>
+    </message>
+</context>
+<context>
+    <name>Intro</name>
+    <message>
+        <source>Welcome</source>
+        <translation type="unfinished">Merħba</translation>
+    </message>
+    <message>
+        <source>Welcome to %1.</source>
+        <translation type="unfinished">Merħba għal %1.</translation>
+    </message>
+    <message>
+        <source>As this is the first time the program is launched, you can choose where %1 will store its data.</source>
+        <translation type="unfinished">Peressli din hija l-ewwel darba li l-programm qed jintuża, tista tagħżel fejn %1 għandu jżomm id-dejta.</translation>
+    </message>
+    <message>
+        <source>Limit block chain storage to</source>
+        <translation type="unfinished">Illimita iż-żamm tal-block chain għal</translation>
+    </message>
+    <message>
+        <source> GB</source>
+        <translation type="unfinished">GB</translation>
+    </message>
+    <message>
+        <source>Use the default data directory</source>
+        <translation type="unfinished">Uża d-direttorju prestabbilit tad-dejta</translation>
+    </message>
+    <message>
+        <source>Use a custom data directory:</source>
+        <translation type="unfinished">Uża direttorju tad-dejta li trid: </translation>
+    </message>
+    <message numerus="yes">
+        <source>%n GB of space available</source>
+        <translation type="unfinished">
+            <numerusform>%n ta' spazju disponibbli</numerusform>
+            <numerusform>%nGB ta' spazju disponibbli</numerusform>
+            <numerusform>%nGB ta' spazju disponibbli</numerusform>
+            <numerusform>%nGB ta' spazju disponibbli</numerusform>
+        </translation>
+    </message>
+    <message numerus="yes">
+        <source>(of %n GB needed)</source>
+        <translation type="unfinished">
+            <numerusform>(minn %n GB meħtieġa)</numerusform>
+            <numerusform>(minn %n GB meħtieġa)</numerusform>
+            <numerusform>(minn %n GB meħtieġa)</numerusform>
+            <numerusform>(minn %n GB meħtieġa)</numerusform>
+        </translation>
+    </message>
+    <message numerus="yes">
+        <source>(%n GB needed for full chain)</source>
+        <translation type="unfinished">
+            <numerusform>(%n GB meħtieġa għall-katina sħiħa)</numerusform>
+            <numerusform>(%n GB meħtieġa għall-katina sħiħa)</numerusform>
+            <numerusform>(%n GB meħtieġa għall-katina sħiħa)</numerusform>
+            <numerusform>(%n GB meħtieġa għall-katina sħiħa)</numerusform>
+        </translation>
+    </message>
+    <message>
+        <source>Choose data directory</source>
+        <translation type="unfinished">Agħżel id-direttorju tad-dejta</translation>
+    </message>
+    <message>
+        <source>At least %1 GB of data will be stored in this directory, and it will grow over time.</source>
+        <translation type="unfinished">Mill-inqas %1 GB ta' dejta se jiġu miżmuma f'dan id-direttorju, u dan se jikber biż-żmien.</translation>
+    </message>
+    <message>
+        <source>Approximately %1 GB of data will be stored in this directory.</source>
+        <translation type="unfinished">Approssimament %1 GB ta' dejta se jiġu miżmuma f'dan id-direttorju.</translation>
+    </message>
+    <message numerus="yes">
+        <source>(sufficient to restore backups %n day(s) old)</source>
+        <extracomment>Explanatory text on the capability of the current prune target.</extracomment>
+        <translation type="unfinished">
+            <numerusform />
+            <numerusform />
+            <numerusform />
+            <numerusform />
+        </translation>
+    </message>
+    <message>
+        <source>Error</source>
+        <translation type="unfinished">Żball</translation>
+    </message>
+</context>
+<context>
+    <name>ModalOverlay</name>
+    <message>
+        <source>Form</source>
+        <translation type="unfinished">Formola</translation>
+    </message>
+    <message>
+        <source>Unknown…</source>
+        <translation type="unfinished">Mhux magħruf...</translation>
+    </message>
+    <message>
+        <source>calculating…</source>
+        <translation type="unfinished">qed j/tiġi kkalkulat/a...</translation>
+    </message>
+    <message>
+        <source>Last block time</source>
+        <translation type="unfinished">Ħin tal-aħħar blokka</translation>
+    </message>
+    <message>
+        <source>Hide</source>
+        <translation type="unfinished">Aħbi</translation>
+    </message>
+    </context>
+<context>
+    <name>OpenURIDialog</name>
+    <message>
+        <source>Open bitcoin URI</source>
+        <translation type="unfinished">Iftaħ URI tal-bitcoin</translation>
+    </message>
+    <message>
+        <source>Paste address from clipboard</source>
+        <extracomment>Tooltip text for button that allows you to paste an address that is in your clipboard.</extracomment>
+        <translation type="unfinished">Ehmeż indirizz mill-clipboard</translation>
+    </message>
+</context>
+<context>
+    <name>OptionsDialog</name>
+    <message>
+        <source>Options</source>
+        <translation type="unfinished">Preferenzi</translation>
+    </message>
+    <message>
+        <source>&amp;Main</source>
+        <translation type="unfinished">&amp;Prinċipali</translation>
+    </message>
+    <message>
+        <source>Automatically start %1 after logging in to the system.</source>
+        <translation type="unfinished">Awtomatikament ibda %1 wara li tidħol fis-sistema.</translation>
+    </message>
+    <message>
+        <source>&amp;Start %1 on system login</source>
+        <translation type="unfinished">&amp;Ibda %1 wara li tidħol fis-sistema</translation>
+    </message>
+    <message>
+        <source>Size of &amp;database cache</source>
+        <translation type="unfinished">Id-daqs tal-cache tad-&amp;database</translation>
+    </message>
+    <message>
+        <source>&amp;Network</source>
+        <translation type="unfinished">&amp;Netwerk</translation>
+    </message>
+    <message>
+        <source>W&amp;allet</source>
+        <translation type="unfinished">K&amp;artiera</translation>
+    </message>
+    <message>
+        <source>Expert</source>
+        <translation type="unfinished">Espert</translation>
+    </message>
+    <message>
+        <source>&amp;Window</source>
+        <translation type="unfinished">&amp; Tieqa</translation>
+    </message>
+    <message>
+        <source>&amp;Display</source>
+        <translation type="unfinished">&amp;Wiri</translation>
+    </message>
+    <message>
+        <source>&amp;Cancel</source>
+        <translation type="unfinished">&amp;Ikkanċella</translation>
+    </message>
+    <message>
+        <source>Compiled without external signing support (required for external signing)</source>
+        <extracomment>"External signing" means using devices such as hardware wallets.</extracomment>
+        <translation type="unfinished">Ġie/t ikkompilat/a mingħajr sapport estern (li hemm bżonnu biex isir iffirmar estern)</translation>
+    </message>
+    <message>
+        <source>default</source>
+        <translation type="unfinished">prestabbilit/a</translation>
+    </message>
+    <message>
+        <source>none</source>
+        <translation type="unfinished">xejn</translation>
+    </message>
+    <message>
+        <source>Continue</source>
+        <translation type="unfinished">Kompli</translation>
+    </message>
+    <message>
+        <source>Cancel</source>
+        <translation type="unfinished">Ikkanċella</translation>
+    </message>
+    <message>
+        <source>Error</source>
+        <translation type="unfinished">Żball</translation>
+    </message>
+    </context>
+<context>
+    <name>OverviewPage</name>
+    <message>
+        <source>Form</source>
+        <translation type="unfinished">Formola</translation>
+    </message>
+    <message>
+        <source>Available:</source>
+        <translation type="unfinished">Disponibbli:</translation>
+    </message>
+    <message>
+        <source>Pending:</source>
+        <translation type="unfinished">Pendenti:</translation>
+    </message>
+    <message>
+        <source>Immature:</source>
+        <translation type="unfinished">Immaturi:</translation>
+    </message>
+    <message>
+        <source>Balances</source>
+        <translation type="unfinished">Bilanċi</translation>
+    </message>
+    <message>
+        <source>Total:</source>
+        <translation type="unfinished">Totali:</translation>
+    </message>
+    </context>
+<context>
+    <name>PSBTOperationsDialog</name>
+    <message>
+        <source>Save…</source>
+        <translation type="unfinished">Aġġorna...</translation>
+    </message>
+    <message>
+        <source>Close</source>
+        <translation type="unfinished">Agħlaq</translation>
+    </message>
+    <message numerus="yes">
+        <source>Signed %n input(s), but more signatures are still required.</source>
+        <translation type="unfinished">
+            <numerusform />
+            <numerusform />
+            <numerusform />
+            <numerusform />
+        </translation>
+    </message>
+    <message>
+        <source>or</source>
+        <translation type="unfinished">jew</translation>
+    </message>
+    <message numerus="yes">
+        <source>Transaction has %n unsigned input(s).</source>
+        <translation type="unfinished">
+            <numerusform />
+            <numerusform />
+            <numerusform />
+            <numerusform />
+        </translation>
+    </message>
+    </context>
+<context>
+    <name>PeerTableModel</name>
+    <message>
+        <source>Peer</source>
+        <extracomment>Title of Peers Table column which contains a unique number used to identify a connection.</extracomment>
+        <translation type="unfinished">Pari</translation>
+    </message>
+    <message>
+        <source>Age</source>
+        <extracomment>Title of Peers Table column which indicates the duration (length of time) since the peer connection started.</extracomment>
+        <translation type="unfinished">Età</translation>
+    </message>
+    <message>
+        <source>Direction</source>
+        <extracomment>Title of Peers Table column which indicates the direction the peer connection was initiated from.</extracomment>
+        <translation type="unfinished">Direzzjoni</translation>
+    </message>
+    <message>
+        <source>Sent</source>
+        <extracomment>Title of Peers Table column which indicates the total amount of network information we have sent to the peer.</extracomment>
+        <translation type="unfinished">Mibgħut/a</translation>
+    </message>
+    <message>
+        <source>Received</source>
+        <extracomment>Title of Peers Table column which indicates the total amount of network information we have received from the peer.</extracomment>
+        <translation type="unfinished">Riċevut/a</translation>
+    </message>
+    <message>
+        <source>Address</source>
+        <extracomment>Title of Peers Table column which contains the IP/Onion/I2P address of the connected peer.</extracomment>
+        <translation type="unfinished">Indirizz</translation>
+    </message>
+    <message>
+        <source>Type</source>
+        <extracomment>Title of Peers Table column which describes the type of peer connection. The "type" describes why the connection exists.</extracomment>
+        <translation type="unfinished">Tip</translation>
+    </message>
+    <message>
+        <source>Network</source>
+        <extracomment>Title of Peers Table column which states the network the peer connected through.</extracomment>
+        <translation type="unfinished">Netwerk</translation>
+    </message>
+    <message>
+        <source>Inbound</source>
+        <extracomment>An Inbound Connection from a Peer.</extracomment>
+        <translation type="unfinished">Dieħel</translation>
+    </message>
+    <message>
+        <source>Outbound</source>
+        <extracomment>An Outbound Connection to a Peer.</extracomment>
+        <translation type="unfinished">Ħiereġ</translation>
+    </message>
+</context>
+<context>
+    <name>RPCConsole</name>
+    <message>
+        <source>&amp;Information</source>
+        <translation type="unfinished">&amp;Informazzjoni</translation>
+    </message>
+    <message>
+        <source>General</source>
+        <translation type="unfinished">Ġenerali</translation>
+    </message>
+    <message>
+        <source>Network</source>
+        <translation type="unfinished">Netwerk</translation>
+    </message>
+    <message>
+        <source>Name</source>
+        <translation type="unfinished">Isem</translation>
+    </message>
+    <message>
+        <source>Wallet: </source>
+        <translation type="unfinished">Kartiera:</translation>
+    </message>
+    <message>
+        <source>(none)</source>
+        <translation type="unfinished">(xejn)</translation>
+    </message>
+    <message>
+        <source>&amp;Reset</source>
+        <translation type="unfinished">&amp;Irrisetja</translation>
+    </message>
+    <message>
+        <source>Received</source>
+        <translation type="unfinished">Riċevut/a</translation>
+    </message>
+    <message>
+        <source>Sent</source>
+        <translation type="unfinished">Mibgħut/a</translation>
+    </message>
+    <message>
+        <source>&amp;Peers</source>
+        <translation type="unfinished">&amp;Pari</translation>
+    </message>
+    <message>
+        <source>Transport</source>
+        <translation type="unfinished">Trasport</translation>
+    </message>
+    <message>
+        <source>Version</source>
+        <translation type="unfinished">Verżjoni</translation>
+    </message>
+    <message>
+        <source>Node window</source>
+        <translation type="unfinished">Tieqa tan-node</translation>
+    </message>
+    <message>
+        <source>Permissions</source>
+        <translation type="unfinished">Permissjonijiet</translation>
+    </message>
+    <message>
+        <source>Direction/Type</source>
+        <translation type="unfinished">Direzzjoni/Tip</translation>
+    </message>
+    <message>
+        <source>Services</source>
+        <translation type="unfinished">Servizzi</translation>
+    </message>
+    <message>
+        <source>Last block time</source>
+        <translation type="unfinished">Ħin tal-aħħar blokka</translation>
+    </message>
+    <message>
+        <source>&amp;Open</source>
+        <translation type="unfinished">&amp;Iftaħ</translation>
+    </message>
+    <message>
+        <source>Totals</source>
+        <translation type="unfinished">Totali</translation>
+    </message>
+    <message>
+        <source>In:</source>
+        <translation type="unfinished">Ġewwa:</translation>
+    </message>
+    <message>
+        <source>Out:</source>
+        <translation type="unfinished">Barra:</translation>
+    </message>
+    <message>
+        <source>&amp;Copy address</source>
+        <extracomment>Context menu action to copy the address of a peer.</extracomment>
+        <translation type="unfinished">&amp;Ikkopja l-indirizz</translation>
+    </message>
+    <message>
+        <source>&amp;Disconnect</source>
+        <translation type="unfinished">&amp;Skonnetja</translation>
+    </message>
+    <message>
+        <source>&amp;Unban</source>
+        <translation type="unfinished">&amp;Neħħi l-projbizzjoni</translation>
+    </message>
+    <message>
+        <source>None</source>
+        <translation type="unfinished">Xejn</translation>
+    </message>
+    <message>
+        <source>Executing…</source>
+        <extracomment>A console message indicating an entered command is currently being executed.</extracomment>
+        <translation type="unfinished">Qed j/tiġi eżegwit/a..</translation>
+    </message>
+    <message>
+        <source>Yes</source>
+        <translation type="unfinished">Iva</translation>
+    </message>
+    <message>
+        <source>No</source>
+        <translation type="unfinished">Le</translation>
+    </message>
+    <message>
+        <source>To</source>
+        <translation type="unfinished">Għal</translation>
+    </message>
+    <message>
+        <source>From</source>
+        <translation type="unfinished">Min</translation>
+    </message>
+    <message>
+        <source>Never</source>
+        <translation type="unfinished">Qatt</translation>
+    </message>
+    <message>
+        <source>Unknown</source>
+        <translation type="unfinished">Mhux magħruf</translation>
+    </message>
+</context>
+<context>
+    <name>ReceiveCoinsDialog</name>
+    <message>
+        <source>&amp;Amount:</source>
+        <translation type="unfinished">&amp;Ammont:</translation>
+    </message>
+    <message>
+        <source>&amp;Label:</source>
+        <translation type="unfinished">&amp;Tikketta:</translation>
+    </message>
+    <message>
+        <source>&amp;Message:</source>
+        <translation type="unfinished">&amp;Messaġġ:</translation>
+    </message>
+    <message>
+        <source>Clear</source>
+        <translation type="unfinished">Klerja</translation>
+    </message>
+    <message>
+        <source>Show</source>
+        <translation type="unfinished">Uri</translation>
+    </message>
+    <message>
+        <source>Remove</source>
+        <translation type="unfinished">Neħħi</translation>
+    </message>
+    <message>
+        <source>&amp;Copy address</source>
+        <translation type="unfinished">&amp;Ikkopja l-indirizz</translation>
+    </message>
+    <message>
+        <source>Copy &amp;label</source>
+        <translation type="unfinished">Ikkopja &amp;it-tikketta</translation>
+    </message>
+    <message>
+        <source>Copy &amp;amount</source>
+        <translation type="unfinished">Ikkopja &amp;l-ammont</translation>
+    </message>
+    <message>
+        <source>Could not unlock wallet.</source>
+        <translation type="unfinished">Ma jistax tiġi miftuħa l-kartiera.</translation>
+    </message>
+    </context>
+<context>
+    <name>ReceiveRequestDialog</name>
+    <message>
+        <source>Address:</source>
+        <translation type="unfinished">Indirizz:</translation>
+    </message>
+    <message>
+        <source>Amount:</source>
+        <translation type="unfinished">Ammont:</translation>
+    </message>
+    <message>
+        <source>Label:</source>
+        <translation type="unfinished">Tikketta:</translation>
+    </message>
+    <message>
+        <source>Message:</source>
+        <translation type="unfinished">Messaġġ:</translation>
+    </message>
+    <message>
+        <source>Wallet:</source>
+        <translation type="unfinished">Kartiera:</translation>
+    </message>
+    <message>
+        <source>&amp;Verify</source>
+        <translation type="unfinished">&amp;Ivverifika</translation>
+    </message>
+    </context>
+<context>
+    <name>RecentRequestsTableModel</name>
+    <message>
+        <source>Date</source>
+        <translation type="unfinished">Data</translation>
+    </message>
+    <message>
+        <source>Label</source>
+        <translation type="unfinished">Tikketta</translation>
+    </message>
+    <message>
+        <source>Message</source>
+        <translation type="unfinished">Messaġġ</translation>
+    </message>
+    <message>
+        <source>(no label)</source>
+        <translation type="unfinished">(l-ebda tikketta)</translation>
+    </message>
+    <message>
+        <source>Requested</source>
+        <translation type="unfinished">Ġie/t rikjest/a</translation>
+    </message>
+</context>
+<context>
+    <name>SendCoinsDialog</name>
+    <message>
+        <source>Quantity:</source>
+        <translation type="unfinished">Kwantità:</translation>
+    </message>
+    <message>
+        <source>Amount:</source>
+        <translation type="unfinished">Ammont:</translation>
+    </message>
+    <message>
+        <source>Fee:</source>
+        <translation type="unfinished">Tariffa:</translation>
+    </message>
+    <message>
+        <source>After Fee:</source>
+        <translation type="unfinished">Wara Ħlas:</translation>
+    </message>
+    <message>
+        <source>Change:</source>
+        <translation type="unfinished">Bidla:</translation>
+    </message>
+    <message>
+        <source>Hide</source>
+        <translation type="unfinished">Aħbi</translation>
+    </message>
+    <message>
+        <source>Recommended:</source>
+        <translation type="unfinished">Irrikmandat/a:</translation>
+    </message>
+    <message>
+        <source>Custom:</source>
+        <translation type="unfinished">Personalizzat/a:</translation>
+    </message>
+    <message>
+        <source>Inputs…</source>
+        <translation type="unfinished">Inputs..</translation>
+    </message>
+    <message>
+        <source>Choose…</source>
+        <translation type="unfinished">Agħżel..</translation>
+    </message>
+    <message>
+        <source>Balance:</source>
+        <translation type="unfinished">Bilanċ: </translation>
+    </message>
+    <message>
+        <source>S&amp;end</source>
+        <translation type="unfinished">I&amp;bgħat</translation>
+    </message>
+    <message>
+        <source>Copy quantity</source>
+        <translation type="unfinished">Ikkopja l-kwantità</translation>
+    </message>
+    <message>
+        <source>Copy amount</source>
+        <translation type="unfinished">Ikkopja l-ammont</translation>
+    </message>
+    <message>
+        <source>Copy fee</source>
+        <translation type="unfinished">Ikkopja l-ħlas</translation>
+    </message>
+    <message>
+        <source>Copy after fee</source>
+        <translation type="unfinished">Ikkopja wara l-ħlas</translation>
+    </message>
+    <message>
+        <source>Copy bytes</source>
+        <translation type="unfinished">Ikkopja l-bytes</translation>
+    </message>
+    <message>
+        <source>Copy change</source>
+        <translation type="unfinished">Ikkopja l-bidla</translation>
+    </message>
+    <message>
+        <source>or</source>
+        <translation type="unfinished">jew</translation>
+    </message>
+    <message>
+        <source>%1/kvB</source>
+        <translation type="unfinished">%1 /kvB</translation>
+    </message>
+    <message numerus="yes">
+        <source>Estimated to begin confirmation within %n block(s).</source>
+        <translation type="unfinished">
+            <numerusform />
+            <numerusform />
+            <numerusform />
+            <numerusform />
+        </translation>
+    </message>
+    <message>
+        <source>(no label)</source>
+        <translation type="unfinished">(l-ebda tikketta)</translation>
+    </message>
+</context>
+<context>
+    <name>SendCoinsEntry</name>
+    <message>
+        <source>A&amp;mount:</source>
+        <translation type="unfinished">A&amp;mmont:</translation>
+    </message>
+    <message>
+        <source>&amp;Label:</source>
+        <translation type="unfinished">&amp;Tikketta:</translation>
+    </message>
+    <message>
+        <source>Paste address from clipboard</source>
+        <translation type="unfinished">Ehmeż indirizz mill-clipboard</translation>
+    </message>
+    <message>
+        <source>Message:</source>
+        <translation type="unfinished">Messaġġ:</translation>
+    </message>
+    </context>
+<context>
+    <name>SendConfirmationDialog</name>
+    <message>
+        <source>Send</source>
+        <translation type="unfinished">Ibgħat</translation>
+    </message>
+    </context>
+<context>
+    <name>SignVerifyMessageDialog</name>
+    <message>
+        <source>Paste address from clipboard</source>
+        <translation type="unfinished">Ehmeż indirizz mill-clipboard</translation>
+    </message>
+    <message>
+        <source>Signature</source>
+        <translation type="unfinished">Firma</translation>
+    </message>
+    </context>
+<context>
+    <name>TransactionDesc</name>
+    <message>
+        <source>abandoned</source>
+        <extracomment>Text explaining the current status of a transaction, shown in the status field of the details window for this transaction. This status represents an abandoned transaction.</extracomment>
+        <translation type="unfinished">abbandunat/a</translation>
+    </message>
+    <message>
+        <source>%1/unconfirmed</source>
+        <extracomment>Text explaining the current status of a transaction, shown in the status field of the details window for this transaction. This status represents a transaction confirmed in at least one block, but less than 6 blocks.</extracomment>
+        <translation type="unfinished">%1 /mhux ikkonfermat/a</translation>
+    </message>
+    <message>
+        <source>Date</source>
+        <translation type="unfinished">Data</translation>
+    </message>
+    <message>
+        <source>Source</source>
+        <translation type="unfinished">Sors</translation>
+    </message>
+    <message>
+        <source>Generated</source>
+        <translation type="unfinished">Iġġenerat/a</translation>
+    </message>
+    <message>
+        <source>From</source>
+        <translation type="unfinished">Min</translation>
+    </message>
+    <message>
+        <source>unknown</source>
+        <translation type="unfinished">mhux magħruf</translation>
+    </message>
+    <message>
+        <source>To</source>
+        <translation type="unfinished">Għal</translation>
+    </message>
+    <message>
+        <source>label</source>
+        <translation type="unfinished">tikketta</translation>
+    </message>
+    <message>
+        <source>Credit</source>
+        <translation type="unfinished">Kreditu</translation>
+    </message>
+    <message numerus="yes">
+        <source>matures in %n more block(s)</source>
+        <translation type="unfinished">
+            <numerusform />
+            <numerusform />
+            <numerusform />
+            <numerusform />
+        </translation>
+    </message>
+    <message>
+        <source>Message</source>
+        <translation type="unfinished">Messaġġ</translation>
+    </message>
+    <message>
+        <source>Comment</source>
+        <translation type="unfinished">Kumment</translation>
+    </message>
+    <message>
+        <source>Merchant</source>
+        <translation type="unfinished">Bejjiegħ</translation>
+    </message>
+    <message>
+        <source>Transaction</source>
+        <translation type="unfinished">Transazzjoni</translation>
+    </message>
+    <message>
+        <source>Amount</source>
+        <translation type="unfinished">Ammont</translation>
+    </message>
+    <message>
+        <source>true</source>
+        <translation type="unfinished">veru</translation>
+    </message>
+    <message>
+        <source>false</source>
+        <translation type="unfinished">falz</translation>
+    </message>
+</context>
+<context>
+    <name>TransactionTableModel</name>
+    <message>
+        <source>Date</source>
+        <translation type="unfinished">Data</translation>
+    </message>
+    <message>
+        <source>Type</source>
+        <translation type="unfinished">Tip</translation>
+    </message>
+    <message>
+        <source>Label</source>
+        <translation type="unfinished">Tikketta</translation>
+    </message>
+    <message>
+        <source>Unconfirmed</source>
+        <translation type="unfinished">Mhux ikkonfermat/a</translation>
+    </message>
+    <message>
+        <source>Abandoned</source>
+        <translation type="unfinished">Abbandunat/a</translation>
+    </message>
+    <message>
+        <source>Conflicted</source>
+        <translation type="unfinished">Kunflittat/a</translation>
+    </message>
+    <message>
+        <source>Mined</source>
+        <translation type="unfinished">Imminati</translation>
+    </message>
+    <message>
+        <source>(no label)</source>
+        <translation type="unfinished">(l-ebda tikketta)</translation>
+    </message>
+    </context>
+<context>
+    <name>TransactionView</name>
+    <message>
+        <source>All</source>
+        <translation type="unfinished">Kollha</translation>
+    </message>
+    <message>
+        <source>Today</source>
+        <translation type="unfinished">Illu</translation>
+    </message>
+    <message>
+        <source>Mined</source>
+        <translation type="unfinished">Imminati</translation>
+    </message>
+    <message>
+        <source>Other</source>
+        <translation type="unfinished">Oħrajn</translation>
+    </message>
+    <message>
+        <source>Range…</source>
+        <translation type="unfinished">Firxa...</translation>
+    </message>
+    <message>
+        <source>&amp;Copy address</source>
+        <translation type="unfinished">&amp;Ikkopja l-indirizz</translation>
+    </message>
+    <message>
+        <source>Copy &amp;label</source>
+        <translation type="unfinished">Ikkopja &amp;it-tikketta</translation>
+    </message>
+    <message>
+        <source>Copy &amp;amount</source>
+        <translation type="unfinished">Ikkopja &amp;l-ammont</translation>
+    </message>
+    <message>
+        <source>Comma separated file</source>
+        <extracomment>Expanded name of the CSV file format. See: https://en.wikipedia.org/wiki/Comma-separated_values.</extracomment>
+        <translation type="unfinished">Fajl separat bil-virgola</translation>
+    </message>
+    <message>
+        <source>Confirmed</source>
+        <translation type="unfinished">Ikkonfermat/a</translation>
+    </message>
+    <message>
+        <source>Date</source>
+        <translation type="unfinished">Data</translation>
+    </message>
+    <message>
+        <source>Type</source>
+        <translation type="unfinished">Tip</translation>
+    </message>
+    <message>
+        <source>Label</source>
+        <translation type="unfinished">Tikketta</translation>
+    </message>
+    <message>
+        <source>Address</source>
+        <translation type="unfinished">Indirizz</translation>
+    </message>
+    <message>
+        <source>Exporting Failed</source>
+        <translation type="unfinished">L-esportazzjoni falliet</translation>
+    </message>
+    <message>
+        <source>Range:</source>
+        <translation type="unfinished">Firxa:</translation>
+    </message>
+    <message>
+        <source>to</source>
+        <translation type="unfinished">għal</translation>
+    </message>
+</context>
+<context>
+    <name>WalletFrame</name>
+    <message>
+        <source>Create a new wallet</source>
+        <translation type="unfinished">Oħloq kartiera ġdida</translation>
+    </message>
+    <message>
+        <source>Error</source>
+        <translation type="unfinished">Żball</translation>
+    </message>
+    </context>
+<context>
+    <name>WalletModel</name>
+    <message>
+        <source>Increase:</source>
+        <translation type="unfinished">Żieda:</translation>
+    </message>
+    </context>
+<context>
+    <name>WalletView</name>
+    <message>
+        <source>&amp;Export</source>
+        <translation type="unfinished">&amp;Esportazzjoni</translation>
+    </message>
+    <message>
+        <source>Export the data in the current tab to a file</source>
+        <translation type="unfinished">Esporta d-dejta fit-tab kurrenti għal fajl</translation>
+    </message>
+    <message>
+        <source>Wallet Data</source>
+        <extracomment>Name of the wallet data file format.</extracomment>
+        <translation type="unfinished">Dejta tal-Kartiera</translation>
+    </message>
+    <message>
+        <source>Cancel</source>
+        <translation type="unfinished">Ikkanċella</translation>
+    </message>
+</context>
+<context>
+    <name>bitcoin-core</name>
+    <message>
+        <source>default wallet</source>
+        <translation type="unfinished">kartiera prestabbilita</translation>
+    </message>
+    <message>
+        <source>Rescanning…</source>
+        <translation type="unfinished">Qed nerġgħu nisskenjaw...</translation>
     </message>
     </context>
 </TS>
\ No newline at end of file
diff --git a/src/qt/locale/bitcoin_nb.ts b/src/qt/locale/bitcoin_nb.ts
index e2632782fd69..4f171546064d 100644
--- a/src/qt/locale/bitcoin_nb.ts
+++ b/src/qt/locale/bitcoin_nb.ts
@@ -1018,6 +1018,14 @@ Signing is only possible with addresses of the type 'legacy'.</source>
         <translation type="unfinished">Laster inn lommebøker...</translation>
     </message>
 </context>
+<context>
+    <name>MigrateWalletActivity</name>
+    <message>
+        <source>Restore Wallet</source>
+        <extracomment>Title of progress window which is displayed when wallets are being restored.</extracomment>
+        <translation type="unfinished">Gjenopprett lommebok</translation>
+    </message>
+    </context>
 <context>
     <name>OpenWalletActivity</name>
     <message>
@@ -1108,10 +1116,6 @@ Signing is only possible with addresses of the type 'legacy'.</source>
         <source>Disable Private Keys</source>
         <translation type="unfinished">Deaktiver Private Nøkler</translation>
     </message>
-    <message>
-        <source>Make a blank wallet. Blank wallets do not initially have private keys or scripts. Private keys and addresses can be imported, or an HD seed can be set, at a later time.</source>
-        <translation type="unfinished">Lag en tom lommebok. Tomme lommebøker har i utgangspunktet ikke private nøkler eller skript. Private nøkler og adresser kan importeres, eller et HD- frø kan angis på et senere tidspunkt.</translation>
-    </message>
     <message>
         <source>Make Blank Wallet</source>
         <translation type="unfinished">Lag Tom Lommebok</translation>
@@ -1743,9 +1747,12 @@ Signing is only possible with addresses of the type 'legacy'.</source>
         <source>Could not sign any more inputs.</source>
         <translation type="unfinished">Kunne ikke signere flere inputs.</translation>
     </message>
-    <message>
-        <source>Signed %1 inputs, but more signatures are still required.</source>
-        <translation type="unfinished">Signerte %1 inputs, men flere signaturer kreves.</translation>
+    <message numerus="yes">
+        <source>Signed %n input(s), but more signatures are still required.</source>
+        <translation type="unfinished">
+            <numerusform />
+            <numerusform />
+        </translation>
     </message>
     <message>
         <source>Signed transaction successfully. Transaction is ready to broadcast.</source>
@@ -1800,9 +1807,12 @@ Signing is only possible with addresses of the type 'legacy'.</source>
         <source>or</source>
         <translation type="unfinished">eller</translation>
     </message>
-    <message>
-        <source>Transaction has %1 unsigned inputs.</source>
-        <translation type="unfinished">Transaksjon har %1 usignert inputs.</translation>
+    <message numerus="yes">
+        <source>Transaction has %n unsigned input(s).</source>
+        <translation type="unfinished">
+            <numerusform />
+            <numerusform />
+        </translation>
     </message>
     <message>
         <source>Transaction is missing some information about inputs.</source>
@@ -2056,10 +2066,6 @@ Hvis du får denne feilen burde du be forretningsdrivende om å tilby en BIP21 k
         <source>Version</source>
         <translation type="unfinished">Versjon</translation>
     </message>
-    <message>
-        <source>Starting Block</source>
-        <translation type="unfinished">Startblokk</translation>
-    </message>
     <message>
         <source>Synced Headers</source>
         <translation type="unfinished">Synkroniserte Blokkhoder</translation>
@@ -2790,10 +2796,6 @@ Hvis du får denne feilen burde du be forretningsdrivende om å tilby en BIP21 k
         <source>The amount exceeds your balance.</source>
         <translation type="unfinished">Beløper overstiger saldo.</translation>
     </message>
-    <message>
-        <source>The total exceeds your balance when the %1 transaction fee is included.</source>
-        <translation type="unfinished">Totalbeløpet overstiger saldo etter at %1-transaksjonsgebyret er lagt til.</translation>
-    </message>
     <message>
         <source>Duplicate address found: addresses should only be used once each.</source>
         <translation type="unfinished">Gjenbruk av adresse funnet: Adresser skal kun brukes én gang hver.</translation>
@@ -3627,10 +3629,6 @@ Gå til Fil &gt; Åpne lommebok for å laste en lommebok.
         <source>Warning: Private keys detected in wallet {%s} with disabled private keys</source>
         <translation type="unfinished">Advarsel: Private nøkler oppdaget i lommeboken {%s} med deaktiverte private nøkler</translation>
     </message>
-    <message>
-        <source>Warning: We do not appear to fully agree with our peers! You may need to upgrade, or other nodes may need to upgrade.</source>
-        <translation type="unfinished">Advarsel: Vi ser ikke ut til å være i full overenstemmelse med våre likemenn! Du kan trenge å oppgradere, eller andre noder kan trenge å oppgradere.</translation>
-    </message>
     <message>
         <source>You need to rebuild the database using -reindex to go back to unpruned mode.  This will redownload the entire blockchain</source>
         <translation type="unfinished">Du må gjenoppbygge databasen ved hjelp av -reindex for å gå tilbake til ubeskåret modus. Dette vil laste ned hele blokkjeden på nytt.</translation>
@@ -3693,10 +3691,6 @@ Kunne ikke gjenopprette sikkerhetskopi av lommebok.</translation>
         <source>Dump file %s does not exist.</source>
         <translation type="unfinished">Dump fil %s eksisterer ikke.</translation>
     </message>
-    <message>
-        <source>Error creating %s</source>
-        <translation type="unfinished">Feil under opprettelse av %s</translation>
-    </message>
     <message>
         <source>Error initializing block database</source>
         <translation type="unfinished">Feil under initialisering av blokkdatabase</translation>
@@ -3705,10 +3699,6 @@ Kunne ikke gjenopprette sikkerhetskopi av lommebok.</translation>
         <source>Error loading %s</source>
         <translation type="unfinished">Feil ved lasting av %s</translation>
     </message>
-    <message>
-        <source>Error loading %s: Private keys can only be disabled during creation</source>
-        <translation type="unfinished">Feil ved lasting av%s: Private nøkler kan bare deaktiveres under opprettelsen</translation>
-    </message>
     <message>
         <source>Error loading %s: Wallet corrupted</source>
         <translation type="unfinished">Feil under innlasting av %s: Skadet lommebok</translation>
@@ -3946,10 +3936,6 @@ Mangler løsningsdata for å estimere transaksjonsstørrelse</translation>
         <source>This is the minimum transaction fee you pay on every transaction.</source>
         <translation type="unfinished">Dette er minimumsgebyret du betaler for hver transaksjon.</translation>
     </message>
-    <message>
-        <source>This is the transaction fee you will pay if you send a transaction.</source>
-        <translation type="unfinished">Dette er transaksjonsgebyret du betaler som forsender av transaksjon.</translation>
-    </message>
     <message>
         <source>Transaction amount too small</source>
         <translation type="unfinished">Transaksjonen er for liten</translation>
diff --git a/src/qt/locale/bitcoin_ne.ts b/src/qt/locale/bitcoin_ne.ts
index 205da889a51a..14455eff6d20 100644
--- a/src/qt/locale/bitcoin_ne.ts
+++ b/src/qt/locale/bitcoin_ne.ts
@@ -759,10 +759,24 @@ Signing is only possible with addresses of the type 'legacy'.</source>
         <source>Close</source>
         <translation type="unfinished">बन्द गर्नुहोस्</translation>
     </message>
+    <message numerus="yes">
+        <source>Signed %n input(s), but more signatures are still required.</source>
+        <translation type="unfinished">
+            <numerusform />
+            <numerusform />
+        </translation>
+    </message>
     <message>
         <source>Transaction broadcast successfully! Transaction ID: %1</source>
         <translation type="unfinished">कारोबार सफलतापूर्वक प्रसारण गरियो! कारोबारआईडी: %1</translation>
     </message>
+    <message numerus="yes">
+        <source>Transaction has %n unsigned input(s).</source>
+        <translation type="unfinished">
+            <numerusform />
+            <numerusform />
+        </translation>
+    </message>
     </context>
 <context>
     <name>PaymentServer</name>
@@ -1009,10 +1023,6 @@ Signing is only possible with addresses of the type 'legacy'.</source>
         <source>This is a pre-release test build - use at your own risk - do not use for mining or merchant applications</source>
         <translation type="unfinished">यो जारी गर्नु पूर्वको परीक्षण संस्करण हो - आफ्नै जोखिममा प्रयोग गर्नुहोस् - खनन वा व्यापारीक प्रयोगको लागि प्रयोग नगर्नुहोस</translation>
     </message>
-    <message>
-        <source>Warning: We do not appear to fully agree with our peers! You may need to upgrade, or other nodes may need to upgrade.</source>
-        <translation type="unfinished">चेतावनी: हामी हाम्रा सहकर्मीहरूसँग पूर्णतया सहमत छैनौं जस्तो देखिन्छ! तपाईंले अपग्रेड गर्नु पर्ने हुनसक्छ वा अरू नोडहरूले अपग्रेड गर्नु पर्ने हुनसक्छ ।</translation>
-    </message>
     <message>
         <source>You need to rebuild the database using -reindex to go back to unpruned mode.  This will redownload the entire blockchain</source>
         <translation type="unfinished">तपाईंले काटछाँट नगरेको मोडमा जान पुनः सूचकांक प्रयोग गरेर डाटाबेस पुनर्निर्माण गर्नु पर्ने हुन्छ । यसले सम्पूर्ण ब्लकचेनलाई फेरि डाउनलोड गर्नेछ</translation>
diff --git a/src/qt/locale/bitcoin_nl.ts b/src/qt/locale/bitcoin_nl.ts
index b8c6fde96cd2..4c42b4911104 100644
--- a/src/qt/locale/bitcoin_nl.ts
+++ b/src/qt/locale/bitcoin_nl.ts
@@ -315,51 +315,9 @@ Ondertekenen is alleen mogelijk met adressen van het type 'legacy'.</translation
         <translation type="unfinished">Aangepast...</translation>
     </message>
     <message>
-        <source>Amount</source>
-        <translation type="unfinished">Bedrag</translation>
-    </message>
-    <message>
-        <source>Enter a Bitcoin address (e.g. %1)</source>
-        <translation type="unfinished">Voer een Bitcoin adres in (bijv. %1)</translation>
-    </message>
-    <message>
-        <source>Unroutable</source>
-        <translation type="unfinished">Niet routeerbaar</translation>
-    </message>
-    <message>
-        <source>Inbound</source>
-        <extracomment>An inbound connection from a peer. An inbound connection is a connection initiated by a peer.</extracomment>
-        <translation type="unfinished">Inkomend</translation>
-    </message>
-    <message>
-        <source>Outbound</source>
-        <extracomment>An outbound connection to a peer. An outbound connection is a connection initiated by us.</extracomment>
-        <translation type="unfinished">Uitgaand</translation>
-    </message>
-    <message>
-        <source>Full Relay</source>
-        <extracomment>Peer connection type that relays all network information.</extracomment>
-        <translation type="unfinished">Volledige relay</translation>
-    </message>
-    <message>
-        <source>Block Relay</source>
-        <extracomment>Peer connection type that relays network information about blocks and not transactions or addresses.</extracomment>
-        <translation type="unfinished">Blok relay</translation>
-    </message>
-    <message>
-        <source>Manual</source>
-        <extracomment>Peer connection type established manually through one of several methods.</extracomment>
-        <translation type="unfinished">Handmatig</translation>
-    </message>
-    <message>
-        <source>Feeler</source>
-        <extracomment>Short-lived peer connection type that tests the aliveness of known addresses.</extracomment>
-        <translation type="unfinished">Sensor</translation>
-    </message>
-    <message>
-        <source>Address Fetch</source>
-        <extracomment>Short-lived peer connection type that solicits known addresses from a peer.</extracomment>
-        <translation type="unfinished">Adres verkrijgen</translation>
+        <source>Private Broadcast</source>
+        <extracomment>Short-lived peer connection type that is used for broadcasting privacy-sensitive data.</extracomment>
+        <translation type="unfinished">Privé Uitzending</translation>
     </message>
     <message>
         <source>%1 h</source>
@@ -674,10 +632,6 @@ Ondertekenen is alleen mogelijk met adressen van het type 'legacy'.</translation
         <source>Load Partially Signed Bitcoin Transaction from clipboard</source>
         <translation type="unfinished">Laad gedeeltelijk ondertekende Bitcoin-transactie vanaf het klembord</translation>
     </message>
-    <message>
-        <source>Node window</source>
-        <translation type="unfinished">Nodevenster</translation>
-    </message>
     <message>
         <source>Open node debugging and diagnostic console</source>
         <translation type="unfinished">Open node debugging en diagnostische console</translation>
@@ -764,6 +718,23 @@ Ondertekenen is alleen mogelijk met adressen van het type 'legacy'.</translation
         <extracomment>Label of the input field where the name of the wallet is entered.</extracomment>
         <translation type="unfinished">Walletnaam</translation>
     </message>
+    <message>
+        <source>Invalid Wallet Name</source>
+        <translation type="unfinished">Ongeldige Walletnaam</translation>
+    </message>
+    <message>
+        <source>Wallet name cannot be empty</source>
+        <translation type="unfinished">Walletnaam kan niet leeg zijn</translation>
+    </message>
+    <message>
+        <source>Restore and Migrate Wallet Backup</source>
+        <translation type="unfinished">Herstel en Migreer Wallet Backup</translation>
+    </message>
+    <message>
+        <source>Restore and Migrate Wallet</source>
+        <extracomment>Title of pop-up window shown when the user is attempting to restore a wallet.</extracomment>
+        <translation type="unfinished">Herstel en Migreer Wallet</translation>
+    </message>
     <message>
         <source>&amp;Window</source>
         <translation type="unfinished">&amp;Scherm</translation>
@@ -928,10 +899,6 @@ Ondertekenen is alleen mogelijk met adressen van het type 'legacy'.</translation
         <source>Received with address</source>
         <translation type="unfinished">Ontvangen met adres</translation>
     </message>
-    <message>
-        <source>Date</source>
-        <translation type="unfinished">Datum</translation>
-    </message>
     <message>
         <source>Confirmations</source>
         <translation type="unfinished">Bevestigingen</translation>
@@ -1093,6 +1060,23 @@ Het migratieproces maakt voorafgaand aan het migreren een backup van de wallet.
         <source>Solvable but not watched scripts have been migrated to a new wallet named '%1'.</source>
         <translation type="unfinished">Oplosbare maar ongemonitorde scripts zijn gemigreerd naar een nieuwe wallet met de naam '%1'.</translation>
     </message>
+    <message>
+        <source>Are you sure you wish to restore the wallet file &lt;i&gt;%1&lt;/i&gt; to &lt;i&gt;%2&lt;/i&gt; and migrate it?</source>
+        <translation type="unfinished">Weet je zeker dat je de wallet file &lt;i&gt;%1&lt;/i&gt; wilt herstellen naar &lt;i&gt;%2&lt;/i&gt; en het wilt migreren?</translation>
+    </message>
+    <message>
+        <source>Restore Wallet</source>
+        <extracomment>Title of progress window which is displayed when wallets are being restored.</extracomment>
+        <translation type="unfinished">Wallet herstellen</translation>
+    </message>
+    <message>
+        <source>Restoring Wallet &lt;b&gt;%1&lt;/b&gt;…</source>
+        <extracomment>Descriptive text of the restore wallets progress window which indicates to the user that wallets are currently being restored.</extracomment>
+        <translation type="unfinished">Herstellen wallet &lt;b&gt;%1&lt;/b&gt;…HerstellenL
+
+
+</translation>
+    </message>
     <message>
         <source>Migration failed</source>
         <translation type="unfinished">Migreren mislukt</translation>
@@ -1216,7 +1200,7 @@ Het migratieproces maakt voorafgaand aan het migreren een backup van de wallet.
         <translation type="unfinished">Schakel privésleutels uit</translation>
     </message>
     <message>
-        <source>Make a blank wallet. Blank wallets do not initially have private keys or scripts. Private keys and addresses can be imported, or an HD seed can be set, at a later time.</source>
+        <source>Make a blank wallet. Blank wallets do not initially have private keys or scripts. Private keys and addresses can be imported using descriptors at a later time.</source>
         <translation type="unfinished">Maak een blanco wallet. Blanco wallets hebben initieel geen privésleutel of scripts. Privésleutels en adressen kunnen worden geimporteerd, of een HD seed kan ingesteld worden, op een later moment.</translation>
     </message>
     <message>
@@ -1836,225 +1820,24 @@ Het migratieproces maakt voorafgaand aan het migreren een backup van de wallet.
         <source>Recent transactions</source>
         <translation type="unfinished">Recente transacties</translation>
     </message>
-    <message>
-        <source>Privacy mode activated for the Overview tab. To unmask the values, uncheck Settings-&gt;Mask values.</source>
-        <translation type="unfinished">Privacymodus geactiveerd voor het tabblad Overzicht. Om de waarden te ontmaskeren, schakelt u Instellingen -&gt; Maskeer waarden uit.</translation>
-    </message>
-</context>
+    </context>
 <context>
     <name>PSBTOperationsDialog</name>
-    <message>
-        <source>PSBT Operations</source>
-        <translation type="unfinished">PSBT Bewerkingen</translation>
-    </message>
-    <message>
-        <source>Sign Tx</source>
-        <translation type="unfinished">Signeer Tx</translation>
-    </message>
-    <message>
-        <source>Broadcast Tx</source>
-        <translation type="unfinished">Zend Tx uit</translation>
-    </message>
-    <message>
-        <source>Copy to Clipboard</source>
-        <translation type="unfinished">Kopieer naar klembord</translation>
-    </message>
-    <message>
-        <source>Save…</source>
-        <translation type="unfinished">Opslaan...</translation>
-    </message>
-    <message>
-        <source>Close</source>
-        <translation type="unfinished">Sluiten</translation>
-    </message>
-    <message>
-        <source>Failed to load transaction: %1</source>
-        <translation type="unfinished">Laden transactie niet gelukt: %1</translation>
-    </message>
-    <message>
-        <source>Failed to sign transaction: %1</source>
-        <translation type="unfinished">Tekenen transactie niet gelukt: %1</translation>
-    </message>
-    <message>
-        <source>Cannot sign inputs while wallet is locked.</source>
-        <translation type="unfinished">Kan invoer niet signen terwijl de wallet is vergrendeld.</translation>
-    </message>
-    <message>
-        <source>Could not sign any more inputs.</source>
-        <translation type="unfinished">Kon geen inputs meer ondertekenen.</translation>
-    </message>
-    <message>
-        <source>Signed %1 inputs, but more signatures are still required.</source>
-        <translation type="unfinished">%1 van de inputs zijn getekend, maar meer handtekeningen zijn nog nodig.</translation>
-    </message>
-    <message>
-        <source>Signed transaction successfully. Transaction is ready to broadcast.</source>
-        <translation type="unfinished">Transactie succesvol getekend. Transactie is klaar voor verzending.</translation>
-    </message>
-    <message>
-        <source>Unknown error processing transaction.</source>
-        <translation type="unfinished">Onbekende fout bij verwerken van transactie.</translation>
-    </message>
-    <message>
-        <source>Transaction broadcast successfully! Transaction ID: %1</source>
-        <translation type="unfinished">Transactie succesvol uitgezonden! Transactie-ID: %1</translation>
-    </message>
-    <message>
-        <source>Transaction broadcast failed: %1</source>
-        <translation type="unfinished">Uitzenden transactie mislukt: %1</translation>
-    </message>
-    <message>
-        <source>PSBT copied to clipboard.</source>
-        <translation type="unfinished">PSBT gekopieerd naar klembord.</translation>
-    </message>
-    <message>
-        <source>Save Transaction Data</source>
-        <translation type="unfinished">Transactiedata Opslaan</translation>
-    </message>
-    <message>
-        <source>Partially Signed Transaction (Binary)</source>
-        <extracomment>Expanded name of the binary PSBT file format. See: BIP 174.</extracomment>
-        <translation type="unfinished">Gedeeltelijk Ondertekende Transactie (Binair)</translation>
-    </message>
-    <message>
-        <source>PSBT saved to disk.</source>
-        <translation type="unfinished">PSBT opgeslagen op de schijf</translation>
-    </message>
-    <message>
-        <source>Sends %1 to %2</source>
-        <translation type="unfinished">Verzenden %1 van %2</translation>
-    </message>
-    <message>
-        <source>own address</source>
-        <translation type="unfinished">eigen adres</translation>
-    </message>
-    <message>
-        <source>Unable to calculate transaction fee or total transaction amount.</source>
-        <translation type="unfinished">Onmogelijk om de transactie kost of totale bedrag te berekenen.</translation>
-    </message>
-    <message>
-        <source>Pays transaction fee: </source>
-        <translation type="unfinished">Betaald transactiekosten:</translation>
-    </message>
-    <message>
-        <source>Total Amount</source>
-        <translation type="unfinished">Totaalbedrag</translation>
-    </message>
-    <message>
-        <source>or</source>
-        <translation type="unfinished">of</translation>
-    </message>
-    <message>
-        <source>Transaction has %1 unsigned inputs.</source>
-        <translation type="unfinished">Transactie heeft %1 niet ondertekende ingaves.</translation>
-    </message>
-    <message>
-        <source>Transaction is missing some information about inputs.</source>
-        <translation type="unfinished">Transactie heeft nog ontbrekende informatie over ingaves.</translation>
-    </message>
-    <message>
-        <source>Transaction still needs signature(s).</source>
-        <translation type="unfinished">Transactie heeft nog handtekening(en) nodig.</translation>
-    </message>
-    <message>
-        <source>(But no wallet is loaded.)</source>
-        <translation type="unfinished">(Maar er is geen wallet geladen.)</translation>
-    </message>
-    <message>
-        <source>(But this wallet cannot sign transactions.)</source>
-        <translation type="unfinished">(Maar deze wallet kan geen transacties signen.)</translation>
-    </message>
-    <message>
-        <source>(But this wallet does not have the right keys.)</source>
-        <translation type="unfinished">(Maar deze wallet heeft niet de juiste sleutels.)</translation>
-    </message>
-    <message>
-        <source>Transaction is fully signed and ready for broadcast.</source>
-        <translation type="unfinished">Transactie is volledig getekend en is klaar voor verzending</translation>
-    </message>
-    <message>
-        <source>Transaction status is unknown.</source>
-        <translation type="unfinished">Transactie status is onbekend</translation>
-    </message>
-</context>
-<context>
-    <name>PaymentServer</name>
-    <message>
-        <source>Payment request error</source>
-        <translation type="unfinished">Fout bij betalingsverzoek</translation>
-    </message>
-    <message>
-        <source>Cannot start bitcoin: click-to-pay handler</source>
-        <translation type="unfinished">Kan bitcoin niet starten: click-to-pay handler</translation>
-    </message>
-    <message>
-        <source>URI handling</source>
-        <translation type="unfinished">URI-behandeling</translation>
-    </message>
-    <message>
-        <source>'bitcoin://' is not a valid URI. Use 'bitcoin:' instead.</source>
-        <translation type="unfinished">'bitcoin://' is niet een geldige URI. Gebruik 'bitcoin:' in plaats daarvan.</translation>
-    </message>
-    <message>
-        <source>Cannot process payment request because BIP70 is not supported.
-Due to widespread security flaws in BIP70 it's strongly recommended that any merchant instructions to switch wallets be ignored.
-If you are receiving this error you should request the merchant provide a BIP21 compatible URI.</source>
-        <translation type="unfinished">Kan betaalverzoek niet verwerken omdat BIP70 niet wordt ondersteund.
-Gezien de wijdverspreide beveiligingsproblemen in BIP70 is het sterk aanbevolen om iedere instructie om van wallet te wisselen te negeren.
-Als je deze fout ziet zou je de aanbieder moeten verzoeken om een BIP21-compatibele URI te verstrekken.</translation>
-    </message>
-    <message>
-        <source>URI cannot be parsed! This can be caused by an invalid Bitcoin address or malformed URI parameters.</source>
-        <translation type="unfinished">URI kan niet verwerkt worden! Dit kan het gevolg zijn van een ongeldig Bitcoin adres of misvormde URI parameters.</translation>
-    </message>
-    <message>
-        <source>Payment request file handling</source>
-        <translation type="unfinished">Betalingsverzoek bestandsafhandeling</translation>
-    </message>
-</context>
-<context>
-    <name>PeerTableModel</name>
-    <message>
-        <source>Age</source>
-        <extracomment>Title of Peers Table column which indicates the duration (length of time) since the peer connection started.</extracomment>
-        <translation type="unfinished">Duur</translation>
-    </message>
-    <message>
-        <source>Direction</source>
-        <extracomment>Title of Peers Table column which indicates the direction the peer connection was initiated from.</extracomment>
-        <translation type="unfinished">Directie</translation>
-    </message>
-    <message>
-        <source>Sent</source>
-        <extracomment>Title of Peers Table column which indicates the total amount of network information we have sent to the peer.</extracomment>
-        <translation type="unfinished">Verstuurd</translation>
-    </message>
-    <message>
-        <source>Received</source>
-        <extracomment>Title of Peers Table column which indicates the total amount of network information we have received from the peer.</extracomment>
-        <translation type="unfinished">Ontvangen</translation>
-    </message>
-    <message>
-        <source>Address</source>
-        <extracomment>Title of Peers Table column which contains the IP/Onion/I2P address of the connected peer.</extracomment>
-        <translation type="unfinished">Adres</translation>
-    </message>
-    <message>
-        <source>Network</source>
-        <extracomment>Title of Peers Table column which states the network the peer connected through.</extracomment>
-        <translation type="unfinished">Netwerk</translation>
-    </message>
-    <message>
-        <source>Inbound</source>
-        <extracomment>An Inbound Connection from a Peer.</extracomment>
-        <translation type="unfinished">Inkomend</translation>
+    <message numerus="yes">
+        <source>Signed %n input(s), but more signatures are still required.</source>
+        <translation type="unfinished">
+            <numerusform />
+            <numerusform />
+        </translation>
     </message>
-    <message>
-        <source>Outbound</source>
-        <extracomment>An Outbound Connection to a Peer.</extracomment>
-        <translation type="unfinished">Uitgaand</translation>
+    <message numerus="yes">
+        <source>Transaction has %n unsigned input(s).</source>
+        <translation type="unfinished">
+            <numerusform />
+            <numerusform />
+        </translation>
     </message>
-</context>
+    </context>
 <context>
     <name>QRImageWidget</name>
     <message>
@@ -2194,205 +1977,9 @@ Als je deze fout ziet zou je de aanbieder moeten verzoeken om een BIP21-compatib
         <translation type="unfinished">Transactie Doorgeven</translation>
     </message>
     <message>
-        <source>Starting Block</source>
-        <translation type="unfinished">Start Blok</translation>
-    </message>
-    <message>
-        <source>Synced Headers</source>
-        <translation type="unfinished">Gesynchroniseerde headers</translation>
-    </message>
-    <message>
-        <source>Synced Blocks</source>
-        <translation type="unfinished">Gesynchroniseerde blokken</translation>
-    </message>
-    <message>
-        <source>Last Transaction</source>
-        <translation type="unfinished">Laatste Transactie</translation>
-    </message>
-    <message>
-        <source>The mapped Autonomous System used for diversifying peer selection.</source>
-        <translation type="unfinished">Het in kaart gebrachte autonome systeem dat wordt gebruikt voor het diversifiëren van peer-selectie.</translation>
-    </message>
-    <message>
-        <source>Mapped AS</source>
-        <translation type="unfinished">AS in kaart gebracht.</translation>
-    </message>
-    <message>
-        <source>Whether we relay addresses to this peer.</source>
-        <extracomment>Tooltip text for the Address Relay field in the peer details area, which displays whether we relay addresses to this peer (Yes/No).</extracomment>
-        <translation type="unfinished">Of we adressen doorgeven aan deze peer.</translation>
-    </message>
-    <message>
-        <source>Address Relay</source>
-        <extracomment>Text title for the Address Relay field in the peer details area, which displays whether we relay addresses to this peer (Yes/No).</extracomment>
-        <translation type="unfinished">Adresrelay</translation>
-    </message>
-    <message>
-        <source>The total number of addresses received from this peer that were processed (excludes addresses that were dropped due to rate-limiting).</source>
-        <extracomment>Tooltip text for the Addresses Processed field in the peer details area, which displays the total number of addresses received from this peer that were processed (excludes addresses that were dropped due to rate-limiting).</extracomment>
-        <translation type="unfinished">Het totaal aantal van deze peer ontvangen adressen dat verwerkt is (uitgezonderd de door rate-limiting gedropte adressen).</translation>
-    </message>
-    <message>
-        <source>The total number of addresses received from this peer that were dropped (not processed) due to rate-limiting.</source>
-        <extracomment>Tooltip text for the Addresses Rate-Limited field in the peer details area, which displays the total number of addresses received from this peer that were dropped (not processed) due to rate-limiting.</extracomment>
-        <translation type="unfinished">Het totaal aantal van deze peer ontvangen adressen dat gedropt (niet verwerkt) is door rate-limiting.</translation>
-    </message>
-    <message>
-        <source>Addresses Processed</source>
-        <extracomment>Text title for the Addresses Processed field in the peer details area, which displays the total number of addresses received from this peer that were processed (excludes addresses that were dropped due to rate-limiting).</extracomment>
-        <translation type="unfinished">Adressen Verwerkt</translation>
-    </message>
-    <message>
-        <source>Addresses Rate-Limited</source>
-        <extracomment>Text title for the Addresses Rate-Limited field in the peer details area, which displays the total number of addresses received from this peer that were dropped (not processed) due to rate-limiting.</extracomment>
-        <translation type="unfinished">Adressen Tarief - Beperkt</translation>
-    </message>
-    <message>
-        <source>Node window</source>
-        <translation type="unfinished">Nodevenster</translation>
-    </message>
-    <message>
-        <source>Current block height</source>
-        <translation type="unfinished">Huidige block hoogte</translation>
-    </message>
-    <message>
-        <source>Open the %1 debug log file from the current data directory. This can take a few seconds for large log files.</source>
-        <translation type="unfinished">Open het %1 debug-logbestand van de huidige gegevensmap. Dit kan een aantal seconden duren voor grote logbestanden.</translation>
-    </message>
-    <message>
-        <source>Decrease font size</source>
-        <translation type="unfinished">Verklein lettergrootte</translation>
-    </message>
-    <message>
-        <source>Increase font size</source>
-        <translation type="unfinished">Vergroot lettergrootte</translation>
-    </message>
-    <message>
-        <source>Permissions</source>
-        <translation type="unfinished">Rechten</translation>
-    </message>
-    <message>
-        <source>The direction and type of peer connection: %1</source>
-        <translation type="unfinished">De richting en type peerverbinding: %1</translation>
-    </message>
-    <message>
-        <source>Direction/Type</source>
-        <translation type="unfinished">Richting/Type</translation>
-    </message>
-    <message>
-        <source>The BIP324 session ID string in hex.</source>
-        <translation type="unfinished">De BIP324 sessie ID string in hex.</translation>
-    </message>
-    <message>
-        <source>The network protocol this peer is connected through: IPv4, IPv6, Onion, I2P, or CJDNS.</source>
-        <translation type="unfinished">Het netwerkprotocol waarmee deze peer verbonden is: IPv4, IPv6, Onion, I2P, of CJDNS.</translation>
-    </message>
-    <message>
-        <source>Services</source>
-        <translation type="unfinished">Diensten</translation>
-    </message>
-    <message>
-        <source>High bandwidth BIP152 compact block relay: %1</source>
-        <translation type="unfinished">Hoge bandbreedte doorgave BIP152 compacte blokken: %1</translation>
-    </message>
-    <message>
-        <source>High Bandwidth</source>
-        <translation type="unfinished">Hoge bandbreedte</translation>
-    </message>
-    <message>
-        <source>Connection Time</source>
-        <translation type="unfinished">Connectie tijd</translation>
-    </message>
-    <message>
-        <source>Elapsed time since a novel block passing initial validity checks was received from this peer.</source>
-        <translation type="unfinished">Verstreken tijd sinds een nieuw blok dat initiële validatiecontrole doorstond ontvangen werd van deze peer.</translation>
-    </message>
-    <message>
-        <source>Last Block</source>
-        <translation type="unfinished">Laatste Blok</translation>
-    </message>
-    <message>
-        <source>Elapsed time since a novel transaction accepted into our mempool was received from this peer.</source>
-        <extracomment>Tooltip text for the Last Transaction field in the peer details area.</extracomment>
-        <translation type="unfinished">Verstreken tijd sinds een nieuwe in onze mempool geaccepteerde transactie ontvangen werd van deze peer.</translation>
-    </message>
-    <message>
-        <source>Last Send</source>
-        <translation type="unfinished">Laatst verstuurd</translation>
-    </message>
-    <message>
-        <source>Last Receive</source>
-        <translation type="unfinished">Laatst ontvangen</translation>
-    </message>
-    <message>
-        <source>Ping Time</source>
-        <translation type="unfinished">Ping Tijd</translation>
-    </message>
-    <message>
-        <source>The duration of a currently outstanding ping.</source>
-        <translation type="unfinished">De tijdsduur van een op het moment openstaande ping.</translation>
-    </message>
-    <message>
-        <source>Ping Wait</source>
-        <translation type="unfinished">Pingwachttijd</translation>
-    </message>
-    <message>
-        <source>Time Offset</source>
-        <translation type="unfinished">Tijdcompensatie</translation>
-    </message>
-    <message>
-        <source>Last block time</source>
-        <translation type="unfinished">Tijd laatste blok</translation>
-    </message>
-    <message>
-        <source>&amp;Network Traffic</source>
-        <translation type="unfinished">&amp;Netwerkverkeer</translation>
-    </message>
-    <message>
-        <source>Totals</source>
-        <translation type="unfinished">Totalen</translation>
-    </message>
-    <message>
-        <source>Debug log file</source>
-        <translation type="unfinished">Debuglogbestand</translation>
-    </message>
-    <message>
-        <source>Clear console</source>
-        <translation type="unfinished">Maak console leeg</translation>
-    </message>
-    <message>
-        <source>Out:</source>
-        <translation type="unfinished">Uit:</translation>
-    </message>
-    <message>
-        <source>Inbound: initiated by peer</source>
-        <extracomment>Explanatory text for an inbound peer connection.</extracomment>
-        <translation type="unfinished">Inkomend: gestart door peer</translation>
-    </message>
-    <message>
-        <source>Outbound Full Relay: default</source>
-        <extracomment>Explanatory text for an outbound peer connection that relays all network information. This is the default behavior for outbound connections.</extracomment>
-        <translation type="unfinished">Uitgaande volledige relay: standaard</translation>
-    </message>
-    <message>
-        <source>Outbound Block Relay: does not relay transactions or addresses</source>
-        <extracomment>Explanatory text for an outbound peer connection that relays network information about blocks and not transactions or addresses.</extracomment>
-        <translation type="unfinished">Uitgaande blok relay: Geen transacties of adressen doorgeven</translation>
-    </message>
-    <message>
-        <source>Outbound Manual: added using RPC %1 or %2/%3 configuration options</source>
-        <extracomment>Explanatory text for an outbound peer connection that was established manually through one of several methods. The numbered arguments are stand-ins for the methods available to establish manual connections.</extracomment>
-        <translation type="unfinished">Uitgaand handmatig: toegevoegd via RPC %1 of %2/%3 configuratieopties</translation>
-    </message>
-    <message>
-        <source>Outbound Feeler: short-lived, for testing addresses</source>
-        <extracomment>Explanatory text for a short-lived outbound peer connection that is used to test the aliveness of known addresses.</extracomment>
-        <translation type="unfinished">Uitgaande sensor: Kort levend, voor het testen van adressen</translation>
-    </message>
-    <message>
-        <source>Outbound Address Fetch: short-lived, for soliciting addresses</source>
-        <extracomment>Explanatory text for a short-lived outbound peer connection that is used to request addresses from a peer.</extracomment>
-        <translation type="unfinished">Uitgaand adres verkrijgen: Kort levend, voor opvragen van adressen</translation>
+        <source>Private broadcast: short-lived, for broadcasting privacy-sensitive transactions</source>
+        <extracomment>Explanatory text for a short-lived outbound peer connection that is used to broadcast privacy-sensitive data (like our transactions).</extracomment>
+        <translation type="unfinished">Privé uitzending: kortdurend, voor het verzenden van privacy-gevoelige transacties</translation>
     </message>
     <message>
         <source>detecting: peer could be v1 or v2</source>
@@ -3005,34 +2592,6 @@ Notitie: Omdat de vergoeding per byte wordt gerekend, zal een vergoeding van "10
         <source>Confirm send coins</source>
         <translation type="unfinished">Bevestig versturen munten</translation>
     </message>
-    <message>
-        <source>The recipient address is not valid. Please recheck.</source>
-        <translation type="unfinished">Het adres van de ontvanger is niet geldig. Gelieve opnieuw te controleren.</translation>
-    </message>
-    <message>
-        <source>The amount to pay must be larger than 0.</source>
-        <translation type="unfinished">Het ingevoerde bedrag moet groter zijn dan 0.</translation>
-    </message>
-    <message>
-        <source>The amount exceeds your balance.</source>
-        <translation type="unfinished">Het bedrag is hoger dan uw huidige saldo.</translation>
-    </message>
-    <message>
-        <source>The total exceeds your balance when the %1 transaction fee is included.</source>
-        <translation type="unfinished">Het totaal overschrijdt uw huidige saldo wanneer de %1 transactie vergoeding wordt meegerekend.</translation>
-    </message>
-    <message>
-        <source>Duplicate address found: addresses should only be used once each.</source>
-        <translation type="unfinished">Dubbel adres gevonden: adressen mogen maar één keer worden gebruikt worden.</translation>
-    </message>
-    <message>
-        <source>Transaction creation failed!</source>
-        <translation type="unfinished">Transactiecreatie mislukt</translation>
-    </message>
-    <message>
-        <source>A fee higher than %1 is considered an absurdly high fee.</source>
-        <translation type="unfinished">Een vergoeding van meer dan %1 wordt beschouwd als een absurd hoge vergoeding.</translation>
-    </message>
     <message numerus="yes">
         <source>Estimated to begin confirmation within %n block(s).</source>
         <translation type="unfinished">
@@ -3040,299 +2599,24 @@ Notitie: Omdat de vergoeding per byte wordt gerekend, zal een vergoeding van "10
             <numerusform>Estimated to begin confirmation within %n block(s).</numerusform>
         </translation>
     </message>
-    <message>
-        <source>Warning: Invalid Bitcoin address</source>
-        <translation type="unfinished">Waarschuwing: Ongeldig Bitcoin adres</translation>
-    </message>
-    <message>
-        <source>Warning: Unknown change address</source>
-        <translation type="unfinished">Waarschuwing: Onbekend wisselgeldadres</translation>
-    </message>
-    <message>
-        <source>Confirm custom change address</source>
-        <translation type="unfinished">Bevestig aangepast wisselgeldadres</translation>
-    </message>
-    <message>
-        <source>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?</source>
-        <translation type="unfinished">Het wisselgeldadres dat u heeft geselecteerd maakt geen onderdeel uit van deze wallet. Enkele of alle saldo's in je wallet zouden naar dit adres kunnen worden verzonden. Weet je het zeker?</translation>
-    </message>
     <message>
         <source>(no label)</source>
         <translation type="unfinished">(geen label)</translation>
     </message>
 </context>
-<context>
-    <name>SendCoinsEntry</name>
-    <message>
-        <source>A&amp;mount:</source>
-        <translation type="unfinished">B&amp;edrag:</translation>
-    </message>
-    <message>
-        <source>Pay &amp;To:</source>
-        <translation type="unfinished">Betaal &amp;aan:</translation>
-    </message>
-    <message>
-        <source>Choose previously used address</source>
-        <translation type="unfinished">Kies een eerder gebruikt adres</translation>
-    </message>
-    <message>
-        <source>The Bitcoin address to send the payment to</source>
-        <translation type="unfinished">Het Bitcoinadres om betaling aan te versturen</translation>
-    </message>
-    <message>
-        <source>Paste address from clipboard</source>
-        <translation type="unfinished">Plak adres vanuit klembord</translation>
-    </message>
-    <message>
-        <source>Remove this entry</source>
-        <translation type="unfinished">Verwijder deze toevoeging</translation>
-    </message>
-    <message>
-        <source>The amount to send in the selected unit</source>
-        <translation type="unfinished">Het te sturen bedrag in de geselecteerde eenheid</translation>
-    </message>
-    <message>
-        <source>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.</source>
-        <translation type="unfinished">De transactiekosten zal worden afgetrokken van het bedrag dat verstuurd wordt. De ontvangers zullen minder bitcoins ontvangen dan ingevoerd is in het hoeveelheidsveld. Als er meerdere ontvangers geselecteerd zijn, dan worden de transactiekosten gelijk verdeeld.</translation>
-    </message>
-    <message>
-        <source>S&amp;ubtract fee from amount</source>
-        <translation type="unfinished">Trek de transactiekosten a&amp;f van het bedrag.</translation>
-    </message>
-    <message>
-        <source>Use available balance</source>
-        <translation type="unfinished">Gebruik beschikbaar saldo</translation>
-    </message>
-    <message>
-        <source>Message:</source>
-        <translation type="unfinished">Bericht:</translation>
-    </message>
-    <message>
-        <source>Enter a label for this address to add it to the list of used addresses</source>
-        <translation type="unfinished">Vul een label voor dit adres in om het aan de lijst met gebruikte adressen toe te voegen</translation>
-    </message>
-    <message>
-        <source>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.</source>
-        <translation type="unfinished">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 Bitcoin netwerk.</translation>
-    </message>
-</context>
-<context>
-    <name>SendConfirmationDialog</name>
-    <message>
-        <source>Send</source>
-        <translation type="unfinished">Verstuur</translation>
-    </message>
-    <message>
-        <source>Create Unsigned</source>
-        <translation type="unfinished">Creëer ongetekende</translation>
-    </message>
-</context>
 <context>
     <name>SignVerifyMessageDialog</name>
-    <message>
-        <source>Signatures - Sign / Verify a Message</source>
-        <translation type="unfinished">Handtekeningen – Onderteken een bericht / Verifiëer een handtekening</translation>
-    </message>
-    <message>
-        <source>&amp;Sign Message</source>
-        <translation type="unfinished">&amp;Onderteken bericht</translation>
-    </message>
-    <message>
-        <source>The Bitcoin address to sign the message with</source>
-        <translation type="unfinished">Het Bitcoin adres om bericht mee te ondertekenen</translation>
-    </message>
-    <message>
-        <source>Choose previously used address</source>
-        <translation type="unfinished">Kies een eerder gebruikt adres</translation>
-    </message>
-    <message>
-        <source>Paste address from clipboard</source>
-        <translation type="unfinished">Plak adres vanuit klembord</translation>
-    </message>
-    <message>
-        <source>Enter the message you want to sign here</source>
-        <translation type="unfinished">Typ hier het bericht dat u wilt ondertekenen</translation>
-    </message>
-    <message>
-        <source>Signature</source>
-        <translation type="unfinished">Handtekening</translation>
-    </message>
     <message>
         <source>Copy the current signature to the clipboard</source>
         <translation type="unfinished">Kopieer de huidige handtekening naar het klembord</translation>
     </message>
-    <message>
-        <source>Sign the message to prove you own this Bitcoin address</source>
-        <translation type="unfinished">Onderteken een bericht om te bewijzen dat u een bepaald Bitcoin adres bezit</translation>
-    </message>
-    <message>
-        <source>Sign &amp;Message</source>
-        <translation type="unfinished">Onderteken &amp;bericht</translation>
-    </message>
-    <message>
-        <source>Reset all sign message fields</source>
-        <translation type="unfinished">Verwijder alles in de invulvelden</translation>
-    </message>
-    <message>
-        <source>Clear &amp;All</source>
-        <translation type="unfinished">Verwijder &amp;alles</translation>
-    </message>
-    <message>
-        <source>&amp;Verify Message</source>
-        <translation type="unfinished">&amp;Verifiëer bericht</translation>
-    </message>
-    <message>
-        <source>Enter the receiver's address, message (ensure you copy line breaks, spaces, tabs, etc. exactly) and signature below to verify the message. Be careful not to read more into the signature than what is in the signed message itself, to avoid being tricked by a man-in-the-middle attack. Note that this only proves the signing party receives with the address, it cannot prove sendership of any transaction!</source>
-        <translation type="unfinished">Voer het adres van de ontvanger in, bericht (zorg ervoor dat de regeleinden, spaties, tabs etc. precies kloppen) en onderteken onderaan om het bericht te verifiëren. Wees voorzicht om niet meer in de ondertekening te lezen dan in het getekende bericht zelf, om te voorkomen dat je wordt aangevallen met een man-in-the-middle attack. Houd er mee rekening dat dit alleen de ondertekende partij bewijst met het ontvangen adres, er kan niet bewezen worden dat er een transactie heeft plaatsgevonden!</translation>
-    </message>
-    <message>
-        <source>The Bitcoin address the message was signed with</source>
-        <translation type="unfinished">Het Bitcoin adres waarmee het bericht ondertekend is</translation>
-    </message>
-    <message>
-        <source>The signed message to verify</source>
-        <translation type="unfinished">Het te controleren ondertekend bericht</translation>
-    </message>
-    <message>
-        <source>The signature given when the message was signed</source>
-        <translation type="unfinished">De handtekening waarmee het bericht ondertekend werd</translation>
-    </message>
-    <message>
-        <source>Verify the message to ensure it was signed with the specified Bitcoin address</source>
-        <translation type="unfinished">Controleer een bericht om te verifiëren dat het gespecificeerde Bitcoin adres het bericht heeft ondertekend.</translation>
-    </message>
-    <message>
-        <source>Verify &amp;Message</source>
-        <translation type="unfinished">Verifiëer &amp;bericht</translation>
-    </message>
-    <message>
-        <source>Reset all verify message fields</source>
-        <translation type="unfinished">Verwijder alles in de invulvelden</translation>
-    </message>
-    <message>
-        <source>Click "Sign Message" to generate signature</source>
-        <translation type="unfinished">Klik op "Onderteken Bericht" om de handtekening te genereren</translation>
-    </message>
-    <message>
-        <source>The entered address is invalid.</source>
-        <translation type="unfinished">Het opgegeven adres is ongeldig.</translation>
-    </message>
-    <message>
-        <source>Please check the address and try again.</source>
-        <translation type="unfinished">Controleer het adres en probeer het opnieuw.</translation>
-    </message>
-    <message>
-        <source>Wallet unlock was cancelled.</source>
-        <translation type="unfinished">Wallet ontsleutelen werd geannuleerd.</translation>
-    </message>
-    <message>
-        <source>No error</source>
-        <translation type="unfinished">Geen fout</translation>
-    </message>
-    <message>
-        <source>Private key for the entered address is not available.</source>
-        <translation type="unfinished">Geheime sleutel voor het ingevoerde adres is niet beschikbaar.</translation>
-    </message>
-    <message>
-        <source>Message signing failed.</source>
-        <translation type="unfinished">Ondertekenen van het bericht is mislukt.</translation>
-    </message>
-    <message>
-        <source>Message signed.</source>
-        <translation type="unfinished">Bericht ondertekend.</translation>
-    </message>
-    <message>
-        <source>The signature could not be decoded.</source>
-        <translation type="unfinished">De handtekening kon niet worden gedecodeerd.</translation>
-    </message>
-    <message>
-        <source>Please check the signature and try again.</source>
-        <translation type="unfinished">Controleer de handtekening en probeer het opnieuw.</translation>
-    </message>
-    <message>
-        <source>The signature did not match the message digest.</source>
-        <translation type="unfinished">De handtekening hoort niet bij het bericht.</translation>
-    </message>
-    <message>
-        <source>Message verification failed.</source>
-        <translation type="unfinished">Berichtverificatie mislukt.</translation>
-    </message>
-    <message>
-        <source>Message verified.</source>
-        <translation type="unfinished">Bericht geverifiëerd.</translation>
-    </message>
-</context>
-<context>
-    <name>SplashScreen</name>
-    <message>
-        <source>(press q to shutdown and continue later)</source>
-        <translation type="unfinished">(druk op q voor afsluiten en later doorgaan)</translation>
-    </message>
-    <message>
-        <source>press q to shutdown</source>
-        <translation type="unfinished">druk op q om af te sluiten</translation>
-    </message>
-</context>
+    </context>
 <context>
     <name>TransactionDesc</name>
-    <message>
-        <source>conflicted with a transaction with %1 confirmations</source>
-        <extracomment>Text explaining the current status of a transaction, shown in the status field of the details window for this transaction. This status represents an unconfirmed transaction that conflicts with a confirmed transaction.</extracomment>
-        <translation type="unfinished">geconflicteerd met een transactie met %1 confirmaties</translation>
-    </message>
-    <message>
-        <source>0/unconfirmed, in memory pool</source>
-        <extracomment>Text explaining the current status of a transaction, shown in the status field of the details window for this transaction. This status represents an unconfirmed transaction that is in the memory pool.</extracomment>
-        <translation type="unfinished">0/onbevestigd, in mempool</translation>
-    </message>
-    <message>
-        <source>0/unconfirmed, not in memory pool</source>
-        <extracomment>Text explaining the current status of a transaction, shown in the status field of the details window for this transaction. This status represents an unconfirmed transaction that is not in the memory pool.</extracomment>
-        <translation type="unfinished">0/onbevestigd, niet in mempool</translation>
-    </message>
-    <message>
-        <source>abandoned</source>
-        <extracomment>Text explaining the current status of a transaction, shown in the status field of the details window for this transaction. This status represents an abandoned transaction.</extracomment>
-        <translation type="unfinished">opgegeven</translation>
-    </message>
-    <message>
-        <source>%1/unconfirmed</source>
-        <extracomment>Text explaining the current status of a transaction, shown in the status field of the details window for this transaction. This status represents a transaction confirmed in at least one block, but less than 6 blocks.</extracomment>
-        <translation type="unfinished">%1/onbevestigd</translation>
-    </message>
-    <message>
-        <source>%1 confirmations</source>
-        <extracomment>Text explaining the current status of a transaction, shown in the status field of the details window for this transaction. This status represents a transaction confirmed in 6 or more blocks.</extracomment>
-        <translation type="unfinished">%1 bevestigingen</translation>
-    </message>
     <message>
         <source>Date</source>
         <translation type="unfinished">Datum</translation>
     </message>
-    <message>
-        <source>Source</source>
-        <translation type="unfinished">Bron</translation>
-    </message>
-    <message>
-        <source>Generated</source>
-        <translation type="unfinished">Gegenereerd</translation>
-    </message>
-    <message>
-        <source>From</source>
-        <translation type="unfinished">Van</translation>
-    </message>
-    <message>
-        <source>unknown</source>
-        <translation type="unfinished">onbekend</translation>
-    </message>
-    <message>
-        <source>To</source>
-        <translation type="unfinished">Aan</translation>
-    </message>
-    <message>
-        <source>own address</source>
-        <translation type="unfinished">eigen adres</translation>
-    </message>
     <message numerus="yes">
         <source>matures in %n more block(s)</source>
         <translation type="unfinished">
@@ -3623,10 +2907,6 @@ Notitie: Omdat de vergoeding per byte wordt gerekend, zal een vergoeding van "10
         <source>Date</source>
         <translation type="unfinished">Datum</translation>
     </message>
-    <message>
-        <source>Address</source>
-        <translation type="unfinished">Adres</translation>
-    </message>
     <message>
         <source>Exporting Failed</source>
         <translation type="unfinished">Exporteren Mislukt</translation>
@@ -3929,10 +3209,6 @@ Ga naar Bestand &gt; Wallet openen om een wallet te laden.
         <source>Warning: Private keys detected in wallet {%s} with disabled private keys</source>
         <translation type="unfinished">Waarschuwing: Geheime sleutels gedetecteerd in wallet {%s} met uitgeschakelde geheime sleutels</translation>
     </message>
-    <message>
-        <source>Warning: We do not appear to fully agree with our peers! You may need to upgrade, or other nodes may need to upgrade.</source>
-        <translation type="unfinished">Waarschuwing: Het lijkt erop dat we geen consensus kunnen vinden met onze peers! Mogelijk dient u te upgraden, of andere nodes moeten wellicht upgraden.</translation>
-    </message>
     <message>
         <source>Witness data for blocks after height %d requires validation. Please restart with -reindex.</source>
         <translation type="unfinished">Controle vereist voor de witnessgegevens van blokken na blokhoogte %d. Herstart aub met -reindex.</translation>
@@ -4013,14 +3289,6 @@ Ga naar Bestand &gt; Wallet openen om een wallet te laden.
         <source>Option '-checkpoints' is set but checkpoints were removed. This option has no effect.</source>
         <translation type="unfinished">Optie '-checkpoints' is ingesteld, maar checkpoints zijn verwijderd. Deze optie heeft geen effect.</translation>
     </message>
-    <message>
-        <source>Option '-maxorphantx' is set but no longer has any effect (see release notes). Please remove it from your configuration.</source>
-        <translation type="unfinished">Optie '-maxorphantx' is ingesteld, maar heeft geen effect meer (zie release-opmerkingen). Verwijder deze optie alstublieft uit je configuratie.</translation>
-    </message>
-    <message>
-        <source>Options '-datacarrier' or '-datacarriersize' are set but are marked as deprecated. They will be removed in a future version.</source>
-        <translation type="unfinished">Opties '-datacarrier' of '-datacarriersize' zijn ingesteld, maar worden als verouderd (deprecated) beschouwd. Ze zullen in een toekomstige versie worden verwijderd.</translation>
-    </message>
     <message>
         <source>Outbound connections restricted to CJDNS (-onlynet=cjdns) but -cjdnsreachable is not provided</source>
         <translation type="unfinished">Uitgaande verbindingen beperkt tot CJDNS (-onlynet=cjdns) maar -cjdnsreachable is niet verstrekt</translation>
@@ -4089,14 +3357,14 @@ Kan mislukte migratie niet opschonen</translation>
         <source>default wallet</source>
         <translation type="unfinished">standaard portemonnee</translation>
     </message>
-    <message>
-        <source>-paytxfee is deprecated and will be fully removed in v31.0.</source>
-        <translation type="unfinished">-paytxfee is verouderd en zal volledig worden verwijderd in versie 31.0.</translation>
-    </message>
     <message>
         <source>Block verification was interrupted</source>
         <translation type="unfinished">Blokverificatie is onderbroken</translation>
     </message>
+    <message>
+        <source>Can't spend unconfirmed version %d pre-selected input with a version 3 tx</source>
+        <translation type="unfinished">kan niet uitgeven onbevestigde versie  %d voorgeselecteerde inpunt met een versie 3 tx</translation>
+    </message>
     <message>
         <source>Cannot write to directory '%s'; check permissions.</source>
         <translation type="unfinished">Kan niet schrijven naar map '%s'; controleer rechten.</translation>
@@ -4141,10 +3409,6 @@ Kan mislukte migratie niet opschonen</translation>
         <source>Dump file %s does not exist.</source>
         <translation type="unfinished">Dumpbestand %s bestaat niet.</translation>
     </message>
-    <message>
-        <source>Error creating %s</source>
-        <translation type="unfinished">Fout bij het maken van %s</translation>
-    </message>
     <message>
         <source>Error initializing block database</source>
         <translation type="unfinished">Fout bij intialisatie blokkendatabase</translation>
@@ -4153,10 +3417,6 @@ Kan mislukte migratie niet opschonen</translation>
         <source>Error loading %s</source>
         <translation type="unfinished">Fout bij het laden van %s</translation>
     </message>
-    <message>
-        <source>Error loading %s: Private keys can only be disabled during creation</source>
-        <translation type="unfinished">Fout bij het laden van %s: Geheime sleutels kunnen alleen worden uitgeschakeld tijdens het aanmaken</translation>
-    </message>
     <message>
         <source>Error loading %s: Wallet corrupted</source>
         <translation type="unfinished">Fout bij het laden van %s: Wallet beschadigd</translation>
@@ -4353,14 +3613,14 @@ Kan mislukte migratie niet opschonen</translation>
         <source>Invalid P2P permission: '%s'</source>
         <translation type="unfinished">Ongeldige P2P-rechten: '%s'</translation>
     </message>
-    <message>
-        <source>Invalid amount for %s=&lt;amount&gt;: '%s' (must be at least %s)</source>
-        <translation type="unfinished">Ongeldig bedrag voor %s=&lt;amount&gt;: '%s' (moet minimaal %s zijn)</translation>
-    </message>
     <message>
         <source>Invalid amount for %s=&lt;amount&gt;: '%s'</source>
         <translation type="unfinished">Ongeldig bedrag voor %s=&lt;amount&gt;: '%s'</translation>
     </message>
+    <message>
+        <source>Creating wallet…</source>
+        <translation type="unfinished">Wallet wordt aangemaakt ... </translation>
+    </message>
     <message>
         <source>Invalid amount for -%s=&lt;amount&gt;: '%s'</source>
         <translation type="unfinished">Ongeldig bedrag voor -%s=&lt;amount&gt;: '%s'</translation>
@@ -4497,74 +3757,10 @@ Kan mislukte migratie niet opschonen</translation>
         <source>The specified config file %s does not exist</source>
         <translation type="unfinished">Het opgegeven configuratiebestand %s bestaat niet</translation>
     </message>
-    <message>
-        <source>The transaction amount is too small to pay the fee</source>
-        <translation type="unfinished">Het transactiebedrag is te klein om transactiekosten in rekening te brengen</translation>
-    </message>
     <message>
         <source>The transactions removal process can only be executed within a db txn</source>
         <translation type="unfinished">Het transactie verwijderproces kan alleen binnen een db txn uitgevoerd worden</translation>
     </message>
-    <message>
-        <source>The wallet will avoid paying less than the minimum relay fee.</source>
-        <translation type="unfinished">De wallet vermijdt minder te betalen dan de minimale vergoeding voor het doorgeven.</translation>
-    </message>
-    <message>
-        <source>This is experimental software.</source>
-        <translation type="unfinished">Dit is experimentele software.</translation>
-    </message>
-    <message>
-        <source>This is the minimum transaction fee you pay on every transaction.</source>
-        <translation type="unfinished">Dit is de minimum transactievergoeding dat je betaalt op elke transactie.</translation>
-    </message>
-    <message>
-        <source>This is the transaction fee you will pay if you send a transaction.</source>
-        <translation type="unfinished">Dit is de transactievergoeding dat je betaalt wanneer je een transactie verstuurt.</translation>
-    </message>
-    <message>
-        <source>Transaction %s does not belong to this wallet</source>
-        <translation type="unfinished">Transactie %s behoort niet tot deze wallet</translation>
-    </message>
-    <message>
-        <source>Transaction amount too small</source>
-        <translation type="unfinished">Transactiebedrag te klein</translation>
-    </message>
-    <message>
-        <source>Transaction amounts must not be negative</source>
-        <translation type="unfinished">Transactiebedragen moeten positief zijn</translation>
-    </message>
-    <message>
-        <source>Transaction change output index out of range</source>
-        <translation type="unfinished">Transactie change output is buiten bereik</translation>
-    </message>
-    <message>
-        <source>Transaction must have at least one recipient</source>
-        <translation type="unfinished">Transactie moet ten minste één ontvanger hebben</translation>
-    </message>
-    <message>
-        <source>Transaction needs a change address, but we can't generate it.</source>
-        <translation type="unfinished">De transactie heeft een 'change' adres nodig, maar we kunnen er geen genereren.</translation>
-    </message>
-    <message>
-        <source>Transaction too large</source>
-        <translation type="unfinished">Transactie te groot</translation>
-    </message>
-    <message>
-        <source>Unable to bind to %s on this computer (bind returned error %s)</source>
-        <translation type="unfinished">Niet in staat om aan %s te binden op deze computer (bind gaf error %s)</translation>
-    </message>
-    <message>
-        <source>Unable to bind to %s on this computer. %s is probably already running.</source>
-        <translation type="unfinished">Niet in staat om %s te verbinden op deze computer. %s draait waarschijnlijk al.</translation>
-    </message>
-    <message>
-        <source>Unable to create the PID file '%s': %s</source>
-        <translation type="unfinished">Kan de PID file niet creëren. '%s': %s</translation>
-    </message>
-    <message>
-        <source>Unable to find UTXO for external input</source>
-        <translation type="unfinished">Kan UTXO niet vinden voor externe invoer</translation>
-    </message>
     <message>
         <source>Unable to open %s for writing</source>
         <translation type="unfinished">Kan %s niet openen voor schrijfbewerking</translation>
diff --git a/src/qt/locale/bitcoin_no.ts b/src/qt/locale/bitcoin_no.ts
index e71c2e6ad735..af814c9e5361 100644
--- a/src/qt/locale/bitcoin_no.ts
+++ b/src/qt/locale/bitcoin_no.ts
@@ -939,6 +939,11 @@ Signing is only possible with addresses of the type 'legacy'.</source>
         <source>Migrate Wallet</source>
         <translation type="unfinished">Migrer Lommebok</translation>
     </message>
+    <message>
+        <source>Restore Wallet</source>
+        <extracomment>Title of progress window which is displayed when wallets are being restored.</extracomment>
+        <translation type="unfinished">Gjenopprett lommebok</translation>
+    </message>
     </context>
 <context>
     <name>OpenWalletActivity</name>
@@ -1026,6 +1031,23 @@ Signing is only possible with addresses of the type 'legacy'.</source>
         <translation type="unfinished">Feil</translation>
     </message>
     </context>
+<context>
+    <name>PSBTOperationsDialog</name>
+    <message numerus="yes">
+        <source>Signed %n input(s), but more signatures are still required.</source>
+        <translation type="unfinished">
+            <numerusform />
+            <numerusform />
+        </translation>
+    </message>
+    <message numerus="yes">
+        <source>Transaction has %n unsigned input(s).</source>
+        <translation type="unfinished">
+            <numerusform />
+            <numerusform />
+        </translation>
+    </message>
+    </context>
 <context>
     <name>PeerTableModel</name>
     <message>
@@ -1215,11 +1237,11 @@ Signing is only possible with addresses of the type 'legacy'.</source>
     </message>
     <message>
         <source>Address</source>
-        <translation type="unfinished">Adresse</translation>
+        <translation type="unfinished">Adresse </translation>
     </message>
     <message>
         <source>Exporting Failed</source>
-        <translation type="unfinished">Eksportering mislyktes</translation>
+        <translation type="unfinished">Eksportering feilet </translation>
     </message>
     </context>
 <context>
diff --git a/src/qt/locale/bitcoin_pam.ts b/src/qt/locale/bitcoin_pam.ts
index 100234e26c67..c8253d8d0d1e 100644
--- a/src/qt/locale/bitcoin_pam.ts
+++ b/src/qt/locale/bitcoin_pam.ts
@@ -531,10 +531,22 @@
     </context>
 <context>
     <name>PSBTOperationsDialog</name>
+    <message numerus="yes">
+        <source>Signed %n input(s), but more signatures are still required.</source>
+        <translation type="unfinished">
+            <numerusform />
+        </translation>
+    </message>
     <message>
         <source>own address</source>
         <translation type="unfinished">sariling address</translation>
     </message>
+    <message numerus="yes">
+        <source>Transaction has %n unsigned input(s).</source>
+        <translation type="unfinished">
+            <numerusform />
+        </translation>
+    </message>
     </context>
 <context>
     <name>PeerTableModel</name>
@@ -686,10 +698,6 @@
         <source>The amount exceeds your balance.</source>
         <translation type="unfinished">Ing alaga mipasobra ya king kekang balanse.</translation>
     </message>
-    <message>
-        <source>The total exceeds your balance when the %1 transaction fee is included.</source>
-        <translation type="unfinished">Ing kabuuan mipasobra ya king kekang balanse istung inabe ya ing %1 a bayad king transaksion </translation>
-    </message>
     <message numerus="yes">
         <source>Estimated to begin confirmation within %n block(s).</source>
         <translation type="unfinished">
diff --git a/src/qt/locale/bitcoin_pl.ts b/src/qt/locale/bitcoin_pl.ts
index b8d4cb71af5a..a93e27e6fe7e 100644
--- a/src/qt/locale/bitcoin_pl.ts
+++ b/src/qt/locale/bitcoin_pl.ts
@@ -13,10 +13,6 @@
         <source>&amp;New</source>
         <translation type="unfinished">&amp;Nowy</translation>
     </message>
-    <message>
-        <source>Copy the currently selected address to the system clipboard</source>
-        <translation type="unfinished">Kopiuj aktualnie zaznaczony adres do schowka</translation>
-    </message>
     <message>
         <source>&amp;Copy</source>
         <translation type="unfinished">&amp;Kopiuj</translation>
@@ -33,6 +29,10 @@
         <source>Enter address or label to search</source>
         <translation type="unfinished">Wprowadź adres lub etykietę aby wyszukać</translation>
     </message>
+    <message>
+        <source>Copy the currently selected address to the clipboard</source>
+        <translation type="unfinished">Skopiuj aktualnie zaznaczony adres do schowka</translation>
+    </message>
     <message>
         <source>Export the data in the current tab to a file</source>
         <translation type="unfinished">Eksportuj dane z aktywnej karty do pliku</translation>
@@ -51,11 +51,11 @@
     </message>
     <message>
         <source>Choose the address to receive coins with</source>
-        <translation type="unfinished">Wybierz adres, na który chcesz otrzymywać monety</translation>
+        <translation type="unfinished">Wybierz adres, na który chcesz otrzymać monety</translation>
     </message>
     <message>
         <source>C&amp;hoose</source>
-        <translation type="unfinished">Wybierz</translation>
+        <translation type="unfinished">W&amp;ybierz</translation>
     </message>
     <message>
         <source>These are your Bitcoin addresses for sending payments. Always check the amount and the receiving address before sending coins.</source>
@@ -64,8 +64,8 @@
     <message>
         <source>These are your Bitcoin addresses for receiving payments. Use the 'Create new receiving address' button in the receive tab to create new addresses.
 Signing is only possible with addresses of the type 'legacy'.</source>
-        <translation type="unfinished">To są twoje adresy Bitcoin do otrzymywania płatności. Użyj przycisku 'Utwórz nowy adres odbioru' na karcie odbioru, aby utworzyć nowe adresy.
-Podpisywanie jest możliwe tylko z adresami typu 'legacy'.</translation>
+        <translation type="unfinished">To są twoje adresy Bitcoin do odbierania płatności. Użyj przycisku „Utwórz nowy adres odbiorczy” w zakładce odbierania, aby utworzyć nowe adresy. 
+Podpisywanie jest możliwe tylko z adresami typu „legacy”.</translation>
     </message>
     <message>
         <source>&amp;Copy Address</source>
@@ -93,17 +93,13 @@ Podpisywanie jest możliwe tylko z adresami typu 'legacy'.</translation>
         <extracomment>An error message. %1 is a stand-in argument for the name of the file we attempted to save to.</extracomment>
         <translation type="unfinished">Wystąpił błąd podczas próby zapisania listy adresów do %1. Spróbuj ponownie.</translation>
     </message>
-    <message>
-        <source>Sending addresses - %1</source>
-        <translation type="unfinished">Wysyłające adresy - %1</translation>
-    </message>
     <message>
         <source>Receiving addresses - %1</source>
         <translation type="unfinished">Adresy odbiorcze - %1</translation>
     </message>
     <message>
         <source>Exporting Failed</source>
-        <translation type="unfinished">Eksportowanie nie powiodło się </translation>
+        <translation type="unfinished">Eksportowanie nie powiodło się</translation>
     </message>
 </context>
 <context>
@@ -161,7 +157,7 @@ Podpisywanie jest możliwe tylko z adresami typu 'legacy'.</translation>
     </message>
     <message>
         <source>Confirm wallet encryption</source>
-        <translation type="unfinished">Potwierdź szyfrowanie portfela </translation>
+        <translation type="unfinished">Potwierdź szyfrowanie portfela</translation>
     </message>
     <message>
         <source>Warning: If you encrypt your wallet and lose your passphrase, you will &lt;b&gt;LOSE ALL OF YOUR BITCOINS&lt;/b&gt;!</source>
@@ -169,7 +165,7 @@ Podpisywanie jest możliwe tylko z adresami typu 'legacy'.</translation>
     </message>
     <message>
         <source>Are you sure you wish to encrypt your wallet?</source>
-        <translation type="unfinished">Jesteś pewien, że chcesz zaszyfrować swój portfel? </translation>
+        <translation type="unfinished">Czy na pewno chcesz zaszyfrować swój portfel?</translation>
     </message>
     <message>
         <source>Wallet encrypted</source>
@@ -177,11 +173,11 @@ Podpisywanie jest możliwe tylko z adresami typu 'legacy'.</translation>
     </message>
     <message>
         <source>Enter the new passphrase for the wallet.&lt;br/&gt;Please use a passphrase of &lt;b&gt;ten or more random characters&lt;/b&gt;, or &lt;b&gt;eight or more words&lt;/b&gt;.</source>
-        <translation type="unfinished">Wprowadź nowe hasło do portfela.&lt;br/&gt; Hasło powinno zawierać co najmniej &lt;b&gt;10 losowych znaków&lt;/b&gt; lub&lt;b&gt; co najmniej 8 słów&lt;/b&gt;.</translation>
+        <translation type="unfinished">Wprowadź nowe hasło dla portfela.&lt;br/&gt;Użyj hasła składającego się z &lt;b&gt;dziesięciu lub więcej losowych znaków&lt;/b&gt;, lub &lt;b&gt;ośmiu lub więcej słów&lt;/b&gt;.</translation>
     </message>
     <message>
         <source>Enter the old passphrase and new passphrase for the wallet.</source>
-        <translation type="unfinished">Wprowadź stare i nowe hasło portfela. </translation>
+        <translation type="unfinished">Wprowadź stare i nowe hasło portfela.</translation>
     </message>
     <message>
         <source>Continue</source>
@@ -256,7 +252,7 @@ Podpisywanie jest możliwe tylko z adresami typu 'legacy'.</translation>
     <name>BanTableModel</name>
     <message>
         <source>IP/Netmask</source>
-        <translation type="unfinished">IP / maska podsieci</translation>
+        <translation type="unfinished">IP/maska sieci</translation>
     </message>
     <message>
         <source>Banned Until</source>
@@ -283,7 +279,7 @@ Podpisywanie jest możliwe tylko z adresami typu 'legacy'.</translation>
     </message>
     <message>
         <source>An internal error occurred. %1 will attempt to continue safely. This is an unexpected bug which can be reported as described below.</source>
-        <translation type="unfinished">Wystąpił krytyczny błąd. %1 będzie próbować bezpiecznie pracować. Jest to niespodziewany błąd, który może zostać zgłoszony w sposób opisany poniżej.</translation>
+        <translation type="unfinished">Wystąpił wewnętrzny błąd. %1 spróbuje bezpiecznie kontynuować działanie. To nieoczekiwany błąd, który można zgłosić w sposób opisany poniżej.</translation>
     </message>
 </context>
 <context>
@@ -308,7 +304,7 @@ Podpisywanie jest możliwe tylko z adresami typu 'legacy'.</translation>
     </message>
     <message>
         <source>unknown</source>
-        <translation type="unfinished">nieznane</translation>
+        <translation type="unfinished">nieznany</translation>
     </message>
     <message>
         <source>Embedded "%1"</source>
@@ -357,7 +353,7 @@ Podpisywanie jest możliwe tylko z adresami typu 'legacy'.</translation>
     <message>
         <source>Manual</source>
         <extracomment>Peer connection type established manually through one of several methods.</extracomment>
-        <translation type="unfinished">Ręczny</translation>
+        <translation type="unfinished">Ręczne</translation>
     </message>
     <message>
         <source>Feeler</source>
@@ -369,6 +365,11 @@ Podpisywanie jest możliwe tylko z adresami typu 'legacy'.</translation>
         <extracomment>Short-lived peer connection type that solicits known addresses from a peer.</extracomment>
         <translation type="unfinished">Pobieranie adresu</translation>
     </message>
+    <message>
+        <source>Private Broadcast</source>
+        <extracomment>Short-lived peer connection type that is used for broadcasting privacy-sensitive data.</extracomment>
+        <translation type="unfinished">Prywatna transmisja</translation>
+    </message>
     <message>
         <source>None</source>
         <translation type="unfinished">Żaden</translation>
@@ -438,7 +439,7 @@ Podpisywanie jest możliwe tylko z adresami typu 'legacy'.</translation>
     <name>BitcoinGUI</name>
     <message>
         <source>&amp;Overview</source>
-        <translation type="unfinished">P&amp;odsumowanie</translation>
+        <translation type="unfinished">&amp;Przegląd</translation>
     </message>
     <message>
         <source>Show general overview of wallet</source>
@@ -474,7 +475,7 @@ Podpisywanie jest możliwe tylko z adresami typu 'legacy'.</translation>
     </message>
     <message>
         <source>Show information about Qt</source>
-        <translation type="unfinished">Pokazuje informacje o Qt</translation>
+        <translation type="unfinished">Pokaż informacje o Qt</translation>
     </message>
     <message>
         <source>Modify configuration options for %1</source>
@@ -507,7 +508,7 @@ Podpisywanie jest możliwe tylko z adresami typu 'legacy'.</translation>
     </message>
     <message>
         <source>Backup wallet to another location</source>
-        <translation type="unfinished">Zapasowy portfel w innej lokalizacji</translation>
+        <translation type="unfinished">Zrób kopię zapasową portfela w innej lokalizacji</translation>
     </message>
     <message>
         <source>Change the passphrase used for wallet encryption</source>
@@ -515,7 +516,7 @@ Podpisywanie jest możliwe tylko z adresami typu 'legacy'.</translation>
     </message>
     <message>
         <source>&amp;Send</source>
-        <translation type="unfinished">Wyślij</translation>
+        <translation type="unfinished">&amp;Wyślij</translation>
     </message>
     <message>
         <source>&amp;Receive</source>
@@ -535,7 +536,7 @@ Podpisywanie jest możliwe tylko z adresami typu 'legacy'.</translation>
     </message>
     <message>
         <source>&amp;Backup Wallet…</source>
-        <translation type="unfinished">Utwórz kopię zapasową portfela…</translation>
+        <translation type="unfinished">Utwórz kopię &amp;zapasową portfela…</translation>
     </message>
     <message>
         <source>&amp;Change Passphrase…</source>
@@ -547,7 +548,7 @@ Podpisywanie jest możliwe tylko z adresami typu 'legacy'.</translation>
     </message>
     <message>
         <source>Sign messages with your Bitcoin addresses to prove you own them</source>
-        <translation type="unfinished">Podpisz wiadomości swoim adresem, aby udowodnić jego posiadanie</translation>
+        <translation type="unfinished">Podpisz wiadomości swoimi adresami Bitcoin, aby potwierdzić, że je posiadasz.</translation>
     </message>
     <message>
         <source>&amp;Verify message…</source>
@@ -555,7 +556,7 @@ Podpisywanie jest możliwe tylko z adresami typu 'legacy'.</translation>
     </message>
     <message>
         <source>Verify messages to ensure they were signed with specified Bitcoin addresses</source>
-        <translation type="unfinished">Zweryfikuj wiadomość,  aby upewnić się, że została podpisana podanym adresem bitcoinowym.</translation>
+        <translation type="unfinished">Zweryfikuj wiadomości, aby upewnić się, że zostały podpisane określonymi adresami bitcoinowymi.</translation>
     </message>
     <message>
         <source>&amp;Load PSBT from file…</source>
@@ -577,13 +578,17 @@ Podpisywanie jest możliwe tylko z adresami typu 'legacy'.</translation>
         <source>Close All Wallets…</source>
         <translation type="unfinished">Zamknij wszystkie portfele…</translation>
     </message>
+    <message>
+        <source>Restore and Migrate Wallet File…</source>
+        <translation type="unfinished">Przywróć i migruj plik portfela…</translation>
+    </message>
     <message>
         <source>&amp;File</source>
         <translation type="unfinished">&amp;Plik</translation>
     </message>
     <message>
         <source>&amp;Settings</source>
-        <translation type="unfinished">P&amp;referencje</translation>
+        <translation type="unfinished">U&amp;stawienia</translation>
     </message>
     <message>
         <source>&amp;Help</source>
@@ -615,7 +620,7 @@ Podpisywanie jest możliwe tylko z adresami typu 'legacy'.</translation>
     </message>
     <message>
         <source>Request payments (generates QR codes and bitcoin: URIs)</source>
-        <translation type="unfinished">Zażądaj płatności (generuje kody QR i URI bitcoin:)</translation>
+        <translation type="unfinished">Żądaj płatności (generuje kod QR oraz bitcoinowe URI)</translation>
     </message>
     <message>
         <source>Show the list of used sending addresses and labels</source>
@@ -627,7 +632,7 @@ Podpisywanie jest możliwe tylko z adresami typu 'legacy'.</translation>
     </message>
     <message>
         <source>&amp;Command-line options</source>
-        <translation type="unfinished">&amp;Opcje wiersza poleceń</translation>
+        <translation type="unfinished">&amp;Opcje linii komend</translation>
     </message>
     <message numerus="yes">
         <source>Processed %n block(s) of transaction history.</source>
@@ -675,7 +680,7 @@ Podpisywanie jest możliwe tylko z adresami typu 'legacy'.</translation>
     </message>
     <message>
         <source>Load PSBT from &amp;clipboard…</source>
-        <translation type="unfinished">Wczytaj PSBT ze schowka…</translation>
+        <translation type="unfinished">Wczytaj PSBT ze &amp;schowka…</translation>
     </message>
     <message>
         <source>Load Partially Signed Bitcoin Transaction from clipboard</source>
@@ -695,7 +700,7 @@ Podpisywanie jest możliwe tylko z adresami typu 'legacy'.</translation>
     </message>
     <message>
         <source>&amp;Receiving addresses</source>
-        <translation type="unfinished">&amp;Adresy odbiorcze</translation>
+        <translation type="unfinished">Ad&amp;resy odbiorcze</translation>
     </message>
     <message>
         <source>Open a bitcoin: URI</source>
@@ -716,7 +721,7 @@ Podpisywanie jest możliwe tylko z adresami typu 'legacy'.</translation>
     <message>
         <source>Restore Wallet…</source>
         <extracomment>Name of the menu item that restores wallet from a backup file.</extracomment>
-        <translation type="unfinished">Przywróć Portfel…</translation>
+        <translation type="unfinished">Przywróć portfel…</translation>
     </message>
     <message>
         <source>Restore a wallet from a backup file</source>
@@ -729,11 +734,11 @@ Podpisywanie jest możliwe tylko z adresami typu 'legacy'.</translation>
     </message>
     <message>
         <source>Migrate Wallet</source>
-        <translation type="unfinished">Przenieś Portfel</translation>
+        <translation type="unfinished">Migruj Portfel</translation>
     </message>
     <message>
         <source>Migrate a wallet</source>
-        <translation type="unfinished">Przenieś portfel</translation>
+        <translation type="unfinished">Migruj Portfel</translation>
     </message>
     <message>
         <source>Show the %1 help message to get a list with possible Bitcoin command-line options</source>
@@ -741,11 +746,11 @@ Podpisywanie jest możliwe tylko z adresami typu 'legacy'.</translation>
     </message>
     <message>
         <source>&amp;Mask values</source>
-        <translation type="unfinished">&amp;Schowaj wartości</translation>
+        <translation type="unfinished">&amp;Ukryj kwoty</translation>
     </message>
     <message>
         <source>Mask the values in the Overview tab</source>
-        <translation type="unfinished">Schowaj wartości w zakładce Podsumowanie</translation>
+        <translation type="unfinished">Maskuj wartości w zakładce Przegląd</translation>
     </message>
     <message>
         <source>No wallets available</source>
@@ -754,7 +759,7 @@ Podpisywanie jest możliwe tylko z adresami typu 'legacy'.</translation>
     <message>
         <source>Wallet Data</source>
         <extracomment>Name of the wallet data file format.</extracomment>
-        <translation type="unfinished">Dane portfela</translation>
+        <translation type="unfinished">Informacje portfela</translation>
     </message>
     <message>
         <source>Load Wallet Backup</source>
@@ -771,6 +776,23 @@ Podpisywanie jest możliwe tylko z adresami typu 'legacy'.</translation>
         <extracomment>Label of the input field where the name of the wallet is entered.</extracomment>
         <translation type="unfinished">Nazwa portfela</translation>
     </message>
+    <message>
+        <source>Invalid Wallet Name</source>
+        <translation type="unfinished">Nieprawidłowa nazwa portfela</translation>
+    </message>
+    <message>
+        <source>Wallet name cannot be empty</source>
+        <translation type="unfinished">Nazwa portfela nie może być pusta</translation>
+    </message>
+    <message>
+        <source>Restore and Migrate Wallet Backup</source>
+        <translation type="unfinished">Przywróć i migruj kopię zapasową portfela</translation>
+    </message>
+    <message>
+        <source>Restore and Migrate Wallet</source>
+        <extracomment>Title of pop-up window shown when the user is attempting to restore a wallet.</extracomment>
+        <translation type="unfinished">Przywróć i migruj portfel</translation>
+    </message>
     <message>
         <source>&amp;Window</source>
         <translation type="unfinished">&amp;Okno</translation>
@@ -828,14 +850,6 @@ Podpisywanie jest możliwe tylko z adresami typu 'legacy'.</translation>
         <source>Pre-syncing Headers (%1%)…</source>
         <translation type="unfinished">Wstępne synchronizowanie nagłówków (%1%)…</translation>
     </message>
-    <message>
-        <source>Error creating wallet</source>
-        <translation type="unfinished">Błąd podczas tworzenia portfela</translation>
-    </message>
-    <message>
-        <source>Cannot create new wallet, the software was compiled without sqlite support (required for descriptor wallets)</source>
-        <translation type="unfinished">Nie można stworzyć nowego protfela, program skompilowano bez wsparcia sqlite (wymaganego dla deskryptorów potfeli)</translation>
-    </message>
     <message>
         <source>Error: %1</source>
         <translation type="unfinished">Błąd: %1</translation>
@@ -898,7 +912,7 @@ Podpisywanie jest możliwe tylko z adresami typu 'legacy'.</translation>
     </message>
     <message>
         <source>Private key &lt;b&gt;disabled&lt;/b&gt;</source>
-        <translation type="unfinished">Klucz prywatny&lt;b&gt;dezaktywowany&lt;/b&gt;</translation>
+        <translation type="unfinished">Klucz prywatny &lt;b&gt;dezaktywowany&lt;/b&gt;</translation>
     </message>
     <message>
         <source>Wallet is &lt;b&gt;encrypted&lt;/b&gt; and currently &lt;b&gt;unlocked&lt;/b&gt;</source>
@@ -948,7 +962,7 @@ Podpisywanie jest możliwe tylko z adresami typu 'legacy'.</translation>
     </message>
     <message>
         <source>Change:</source>
-        <translation type="unfinished">Zmiana:</translation>
+        <translation type="unfinished">Reszta:</translation>
     </message>
     <message>
         <source>(un)select all</source>
@@ -980,7 +994,7 @@ Podpisywanie jest możliwe tylko z adresami typu 'legacy'.</translation>
     </message>
     <message>
         <source>Confirmations</source>
-        <translation type="unfinished">Potwierdzenie</translation>
+        <translation type="unfinished">Potwierdzenia</translation>
     </message>
     <message>
         <source>Confirmed</source>
@@ -988,7 +1002,7 @@ Podpisywanie jest możliwe tylko z adresami typu 'legacy'.</translation>
     </message>
     <message>
         <source>Copy amount</source>
-        <translation type="unfinished">Kopiuj kwotę</translation>
+        <translation type="unfinished">Kopiuj &amp;kwotę</translation>
     </message>
     <message>
         <source>&amp;Copy address</source>
@@ -1004,7 +1018,7 @@ Podpisywanie jest możliwe tylko z adresami typu 'legacy'.</translation>
     </message>
     <message>
         <source>Copy transaction &amp;ID and output index</source>
-        <translation type="unfinished">Kopiuj &amp;ID transakcji oraz wyjściowy indeks</translation>
+        <translation type="unfinished">Skopiuj &amp;ID transakcji oraz wyjściowy indeks</translation>
     </message>
     <message>
         <source>L&amp;ock unspent</source>
@@ -1016,11 +1030,11 @@ Podpisywanie jest możliwe tylko z adresami typu 'legacy'.</translation>
     </message>
     <message>
         <source>Copy quantity</source>
-        <translation type="unfinished">Kopiuj ilość</translation>
+        <translation type="unfinished">Skopiuj ilość</translation>
     </message>
     <message>
         <source>Copy fee</source>
-        <translation type="unfinished">Kopiuj opłatę</translation>
+        <translation type="unfinished">Skopiuj prowizję</translation>
     </message>
     <message>
         <source>Copy after fee</source>
@@ -1028,11 +1042,11 @@ Podpisywanie jest możliwe tylko z adresami typu 'legacy'.</translation>
     </message>
     <message>
         <source>Copy bytes</source>
-        <translation type="unfinished">Kopiuj bajty</translation>
+        <translation type="unfinished">Skopiuj bajty</translation>
     </message>
     <message>
         <source>Copy change</source>
-        <translation type="unfinished">Kopiuj resztę</translation>
+        <translation type="unfinished">Skopiuj resztę</translation>
     </message>
     <message>
         <source>(%1 locked)</source>
@@ -1101,11 +1115,11 @@ Podpisywanie jest możliwe tylko z adresami typu 'legacy'.</translation>
     <name>MigrateWalletActivity</name>
     <message>
         <source>Migrate wallet</source>
-        <translation type="unfinished">Przenieś portfel</translation>
+        <translation type="unfinished">Migruj Portfel</translation>
     </message>
     <message>
         <source>Are you sure you wish to migrate the wallet &lt;i&gt;%1&lt;/i&gt;?</source>
-        <translation type="unfinished">Na pewno chcesz przenieść portfel &lt;i&gt;%1&lt;/i&gt;?</translation>
+        <translation type="unfinished">Na pewno chcesz przeprowadzić migrację portfela &lt;i&gt;%1&lt;/i&gt;?</translation>
     </message>
     <message>
         <source>Migrating the wallet will convert this wallet to one or more descriptor wallets. A new wallet backup will need to be made.
@@ -1114,14 +1128,14 @@ If this wallet contains any solvable but not watched scripts, a different and ne
 
 The migration process will create a backup of the wallet before migrating. This backup file will be named &lt;wallet name&gt;-&lt;timestamp&gt;.legacy.bak and can be found in the directory for this wallet. In the event of an incorrect migration, the backup can be restored with the "Restore Wallet" functionality.</source>
         <translation type="unfinished">Migracja portfela przekonwertuje ten portfel na jeden lub więcej portfeli opisowych. Należy utworzyć nową kopię zapasową portfela.
-Jeśli ten portfel zawiera jakiekolwiek skrypty tylko do odczytu, zostanie utworzony nowy portfel, który zawiera te skrypty tylko do odczytu.
-Jeśli ten portfel zawiera jakiekolwiek skrypty rozwiązywalne, ale nie obserwowane, zostanie utworzony inny i nowy portfel, który zawiera te skrypty.
+Jeśli ten portfel zawiera jakiekolwiek skrypty tylko do odczytu (watchonly), zostanie utworzony nowy portfel, który zawiera takie skrypty.
+Jeśli ten portfel zawiera jakiekolwiek skrypty rozwiązywalne, ale nie obserwowane, zostanie utworzony inny i nowy portfel, który zawiera takie skrypty.
 
 Proces migracji utworzy kopię zapasową portfela przed migracją. Plik kopii zapasowej będzie nosił nazwę &lt;wallet name&gt;-&lt;timestamp&gt;.legacy.bak i można go znaleźć w katalogu tego portfela. W przypadku nieprawidłowej migracji kopię zapasową można przywrócić za pomocą funkcji "Przywróć portfel".</translation>
     </message>
     <message>
         <source>Migrate Wallet</source>
-        <translation type="unfinished">Przenieś Portfel</translation>
+        <translation type="unfinished">Migruj Portfel</translation>
     </message>
     <message>
         <source>Migrating Wallet &lt;b&gt;%1&lt;/b&gt;…</source>
@@ -1129,23 +1143,57 @@ Proces migracji utworzy kopię zapasową portfela przed migracją. Plik kopii za
     </message>
     <message>
         <source>The wallet '%1' was migrated successfully.</source>
-        <translation type="unfinished">Portfel '%1' został poprawnie przeniesiony.</translation>
+        <translation type="unfinished">Portfel '%1' został poprawnie przemigrowany.</translation>
     </message>
     <message>
         <source>Watchonly scripts have been migrated to a new wallet named '%1'.</source>
-        <translation type="unfinished">Skrypty tylko do odczytu zostały przeniesione do nowego portfela '%1'</translation>
+        <translation type="unfinished">Skrypty tylko do odczytu zostały przemigrowane do nowego portfela '%1'.</translation>
     </message>
     <message>
         <source>Solvable but not watched scripts have been migrated to a new wallet named '%1'.</source>
-        <translation type="unfinished">Rozwiązywalne, ale nie obserwowane skrypty zostały przeniesione do nowego portfela '%1'</translation>
+        <translation type="unfinished">Rozwiązywalne, ale nie obserwowane skrypty zostały przemigrowane do nowego portfela '%1'</translation>
+    </message>
+    <message>
+        <source>Restore and Migrate wallet</source>
+        <translation type="unfinished">Przywróć i przeprowadź migrację portfela</translation>
+    </message>
+    <message>
+        <source>Are you sure you wish to restore the wallet file &lt;i&gt;%1&lt;/i&gt; to &lt;i&gt;%2&lt;/i&gt; and migrate it?</source>
+        <translation type="unfinished">Czy na pewno chcesz przywrócić plik portfela &lt;i&gt;%1&lt;/i&gt; do &lt;i&gt;%2&lt;/i&gt; i przeprowadzić migrację?</translation>
+    </message>
+    <message>
+        <source>Restoring the wallet will copy the backup file to the wallets directory and place it in the standard wallet directory layout. The original file will not be modified.
+
+Migrating the wallet will convert the restored wallet to one or more descriptor wallets. A new wallet backup will need to be made.
+If this wallet contains any watchonly scripts, a new wallet will be created which contains those watchonly scripts.
+If this wallet contains any solvable but not watched scripts, a different and new wallet will be created which contains those scripts.
+
+The migration process will create a backup of the wallet before migrating. This backup file will be named &lt;wallet name&gt;-&lt;timestamp&gt;.legacy.bak and can be found in the directory for this wallet. In the event of an incorrect migration, the backup can be restored with the "Restore Wallet" functionality.</source>
+        <translation type="unfinished">Przywracanie portfela spowoduje skopiowanie pliku kopii zapasowej do katalogu wallets i umieszczenie go w standardowej strukturze katalogów portfela. Oryginalny plik nie zostanie zmodyfikowany.
+
+Migracja portfela spowoduje konwersję przywróconego portfela do jednego lub większej liczby portfeli deskryptorowych. Konieczne będzie utworzenie nowej kopii zapasowej portfela.
+Jeśli ten portfel zawiera jakiekolwiek skrypty watchonly, zostanie utworzony nowy portfel zawierający je.
+Jeśli ten portfel zawiera jakiekolwiek skrypty rozwiązywalne (solvable), ale nie obserwowane, zostanie utworzony inny, nowy portfel zawierający te skrypty.
+
+Proces migracji utworzy kopię zapasową portfela przed rozpoczęciem migracji. Plik kopii zapasowej będzie nazwany &lt;wallet name&gt;-&lt;timestamp&gt;.legacy.bak i będzie dostępny w katalogu tego portfela. W przypadku nieprawidłowej migracji kopię zapasową można przywrócić za pomocą funkcji „Przywróć portfel”.</translation>
+    </message>
+    <message>
+        <source>Restore Wallet</source>
+        <extracomment>Title of progress window which is displayed when wallets are being restored.</extracomment>
+        <translation type="unfinished">Przywróć portfel</translation>
+    </message>
+    <message>
+        <source>Restoring Wallet &lt;b&gt;%1&lt;/b&gt;…</source>
+        <extracomment>Descriptive text of the restore wallets progress window which indicates to the user that wallets are currently being restored.</extracomment>
+        <translation type="unfinished">Przywracanie portfela &lt;b&gt;%1&lt;/b&gt;…</translation>
     </message>
     <message>
         <source>Migration failed</source>
-        <translation type="unfinished">Przeniesienie nie powiodło się</translation>
+        <translation type="unfinished">Migracja nie powiodła się</translation>
     </message>
     <message>
         <source>Migration Successful</source>
-        <translation type="unfinished">Przeniesienie powiodło się</translation>
+        <translation type="unfinished">Migracja powiodła się</translation>
     </message>
 </context>
 <context>
@@ -1217,7 +1265,7 @@ Proces migracji utworzy kopię zapasową portfela przed migracją. Plik kopii za
     </message>
     <message>
         <source>Are you sure you wish to close all wallets?</source>
-        <translation type="unfinished">Na pewno zamknąć wszystkie portfele?</translation>
+        <translation type="unfinished">Czy na pewno chcesz zamknąć wszystkie portfele?</translation>
     </message>
 </context>
 <context>
@@ -1263,8 +1311,8 @@ Proces migracji utworzy kopię zapasową portfela przed migracją. Plik kopii za
         <translation type="unfinished">Wyłącz klucze prywatne</translation>
     </message>
     <message>
-        <source>Make a blank wallet. Blank wallets do not initially have private keys or scripts. Private keys and addresses can be imported, or an HD seed can be set, at a later time.</source>
-        <translation type="unfinished">Stwórz czysty portfel. Portfel taki początkowo nie zawiera żadnych kluczy prywatnych ani skryptów. Później mogą zostać zaimportowane klucze prywatne, adresy lub będzie można ustawić seed HD.</translation>
+        <source>Make a blank wallet. Blank wallets do not initially have private keys or scripts. Private keys and addresses can be imported using descriptors at a later time.</source>
+        <translation type="unfinished">Utwórz pusty portfel. Puste portfele początkowo nie zawierają kluczy prywatnych ani skryptów. Klucze prywatne i adresy można zaimportować później za pomocą deskryptorów.</translation>
     </message>
     <message>
         <source>Make Blank Wallet</source>
@@ -1285,14 +1333,14 @@ Proces migracji utworzy kopię zapasową portfela przed migracją. Plik kopii za
     <message>
         <source>Compiled without external signing support (required for external signing)</source>
         <extracomment>"External signing" means using devices such as hardware wallets.</extracomment>
-        <translation type="unfinished">Skompilowany bez obsługi podpisywania zewnętrznego (wymagany do podpisywania zewnętrznego)</translation>
+        <translation type="unfinished">Skompilowano bez obsługi zewnętrznego podpisywania (wymaganego do zewnętrznego podpisywania)</translation>
     </message>
 </context>
 <context>
     <name>EditAddressDialog</name>
     <message>
         <source>Edit Address</source>
-        <translation type="unfinished">Edytuj adres</translation>
+        <translation type="unfinished">Zmień adres</translation>
     </message>
     <message>
         <source>&amp;Label</source>
@@ -1316,7 +1364,7 @@ Proces migracji utworzy kopię zapasową portfela przed migracją. Plik kopii za
     </message>
     <message>
         <source>Edit receiving address</source>
-        <translation type="unfinished">Zmień adres odbiorczy</translation>
+        <translation type="unfinished">Zmień adres odbioru</translation>
     </message>
     <message>
         <source>Edit sending address</source>
@@ -1367,68 +1415,33 @@ Proces migracji utworzy kopię zapasową portfela przed migracją. Plik kopii za
     </message>
 </context>
 <context>
-    <name>Intro</name>
-    <message numerus="yes">
-        <source>%n GB of space available</source>
-        <translation type="unfinished">
-            <numerusform>%n GB dostępnej przestrzeni dyskowej </numerusform>
-            <numerusform>%n GB dostępnej przestrzeni dyskowej </numerusform>
-            <numerusform>%n GB dostępnej przestrzeni dyskowej </numerusform>
-        </translation>
-    </message>
-    <message numerus="yes">
-        <source>(of %n GB needed)</source>
-        <translation type="unfinished">
-            <numerusform>(z %n GB potrzebnych)</numerusform>
-            <numerusform>(z %n GB potrzebnych)</numerusform>
-            <numerusform>(z %n GB potrzebnych)</numerusform>
-        </translation>
-    </message>
-    <message numerus="yes">
-        <source>(%n GB needed for full chain)</source>
-        <translation type="unfinished">
-            <numerusform>(%n GB potrzebny na pełny łańcuch)</numerusform>
-            <numerusform>(%n GB potrzebne na pełny łańcuch)</numerusform>
-            <numerusform>(%n GB potrzebnych na pełny łańcuch)</numerusform>
-        </translation>
-    </message>
-    <message>
-        <source>Choose data directory</source>
-        <translation type="unfinished">Wybierz folder danych</translation>
-    </message>
-    <message>
-        <source>At least %1 GB of data will be stored in this directory, and it will grow over time.</source>
-        <translation type="unfinished">Co najmniej %1 GB danych zostanie zapisane w tym katalogu, a ich rozmiar będzie rósł w czasie.</translation>
-    </message>
+    <name>HelpMessageDialog</name>
     <message>
-        <source>Approximately %1 GB of data will be stored in this directory.</source>
-        <translation type="unfinished">Około %1 GB danych zostanie zapisane w tym katalogu.</translation>
-    </message>
-    <message numerus="yes">
-        <source>(sufficient to restore backups %n day(s) old)</source>
-        <extracomment>Explanatory text on the capability of the current prune target.</extracomment>
-        <translation type="unfinished">
-            <numerusform>(wystarcza do przywrócenia kopii zapasowych sprzed %n dnia)</numerusform>
-            <numerusform>(wystarcza do przywrócenia kopii zapasowych sprzed %n dni)</numerusform>
-            <numerusform>(wystarcza do przywrócenia kopii zapasowych sprzed %n dni)</numerusform>
-        </translation>
+        <source>version</source>
+        <translation type="unfinished">wersja</translation>
     </message>
     <message>
-        <source>%1 will download and store a copy of the Bitcoin block chain.</source>
-        <translation type="unfinished">%1 pobierze i zapisze lokalnie kopię łańcucha bloków Bitcoin.</translation>
+        <source>About %1</source>
+        <translation type="unfinished">Informacje o %1</translation>
     </message>
     <message>
-        <source>The wallet will also be stored in this directory.</source>
-        <translation type="unfinished">Portfel również zostanie zapisany w tym katalogu.</translation>
+        <source>Command-line options</source>
+        <translation type="unfinished">Opcje wiersza poleceń</translation>
     </message>
+</context>
+<context>
+    <name>ShutdownWindow</name>
     <message>
-        <source>Error: Specified data directory "%1" cannot be created.</source>
-        <translation type="unfinished">Błąd: podany folder danych "%1" nie mógł zostać utworzony.</translation>
+        <source>%1 is shutting down…</source>
+        <translation type="unfinished">%1 zamyka się…</translation>
     </message>
     <message>
-        <source>Error</source>
-        <translation type="unfinished">Błąd</translation>
+        <source>Do not shut down the computer until this window disappears.</source>
+        <translation type="unfinished">Nie wyłączaj komputera dopóki to okno nie zniknie.</translation>
     </message>
+</context>
+<context>
+    <name>Intro</name>
     <message>
         <source>Welcome</source>
         <translation type="unfinished">Witaj</translation>
@@ -1449,17 +1462,13 @@ Proces migracji utworzy kopię zapasową portfela przed migracją. Plik kopii za
         <source>Reverting this setting requires re-downloading the entire blockchain. It is faster to download the full chain first and prune it later. Disables some advanced features.</source>
         <translation type="unfinished">Wyłączenie tej opcji spowoduje konieczność pobrania całego łańcucha bloków. Szybciej jest najpierw pobrać cały łańcuch a następnie go przyciąć (prune). Wyłącza niektóre zaawansowane funkcje.</translation>
     </message>
-    <message>
-        <source> GB</source>
-        <translation type="unfinished">GB</translation>
-    </message>
     <message>
         <source>This initial synchronisation is very demanding, and may expose hardware problems with your computer that had previously gone unnoticed. Each time you run %1, it will continue downloading where it left off.</source>
         <translation type="unfinished">Wstępna synchronizacja jest bardzo wymagająca i może ujawnić wcześniej niezauważone problemy sprzętowe. Za każdym uruchomieniem %1 pobieranie będzie kontynuowane od miejsca w którym zostało zatrzymane.</translation>
     </message>
     <message>
         <source>When you click OK, %1 will begin to download and process the full %4 block chain (%2 GB) starting with the earliest transactions in %3 when %4 initially launched.</source>
-        <translation type="unfinished">Gdy naciśniesz OK, %1 zacznie się pobieranie i przetwarzanie całego %4 łańcucha bloków (%2GB) zaczynając od najwcześniejszych transakcji w %3 gdy %4 został uruchomiony.</translation>
+        <translation type="unfinished">Kiedy klikniesz OK, %1 rozpocznie pobieranie i przetwarzanie pełnego łańcucha bloków %4 (%2 GB), zaczynając od najwcześniejszych transakcji z %3, gdy %4 został po raz pierwszy uruchomiony.</translation>
     </message>
     <message>
         <source>If you have chosen to limit block chain storage (pruning), the historical data must still be downloaded and processed, but will be deleted afterward to keep your disk usage low.</source>
@@ -1473,31 +1482,66 @@ Proces migracji utworzy kopię zapasową portfela przed migracją. Plik kopii za
         <source>Use a custom data directory:</source>
         <translation type="unfinished">Użyj wybranego folderu dla danych</translation>
     </message>
-</context>
-<context>
-    <name>HelpMessageDialog</name>
+    <message numerus="yes">
+        <source>%n GB of space available</source>
+        <translation type="unfinished">
+            <numerusform>%n GB dostępnej przestrzeni dyskowej</numerusform>
+            <numerusform>%n GB dostępnej przestrzeni dyskowej</numerusform>
+            <numerusform>%n GB dostępnej przestrzeni dyskowej</numerusform>
+        </translation>
+    </message>
+    <message numerus="yes">
+        <source>(of %n GB needed)</source>
+        <translation type="unfinished">
+            <numerusform>(z %n GB potrzebnych)</numerusform>
+            <numerusform>(z %n GB potrzebnych)</numerusform>
+            <numerusform>(z %n GB potrzebnych)</numerusform>
+        </translation>
+    </message>
+    <message numerus="yes">
+        <source>(%n GB needed for full chain)</source>
+        <translation type="unfinished">
+            <numerusform>(%n GB potrzebnych na pełny łańcuch)</numerusform>
+            <numerusform>(%n GB potrzebnych na pełny łańcuch)</numerusform>
+            <numerusform>(%n GB potrzebnych na pełny łańcuch)</numerusform>
+        </translation>
+    </message>
     <message>
-        <source>version</source>
-        <translation type="unfinished">wersja</translation>
+        <source>Choose data directory</source>
+        <translation type="unfinished">Wybierz folder danych</translation>
     </message>
     <message>
-        <source>About %1</source>
-        <translation type="unfinished">Informacje o %1</translation>
+        <source>At least %1 GB of data will be stored in this directory, and it will grow over time.</source>
+        <translation type="unfinished">Co najmniej %1 GB danych zostanie zapisane w tym katalogu, a ich rozmiar będzie rósł w czasie.</translation>
     </message>
     <message>
-        <source>Command-line options</source>
-        <translation type="unfinished">Opcje wiersza poleceń</translation>
+        <source>Approximately %1 GB of data will be stored in this directory.</source>
+        <translation type="unfinished">Około %1 GB danych zostanie zapisane w tym katalogu.</translation>
+    </message>
+    <message numerus="yes">
+        <source>(sufficient to restore backups %n day(s) old)</source>
+        <extracomment>Explanatory text on the capability of the current prune target.</extracomment>
+        <translation type="unfinished">
+            <numerusform>(wystarcza do przywrócenia kopii zapasowych sprzed %n dnia)</numerusform>
+            <numerusform>(wystarcza do przywrócenia kopii zapasowych sprzed %n dni)</numerusform>
+            <numerusform>(wystarcza do przywrócenia kopii zapasowych sprzed %n dni)</numerusform>
+        </translation>
     </message>
-</context>
-<context>
-    <name>ShutdownWindow</name>
     <message>
-        <source>%1 is shutting down…</source>
-        <translation type="unfinished">%1 zamyka się…</translation>
+        <source>%1 will download and store a copy of the Bitcoin block chain.</source>
+        <translation type="unfinished">%1 pobierze i przechowa kopię łańcucha bloków Bitcoina.</translation>
     </message>
     <message>
-        <source>Do not shut down the computer until this window disappears.</source>
-        <translation type="unfinished">Nie wyłączaj komputera dopóki to okno nie zniknie.</translation>
+        <source>The wallet will also be stored in this directory.</source>
+        <translation type="unfinished">Portfel również zostanie zapisany w tym katalogu.</translation>
+    </message>
+    <message>
+        <source>Error: Specified data directory "%1" cannot be created.</source>
+        <translation type="unfinished">Błąd: podany folder danych "%1" nie mógł zostać utworzony.</translation>
+    </message>
+    <message>
+        <source>Error</source>
+        <translation type="unfinished">Błąd</translation>
     </message>
 </context>
 <context>
@@ -1508,7 +1552,7 @@ Proces migracji utworzy kopię zapasową portfela przed migracją. Plik kopii za
     </message>
     <message>
         <source>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.</source>
-        <translation type="unfinished">Świeże transakcje mogą nie być jeszcze widoczne, a zatem saldo portfela może być nieprawidłowe. Te detale będą poprawne, gdy portfel zakończy synchronizację z siecią bitcoin, zgodnie z poniższym opisem.</translation>
+        <translation type="unfinished">Najnowsze transakcje mogą jeszcze nie być widoczne, dlatego saldo twojego portfela może być nieprawidłowe. Informacje te będą poprawne, gdy twój portfel zakończy synchronizację z siecią bitcoin, jak opisano poniżej.</translation>
     </message>
     <message>
         <source>Attempting to spend bitcoins that are affected by not-yet-displayed transactions will not be accepted by the network.</source>
@@ -1546,10 +1590,6 @@ Proces migracji utworzy kopię zapasową portfela przed migracją. Plik kopii za
         <source>Hide</source>
         <translation type="unfinished">Ukryj</translation>
     </message>
-    <message>
-        <source>Esc</source>
-        <translation type="unfinished">Wyjdź</translation>
-    </message>
     <message>
         <source>%1 is currently syncing.  It will download headers and blocks from peers and validate them until reaching the tip of the block chain.</source>
         <translation type="unfinished">%1 jest w trakcie synchronizacji. Będzie pobierał oraz weryfikował nagłówki i bloki z sieci w celu uzyskania aktualnego stanu łańcucha.</translation>
@@ -1583,7 +1623,7 @@ Proces migracji utworzy kopię zapasową portfela przed migracją. Plik kopii za
     </message>
     <message>
         <source>&amp;Main</source>
-        <translation type="unfinished">Główne</translation>
+        <translation type="unfinished">&amp;Główne</translation>
     </message>
     <message>
         <source>Automatically start %1 after logging in to the system.</source>
@@ -1604,11 +1644,11 @@ Proces migracji utworzy kopię zapasową portfela przed migracją. Plik kopii za
     </message>
     <message>
         <source>Size of &amp;database cache</source>
-        <translation type="unfinished">Wielkość bufora bazy &amp;danych</translation>
+        <translation type="unfinished">Wielkość pamięci podręcznej bazy &amp;danych</translation>
     </message>
     <message>
         <source>Number of script &amp;verification threads</source>
-        <translation type="unfinished">Liczba wątków &amp;weryfikacji skryptu</translation>
+        <translation type="unfinished">Liczba wątków &amp;weryfikacji skryptów</translation>
     </message>
     <message>
         <source>Full path to a %1 compatible script (e.g. C:\Downloads\hwi.exe or /Users/you/Downloads/hwi.py). Beware: malware can steal your coins!</source>
@@ -1656,7 +1696,7 @@ Proces migracji utworzy kopię zapasową portfela przed migracją. Plik kopii za
     </message>
     <message>
         <source>&amp;Reset Options</source>
-        <translation type="unfinished">Z&amp;resetuj ustawienia</translation>
+        <translation type="unfinished">&amp;Resetuj opcje</translation>
     </message>
     <message>
         <source>&amp;Network</source>
@@ -1691,7 +1731,7 @@ Proces migracji utworzy kopię zapasową portfela przed migracją. Plik kopii za
     </message>
     <message>
         <source>W&amp;allet</source>
-        <translation type="unfinished">Portfel</translation>
+        <translation type="unfinished">P&amp;ortfel</translation>
     </message>
     <message>
         <source>Whether to set subtract fee from amount as default or not.</source>
@@ -1722,12 +1762,12 @@ Proces migracji utworzy kopię zapasową portfela przed migracją. Plik kopii za
     <message>
         <source>Enable &amp;PSBT controls</source>
         <extracomment>An options window setting to enable PSBT controls.</extracomment>
-        <translation type="unfinished">Włącz ustawienia &amp;PSBT</translation>
+        <translation type="unfinished">Włącz kontrolki &amp;PSBT</translation>
     </message>
     <message>
         <source>Whether to show PSBT controls.</source>
         <extracomment>Tooltip text for options window setting that enables PSBT controls.</extracomment>
-        <translation type="unfinished">Czy wyświetlać opcje PSBT.</translation>
+        <translation type="unfinished">Czy pokazywać kontrolki PSBT.</translation>
     </message>
     <message>
         <source>External Signer (e.g. hardware wallet)</source>
@@ -1735,7 +1775,7 @@ Proces migracji utworzy kopię zapasową portfela przed migracją. Plik kopii za
     </message>
     <message>
         <source>&amp;External signer script path</source>
-        <translation type="unfinished">&amp;Ścieżka zewnętrznego skryptu podpisującego</translation>
+        <translation type="unfinished">Ści&amp;eżka zewnętrznego skryptu podpisującego</translation>
     </message>
     <message>
         <source>Accept connections from outside.</source>
@@ -1779,7 +1819,7 @@ Proces migracji utworzy kopię zapasową portfela przed migracją. Plik kopii za
     </message>
     <message>
         <source>Show only a tray icon after minimizing the window.</source>
-        <translation type="unfinished">Pokazuj tylko ikonę przy zegarku po zminimalizowaniu okna.</translation>
+        <translation type="unfinished">Pokaż tylko ikonę w zasobniku po zminimalizowaniu okna.</translation>
     </message>
     <message>
         <source>&amp;Minimize to the tray instead of the taskbar</source>
@@ -1795,11 +1835,11 @@ Proces migracji utworzy kopię zapasową portfela przed migracją. Plik kopii za
     </message>
     <message>
         <source>User Interface &amp;language:</source>
-        <translation type="unfinished">Język &amp;użytkownika:</translation>
+        <translation type="unfinished">&amp;Język interfejsu użytkownika:</translation>
     </message>
     <message>
         <source>The user interface language can be set here. This setting will take effect after restarting %1.</source>
-        <translation type="unfinished">Można tu ustawić język interfejsu uzytkownika. Ustawienie przyniesie skutek po ponownym uruchomieniu %1.</translation>
+        <translation type="unfinished">Można tu ustawić język interfejsu użytkownika. Ustawienie przyniesie skutek po ponownym uruchomieniu %1.</translation>
     </message>
     <message>
         <source>&amp;Unit to show amounts in:</source>
@@ -1807,7 +1847,7 @@ Proces migracji utworzy kopię zapasową portfela przed migracją. Plik kopii za
     </message>
     <message>
         <source>Choose the default subdivision unit to show in the interface and when sending coins.</source>
-        <translation type="unfinished">Wybierz podział jednostki pokazywany w interfejsie  oraz podczas wysyłania monet</translation>
+        <translation type="unfinished">Wybierz domyślną jednostkę podziału wyświetlaną w interfejsie oraz podczas wysyłania monet.</translation>
     </message>
     <message>
         <source>Third-party URLs (e.g. a block explorer) that appear in the transactions tab as context menu items. %s in the URL is replaced by transaction hash. Multiple URLs are separated by vertical bar |.</source>
@@ -1827,7 +1867,7 @@ Proces migracji utworzy kopię zapasową portfela przed migracją. Plik kopii za
     </message>
     <message>
         <source>Use separate SOCKS&amp;5 proxy to reach peers via Tor onion services:</source>
-        <translation type="unfinished">Użyj oddzielnego proxy SOCKS&amp;5 aby osiągnąć węzły w ukrytych usługach Tor:</translation>
+        <translation type="unfinished">Użyj oddzielnego proxy SOCKS&amp;5, aby połączyć się z węzłami poprzez usługi onion w sieci Tor:</translation>
     </message>
     <message>
         <source>&amp;Cancel</source>
@@ -1836,7 +1876,7 @@ Proces migracji utworzy kopię zapasową portfela przed migracją. Plik kopii za
     <message>
         <source>Compiled without external signing support (required for external signing)</source>
         <extracomment>"External signing" means using devices such as hardware wallets.</extracomment>
-        <translation type="unfinished">Skompilowany bez obsługi podpisywania zewnętrznego (wymagany do podpisywania zewnętrznego)</translation>
+        <translation type="unfinished">Skompilowano bez obsługi zewnętrznego podpisywania (wymaganego do zewnętrznego podpisywania)</translation>
     </message>
     <message>
         <source>default</source>
@@ -1849,12 +1889,12 @@ Proces migracji utworzy kopię zapasową portfela przed migracją. Plik kopii za
     <message>
         <source>Confirm options reset</source>
         <extracomment>Window title text of pop-up window shown when the user has chosen to reset options.</extracomment>
-        <translation type="unfinished">Potwierdź reset ustawień</translation>
+        <translation type="unfinished">Potwierdź reset opcji</translation>
     </message>
     <message>
         <source>Client restart required to activate changes.</source>
         <extracomment>Text explaining that the settings changed will not come into effect until the client is restarted.</extracomment>
-        <translation type="unfinished">Wymagany restart programu, aby uaktywnić zmiany.</translation>
+        <translation type="unfinished">Wymagane ponowne uruchomienie klienta, aby aktywować zmiany.</translation>
     </message>
     <message>
         <source>Current settings will be backed up at "%1".</source>
@@ -1864,7 +1904,7 @@ Proces migracji utworzy kopię zapasową portfela przed migracją. Plik kopii za
     <message>
         <source>Client will be shut down. Do you want to proceed?</source>
         <extracomment>Text asking the user to confirm if they would like to proceed with a client shutdown.</extracomment>
-        <translation type="unfinished">Program zostanie wyłączony. Czy chcesz kontynuować?</translation>
+        <translation type="unfinished">Klient zostanie zamknięty. Czy chcesz kontynuować?</translation>
     </message>
     <message>
         <source>Configuration options</source>
@@ -1890,15 +1930,15 @@ Proces migracji utworzy kopię zapasową portfela przed migracją. Plik kopii za
     </message>
     <message>
         <source>The configuration file could not be opened.</source>
-        <translation type="unfinished">Plik z konfiguracją nie mógł być otworzony.</translation>
+        <translation type="unfinished">Nie można otworzyć pliku konfiguracyjnego.</translation>
     </message>
     <message>
         <source>This change would require a client restart.</source>
-        <translation type="unfinished">Ta zmiana może wymagać ponownego uruchomienia klienta.</translation>
+        <translation type="unfinished">Ta zmiana wymaga ponownego uruchomienia klienta.</translation>
     </message>
     <message>
         <source>The supplied proxy address is invalid.</source>
-        <translation type="unfinished">Adres podanego proxy jest nieprawidłowy</translation>
+        <translation type="unfinished">Adres podanego proxy jest nieprawidłowy.</translation>
     </message>
 </context>
 <context>
@@ -1918,17 +1958,13 @@ Proces migracji utworzy kopię zapasową portfela przed migracją. Plik kopii za
         <source>The displayed information may be out of date. Your wallet automatically synchronizes with the Bitcoin network after a connection is established, but this process has not completed yet.</source>
         <translation type="unfinished">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.</translation>
     </message>
-    <message>
-        <source>Watch-only:</source>
-        <translation type="unfinished">Tylko do obserwacji:</translation>
-    </message>
     <message>
         <source>Available:</source>
         <translation type="unfinished">Dostępne:</translation>
     </message>
     <message>
         <source>Your current spendable balance</source>
-        <translation type="unfinished">Twoje obecne saldo</translation>
+        <translation type="unfinished">Twoje obecne dostępne saldo</translation>
     </message>
     <message>
         <source>Pending:</source>
@@ -1958,33 +1994,13 @@ Proces migracji utworzy kopię zapasową portfela przed migracją. Plik kopii za
         <source>Your current total balance</source>
         <translation type="unfinished">Twoje obecne saldo</translation>
     </message>
-    <message>
-        <source>Your current balance in watch-only addresses</source>
-        <translation type="unfinished">Twoje obecne saldo na adresie tylko do obserwacji</translation>
-    </message>
-    <message>
-        <source>Spendable:</source>
-        <translation type="unfinished">Możliwe do wydania:</translation>
-    </message>
     <message>
         <source>Recent transactions</source>
-        <translation type="unfinished">Ostatnie transakcje</translation>
-    </message>
-    <message>
-        <source>Unconfirmed transactions to watch-only addresses</source>
-        <translation type="unfinished">Niepotwierdzone transakcje na adresach tylko do obserwacji</translation>
-    </message>
-    <message>
-        <source>Mined balance in watch-only addresses that has not yet matured</source>
-        <translation type="unfinished">Saldo wydobytych monet na adresach tylko do obserwacji, które nie są jeszcze dojrzałe</translation>
-    </message>
-    <message>
-        <source>Current total balance in watch-only addresses</source>
-        <translation type="unfinished">Łączna kwota na adresach tylko do obserwacji</translation>
+        <translation type="unfinished">Najnowsze transakcje</translation>
     </message>
     <message>
         <source>Privacy mode activated for the Overview tab. To unmask the values, uncheck Settings-&gt;Mask values.</source>
-        <translation type="unfinished">Tryb Prywatny został włączony dla zakładki Podgląd. By odkryć wartości, odznacz Ustawienia-&gt;Ukrywaj wartości.</translation>
+        <translation type="unfinished">Tryb Prywatny został włączony dla zakładki Podgląd. By odkryć wartości, odznacz Ustawienia-&gt;Ukryj kwoty.</translation>
     </message>
 </context>
 <context>
@@ -1995,15 +2011,15 @@ Proces migracji utworzy kopię zapasową portfela przed migracją. Plik kopii za
     </message>
     <message>
         <source>Sign Tx</source>
-        <translation type="unfinished">Podpisz transakcję (Tx)</translation>
+        <translation type="unfinished">Podpisz Transakcję</translation>
     </message>
     <message>
         <source>Broadcast Tx</source>
-        <translation type="unfinished">Rozgłoś transakcję (Tx)</translation>
+        <translation type="unfinished">Rozgłoś Transakcję</translation>
     </message>
     <message>
         <source>Copy to Clipboard</source>
-        <translation type="unfinished">Kopiuj do schowka</translation>
+        <translation type="unfinished">Skopiuj do schowka</translation>
     </message>
     <message>
         <source>Save…</source>
@@ -2029,13 +2045,17 @@ Proces migracji utworzy kopię zapasową portfela przed migracją. Plik kopii za
         <source>Could not sign any more inputs.</source>
         <translation type="unfinished">Nie udało się podpisać więcej wejść.</translation>
     </message>
-    <message>
-        <source>Signed %1 inputs, but more signatures are still required.</source>
-        <translation type="unfinished">Podpisano %1 wejść, ale potrzebnych jest więcej podpisów.</translation>
+    <message numerus="yes">
+        <source>Signed %n input(s), but more signatures are still required.</source>
+        <translation type="unfinished">
+            <numerusform>Podpisano %n wejście, ale nadal wymagane są kolejne podpisy.</numerusform>
+            <numerusform>Podpisano %n wejścia, ale nadal wymagane są kolejne podpisy.</numerusform>
+            <numerusform>Podpisano %n wejść, ale nadal wymagane są kolejne podpisy.</numerusform>
+        </translation>
     </message>
     <message>
         <source>Signed transaction successfully. Transaction is ready to broadcast.</source>
-        <translation type="unfinished">Transakcja została podpisana pomyślnie. Transakcja jest gotowa do rozgłoszenia.</translation>
+        <translation type="unfinished">Transakcja została pomyślnie podpisana. Transakcja jest gotowa do rozgłoszenia.</translation>
     </message>
     <message>
         <source>Unknown error processing transaction.</source>
@@ -2043,15 +2063,15 @@ Proces migracji utworzy kopię zapasową portfela przed migracją. Plik kopii za
     </message>
     <message>
         <source>Transaction broadcast successfully! Transaction ID: %1</source>
-        <translation type="unfinished">Transakcja została rozgłoszona pomyślnie! ID transakcji: %1</translation>
+        <translation type="unfinished">Transakcja została pomyślnie rozgłoszona! Identyfikator transakcji: %1</translation>
     </message>
     <message>
         <source>Transaction broadcast failed: %1</source>
-        <translation type="unfinished">Nie udało się rozgłosić transakscji: %1</translation>
+        <translation type="unfinished">Nie udało się rozgłosić transakcji: %1</translation>
     </message>
     <message>
         <source>PSBT copied to clipboard.</source>
-        <translation type="unfinished">PSBT skopiowane do schowka</translation>
+        <translation type="unfinished">PSBT skopiowano do schowka</translation>
     </message>
     <message>
         <source>Save Transaction Data</source>
@@ -2064,7 +2084,7 @@ Proces migracji utworzy kopię zapasową portfela przed migracją. Plik kopii za
     </message>
     <message>
         <source>PSBT saved to disk.</source>
-        <translation type="unfinished">PSBT zapisane na dysk.</translation>
+        <translation type="unfinished">PSBT zapisano na dysk.</translation>
     </message>
     <message>
         <source>Sends %1 to %2</source>
@@ -2080,7 +2100,7 @@ Proces migracji utworzy kopię zapasową portfela przed migracją. Plik kopii za
     </message>
     <message>
         <source>Pays transaction fee: </source>
-        <translation type="unfinished">Opłata transakcyjna:</translation>
+        <translation type="unfinished">Opłata transakcyjna: </translation>
     </message>
     <message>
         <source>Total Amount</source>
@@ -2090,9 +2110,13 @@ Proces migracji utworzy kopię zapasową portfela przed migracją. Plik kopii za
         <source>or</source>
         <translation type="unfinished">lub</translation>
     </message>
-    <message>
-        <source>Transaction has %1 unsigned inputs.</source>
-        <translation type="unfinished">Transakcja ma %1 niepodpisane wejścia.</translation>
+    <message numerus="yes">
+        <source>Transaction has %n unsigned input(s).</source>
+        <translation type="unfinished">
+            <numerusform>Transakcja ma %n niepodpisane wejście.</numerusform>
+            <numerusform>Transakcja ma %n niepodpisane wejścia.</numerusform>
+            <numerusform>Transakcja ma %n niepodpisanych wejść.</numerusform>
+        </translation>
     </message>
     <message>
         <source>Transaction is missing some information about inputs.</source>
@@ -2129,10 +2153,6 @@ Proces migracji utworzy kopię zapasową portfela przed migracją. Plik kopii za
         <source>Payment request error</source>
         <translation type="unfinished">Błąd żądania płatności</translation>
     </message>
-    <message>
-        <source>Cannot start bitcoin: click-to-pay handler</source>
-        <translation type="unfinished">Nie można uruchomić protokołu bitcoin: kliknij-by-zapłacić</translation>
-    </message>
     <message>
         <source>URI handling</source>
         <translation type="unfinished">Obsługa URI</translation>
@@ -2155,7 +2175,7 @@ Jeśli otrzymujesz ten błąd, poproś sprzedawcę o udostępnienie URI zgodnego
     </message>
     <message>
         <source>Payment request file handling</source>
-        <translation type="unfinished">Przechwytywanie plików żądania płatności</translation>
+        <translation type="unfinished">Obsługa plików żądań płatności</translation>
     </message>
 </context>
 <context>
@@ -2168,7 +2188,7 @@ Jeśli otrzymujesz ten błąd, poproś sprzedawcę o udostępnienie URI zgodnego
     <message>
         <source>Peer</source>
         <extracomment>Title of Peers Table column which contains a unique number used to identify a connection.</extracomment>
-        <translation type="unfinished">Rówieśnik</translation>
+        <translation type="unfinished">Węzeł zdalny</translation>
     </message>
     <message>
         <source>Age</source>
@@ -2183,12 +2203,12 @@ Jeśli otrzymujesz ten błąd, poproś sprzedawcę o udostępnienie URI zgodnego
     <message>
         <source>Sent</source>
         <extracomment>Title of Peers Table column which indicates the total amount of network information we have sent to the peer.</extracomment>
-        <translation type="unfinished">Wysłane</translation>
+        <translation type="unfinished">Wysłano</translation>
     </message>
     <message>
         <source>Received</source>
         <extracomment>Title of Peers Table column which indicates the total amount of network information we have received from the peer.</extracomment>
-        <translation type="unfinished">Otrzymane</translation>
+        <translation type="unfinished">Otrzymano</translation>
     </message>
     <message>
         <source>Address</source>
@@ -2220,7 +2240,7 @@ Jeśli otrzymujesz ten błąd, poproś sprzedawcę o udostępnienie URI zgodnego
     <name>QRImageWidget</name>
     <message>
         <source>&amp;Save Image…</source>
-        <translation type="unfinished">Zapi&amp;sz Obraz…</translation>
+        <translation type="unfinished">Zapi&amp;sz Obraz...</translation>
     </message>
     <message>
         <source>&amp;Copy Image</source>
@@ -2228,7 +2248,7 @@ Jeśli otrzymujesz ten błąd, poproś sprzedawcę o udostępnienie URI zgodnego
     </message>
     <message>
         <source>Resulting URI too long, try to reduce the text for label / message.</source>
-        <translation type="unfinished">Wynikowy URI jest zbyt długi, spróbuj skrócić tekst etykiety / wiadomości</translation>
+        <translation type="unfinished">Wynikowy URI jest zbyt długi, spróbuj zmniejszyć tekst etykiety / wiadomości</translation>
     </message>
     <message>
         <source>Error encoding URI into QR Code.</source>
@@ -2274,6 +2294,10 @@ Jeśli otrzymujesz ten błąd, poproś sprzedawcę o udostępnienie URI zgodnego
         <source>To specify a non-default location of the data directory use the '%1' option.</source>
         <translation type="unfinished">Użyj opcji '%1' aby wskazać niestandardową lokalizację katalogu danych.</translation>
     </message>
+    <message>
+        <source>Blocksdir</source>
+        <translation type="unfinished">Katalog z blokami</translation>
+    </message>
     <message>
         <source>To specify a non-default location of the blocks directory use the '%1' option.</source>
         <translation type="unfinished">Użyj opcji '%1' aby wskazać niestandardową lokalizację katalogu bloków.</translation>
@@ -2300,7 +2324,7 @@ Jeśli otrzymujesz ten błąd, poproś sprzedawcę o udostępnienie URI zgodnego
     </message>
     <message>
         <source>Network addresses that your Bitcoin node is currently using to communicate with other nodes.</source>
-        <translation type="unfinished">Adresy sieciowe wykorzystywane przez twój węzeł Bitcin do komunikowania się z pozostałymi węzłami.</translation>
+        <translation type="unfinished">Adresy sieciowe wykorzystywane przez twój węzeł Bitcoin do komunikowania się z pozostałymi węzłami.</translation>
     </message>
     <message>
         <source>Block chain</source>
@@ -2312,7 +2336,7 @@ Jeśli otrzymujesz ten błąd, poproś sprzedawcę o udostępnienie URI zgodnego
     </message>
     <message>
         <source>Current number of transactions</source>
-        <translation type="unfinished">Obecna liczba transakcji</translation>
+        <translation type="unfinished">Bieżąca liczba transakcji</translation>
     </message>
     <message>
         <source>Memory usage</source>
@@ -2320,7 +2344,7 @@ Jeśli otrzymujesz ten błąd, poproś sprzedawcę o udostępnienie URI zgodnego
     </message>
     <message>
         <source>Wallet: </source>
-        <translation type="unfinished">Portfel:</translation>
+        <translation type="unfinished">Portfel: </translation>
     </message>
     <message>
         <source>(none)</source>
@@ -2328,11 +2352,11 @@ Jeśli otrzymujesz ten błąd, poproś sprzedawcę o udostępnienie URI zgodnego
     </message>
     <message>
         <source>Received</source>
-        <translation type="unfinished">Otrzymane</translation>
+        <translation type="unfinished">Otrzymano</translation>
     </message>
     <message>
         <source>Sent</source>
-        <translation type="unfinished">Wysłane</translation>
+        <translation type="unfinished">Wysłano</translation>
     </message>
     <message>
         <source>&amp;Peers</source>
@@ -2354,10 +2378,6 @@ Jeśli otrzymujesz ten błąd, poproś sprzedawcę o udostępnienie URI zgodnego
         <source>The transport layer version: %1</source>
         <translation type="unfinished">Wersja warstwy transportowej: %1</translation>
     </message>
-    <message>
-        <source>Transport</source>
-        <translation type="unfinished">Transfer</translation>
-    </message>
     <message>
         <source>Session ID</source>
         <translation type="unfinished">ID sesji</translation>
@@ -2368,15 +2388,11 @@ Jeśli otrzymujesz ten błąd, poproś sprzedawcę o udostępnienie URI zgodnego
     </message>
     <message>
         <source>Whether we relay transactions to this peer.</source>
-        <translation type="unfinished">Czy przekazujemy transakcje do tego peera.</translation>
+        <translation type="unfinished">Czy przekazujemy transakcje temu węzłowi.</translation>
     </message>
     <message>
         <source>Transaction Relay</source>
-        <translation type="unfinished">Przekazywanie transakcji</translation>
-    </message>
-    <message>
-        <source>Starting Block</source>
-        <translation type="unfinished">Blok startowy</translation>
+        <translation type="unfinished">Przekaźnik transakcji</translation>
     </message>
     <message>
         <source>Synced Headers</source>
@@ -2388,7 +2404,7 @@ Jeśli otrzymujesz ten błąd, poproś sprzedawcę o udostępnienie URI zgodnego
     </message>
     <message>
         <source>Last Transaction</source>
-        <translation type="unfinished">Ostatnia Transakcja</translation>
+        <translation type="unfinished">Ostatnia transakcja</translation>
     </message>
     <message>
         <source>The mapped Autonomous System used for diversifying peer selection.</source>
@@ -2396,27 +2412,27 @@ Jeśli otrzymujesz ten błąd, poproś sprzedawcę o udostępnienie URI zgodnego
     </message>
     <message>
         <source>Mapped AS</source>
-        <translation type="unfinished">Zmapowany system autonomiczny (ang. asmap)</translation>
+        <translation type="unfinished">Zmapowany system autonomiczny</translation>
     </message>
     <message>
         <source>Whether we relay addresses to this peer.</source>
         <extracomment>Tooltip text for the Address Relay field in the peer details area, which displays whether we relay addresses to this peer (Yes/No).</extracomment>
-        <translation type="unfinished">Czy przekazujemy adresy do tego peera.</translation>
+        <translation type="unfinished">Czy przekazujemy adresy do tego węzła zdalnego.</translation>
     </message>
     <message>
         <source>Address Relay</source>
         <extracomment>Text title for the Address Relay field in the peer details area, which displays whether we relay addresses to this peer (Yes/No).</extracomment>
-        <translation type="unfinished">Adres Przekaźnika</translation>
+        <translation type="unfinished">Przekaźnik adresów</translation>
     </message>
     <message>
         <source>The total number of addresses received from this peer that were processed (excludes addresses that were dropped due to rate-limiting).</source>
         <extracomment>Tooltip text for the Addresses Processed field in the peer details area, which displays the total number of addresses received from this peer that were processed (excludes addresses that were dropped due to rate-limiting).</extracomment>
-        <translation type="unfinished">Łączna liczba adresów otrzymanych od tego węzła, które zostały przetworzone (z wyłączeniem adresów odrzuconych z powodu limitów połączeń).</translation>
+        <translation type="unfinished">Łączna liczba adresów otrzymanych od tego węzła, które zostały przetworzone (z wyłączeniem adresów odrzuconych z powodu ograniczenia prędkości).</translation>
     </message>
     <message>
         <source>The total number of addresses received from this peer that were dropped (not processed) due to rate-limiting.</source>
         <extracomment>Tooltip text for the Addresses Rate-Limited field in the peer details area, which displays the total number of addresses received from this peer that were dropped (not processed) due to rate-limiting.</extracomment>
-        <translation type="unfinished">Łączna liczba adresów otrzymanych od tego węzła, które zostały odrzucone (nieprzetworzone) z powodu limitów połączeń.</translation>
+        <translation type="unfinished">Łączna liczba adresów otrzymanych od tego węzła, które zostały odrzucone (nieprzetworzone) z powodu ograniczenia prędkości.</translation>
     </message>
     <message>
         <source>Addresses Processed</source>
@@ -2426,7 +2442,7 @@ Jeśli otrzymujesz ten błąd, poproś sprzedawcę o udostępnienie URI zgodnego
     <message>
         <source>Addresses Rate-Limited</source>
         <extracomment>Text title for the Addresses Rate-Limited field in the peer details area, which displays the total number of addresses received from this peer that were dropped (not processed) due to rate-limiting.</extracomment>
-        <translation type="unfinished">Adresy ograniczone limitem połączeń</translation>
+        <translation type="unfinished">Adresy ograniczone limitem</translation>
     </message>
     <message>
         <source>User Agent</source>
@@ -2494,7 +2510,7 @@ Jeśli otrzymujesz ten błąd, poproś sprzedawcę o udostępnienie URI zgodnego
     </message>
     <message>
         <source>Last Block</source>
-        <translation type="unfinished">Ostatni Blok</translation>
+        <translation type="unfinished">Ostatni blok</translation>
     </message>
     <message>
         <source>Elapsed time since a novel transaction accepted into our mempool was received from this peer.</source>
@@ -2511,7 +2527,7 @@ Jeśli otrzymujesz ten błąd, poproś sprzedawcę o udostępnienie URI zgodnego
     </message>
     <message>
         <source>Ping Time</source>
-        <translation type="unfinished">Czas odpowiedzi</translation>
+        <translation type="unfinished">Czas pingu</translation>
     </message>
     <message>
         <source>The duration of a currently outstanding ping.</source>
@@ -2519,11 +2535,11 @@ Jeśli otrzymujesz ten błąd, poproś sprzedawcę o udostępnienie URI zgodnego
     </message>
     <message>
         <source>Ping Wait</source>
-        <translation type="unfinished">Czas odpowiedzi</translation>
+        <translation type="unfinished">Oczekiwanie na ping</translation>
     </message>
     <message>
         <source>Min Ping</source>
-        <translation type="unfinished">Minimalny czas odpowiedzi</translation>
+        <translation type="unfinished">Minimalny ping</translation>
     </message>
     <message>
         <source>Time Offset</source>
@@ -2543,11 +2559,11 @@ Jeśli otrzymujesz ten błąd, poproś sprzedawcę o udostępnienie URI zgodnego
     </message>
     <message>
         <source>&amp;Network Traffic</source>
-        <translation type="unfinished">&amp;Ruch sieci</translation>
+        <translation type="unfinished">&amp;Ruch sieciowy</translation>
     </message>
     <message>
         <source>Totals</source>
-        <translation type="unfinished">Kwota ogólna</translation>
+        <translation type="unfinished">Razem</translation>
     </message>
     <message>
         <source>Debug log file</source>
@@ -2568,7 +2584,7 @@ Jeśli otrzymujesz ten błąd, poproś sprzedawcę o udostępnienie URI zgodnego
     <message>
         <source>Inbound: initiated by peer</source>
         <extracomment>Explanatory text for an inbound peer connection.</extracomment>
-        <translation type="unfinished">Przychodzące: zainicjowane przez węzeł</translation>
+        <translation type="unfinished">Połączenie przychodzące: zainicjowane przez węzeł zdalny</translation>
     </message>
     <message>
         <source>Outbound Full Relay: default</source>
@@ -2595,6 +2611,11 @@ Jeśli otrzymujesz ten błąd, poproś sprzedawcę o udostępnienie URI zgodnego
         <extracomment>Explanatory text for a short-lived outbound peer connection that is used to request addresses from a peer.</extracomment>
         <translation type="unfinished">Pobieranie adresu wychodzącego: krótkotrwałe, do pozyskiwania adresów</translation>
     </message>
+    <message>
+        <source>Private broadcast: short-lived, for broadcasting privacy-sensitive transactions</source>
+        <extracomment>Explanatory text for a short-lived outbound peer connection that is used to broadcast privacy-sensitive data (like our transactions).</extracomment>
+        <translation type="unfinished">Prywatna transmisja: krótkotrwała, do rozgłaszania transakcji wymagających prywatności</translation>
+    </message>
     <message>
         <source>detecting: peer could be v1 or v2</source>
         <extracomment>Explanatory text for "detecting" transport type.</extracomment>
@@ -2616,7 +2637,7 @@ Jeśli otrzymujesz ten błąd, poproś sprzedawcę o udostępnienie URI zgodnego
     </message>
     <message>
         <source>the peer selected us for high bandwidth relay</source>
-        <translation type="unfinished">peer wybrał nas do przekaźnika o dużej przepustowości</translation>
+        <translation type="unfinished">węzeł zdalny wybrał nas do przesyłu danych o wysokiej przepustowości</translation>
     </message>
     <message>
         <source>no high bandwidth relay selected</source>
@@ -2637,7 +2658,7 @@ Jeśli otrzymujesz ten błąd, poproś sprzedawcę o udostępnienie URI zgodnego
     </message>
     <message>
         <source>1 d&amp;ay</source>
-        <translation type="unfinished">1 dzień</translation>
+        <translation type="unfinished">1 d&amp;zień</translation>
     </message>
     <message>
         <source>1 &amp;week</source>
@@ -2658,7 +2679,7 @@ Jeśli otrzymujesz ten błąd, poproś sprzedawcę o udostępnienie URI zgodnego
     </message>
     <message>
         <source>Network activity disabled</source>
-        <translation type="unfinished">Aktywność sieciowa wyłączona</translation>
+        <translation type="unfinished">Aktywność sieciowa została wyłączona</translation>
     </message>
     <message>
         <source>None</source>
@@ -2670,7 +2691,7 @@ Jeśli otrzymujesz ten błąd, poproś sprzedawcę o udostępnienie URI zgodnego
     </message>
     <message>
         <source>Node window - [%1]</source>
-        <translation type="unfinished">Okno węzła  - [%1]</translation>
+        <translation type="unfinished">Okno węzła - [%1]</translation>
     </message>
     <message>
         <source>Executing command using "%1" wallet</source>
@@ -2698,6 +2719,10 @@ Aby uzyskać więcej informacji na temat używania tej konsoli wpisz %6.
         <extracomment>A console message indicating an entered command is currently being executed.</extracomment>
         <translation type="unfinished">Wykonuję…</translation>
     </message>
+    <message>
+        <source>(peer: %1)</source>
+        <translation type="unfinished">(węzeł: %1)</translation>
+    </message>
     <message>
         <source>via %1</source>
         <translation type="unfinished">przez %1</translation>
@@ -2735,7 +2760,7 @@ Aby uzyskać więcej informacji na temat używania tej konsoli wpisz %6.
     <name>ReceiveCoinsDialog</name>
     <message>
         <source>&amp;Amount:</source>
-        <translation type="unfinished">&amp;Ilość:</translation>
+        <translation type="unfinished">&amp;Kwota:</translation>
     </message>
     <message>
         <source>&amp;Label:</source>
@@ -2763,7 +2788,7 @@ Aby uzyskać więcej informacji na temat używania tej konsoli wpisz %6.
     </message>
     <message>
         <source>An optional label to associate with the new receiving address (used by you to identify an invoice).  It is also attached to the payment request.</source>
-        <translation type="unfinished">Dodatkowa etykieta powiązana z nowym adresem do odbierania płatności (używanym w celu odnalezienia faktury). Jest również powiązana z żądaniem płatności.</translation>
+        <translation type="unfinished">Opcjonalna etykieta do powiązania z nowym adresem odbiorczym (używana przez ciebie do identyfikacji faktury). Jest również dołączana do żądania płatności.</translation>
     </message>
     <message>
         <source>An optional message that is attached to the payment request and may be displayed to the sender.</source>
@@ -2771,7 +2796,7 @@ Aby uzyskać więcej informacji na temat używania tej konsoli wpisz %6.
     </message>
     <message>
         <source>&amp;Create new receiving address</source>
-        <translation type="unfinished">&amp;Stwórz nowy adres odbiorczy</translation>
+        <translation type="unfinished">&amp;Utwórz nowy adres odbiorczy</translation>
     </message>
     <message>
         <source>Clear all fields of the form.</source>
@@ -2839,7 +2864,7 @@ Aby uzyskać więcej informacji na temat używania tej konsoli wpisz %6.
     </message>
     <message>
         <source>Could not unlock wallet.</source>
-        <translation type="unfinished">Nie można było odblokować portfela.</translation>
+        <translation type="unfinished">Nie udało się odblokować portfela.</translation>
     </message>
     <message>
         <source>Could not generate new %1 address</source>
@@ -2882,7 +2907,7 @@ Aby uzyskać więcej informacji na temat używania tej konsoli wpisz %6.
     </message>
     <message>
         <source>&amp;Verify</source>
-        <translation type="unfinished">Zweryfikuj</translation>
+        <translation type="unfinished">Z&amp;weryfikuj</translation>
     </message>
     <message>
         <source>Verify this address on e.g. a hardware wallet screen</source>
@@ -2972,7 +2997,7 @@ Aby uzyskać więcej informacji na temat używania tej konsoli wpisz %6.
     </message>
     <message>
         <source>Change:</source>
-        <translation type="unfinished">Zmiana:</translation>
+        <translation type="unfinished">Reszta:</translation>
     </message>
     <message>
         <source>If this is activated, but the change address is empty or invalid, change will be sent to a newly generated address.</source>
@@ -3088,11 +3113,11 @@ Uwaga: Ponieważ opłata jest naliczana za każdy bajt, opłata "100 satoshi za
     </message>
     <message>
         <source>Copy amount</source>
-        <translation type="unfinished">Kopiuj kwotę</translation>
+        <translation type="unfinished">Kopiuj &amp;kwotę</translation>
     </message>
     <message>
         <source>Copy fee</source>
-        <translation type="unfinished">Kopiuj opłatę</translation>
+        <translation type="unfinished">Skopiuj prowizję</translation>
     </message>
     <message>
         <source>Copy after fee</source>
@@ -3100,11 +3125,11 @@ Uwaga: Ponieważ opłata jest naliczana za każdy bajt, opłata "100 satoshi za
     </message>
     <message>
         <source>Copy bytes</source>
-        <translation type="unfinished">Kopiuj bajty</translation>
+        <translation type="unfinished">Skopiuj bajty</translation>
     </message>
     <message>
         <source>Copy change</source>
-        <translation type="unfinished">Kopiuj resztę</translation>
+        <translation type="unfinished">Skopiuj resztę</translation>
     </message>
     <message>
         <source>%1 (%2 blocks)</source>
@@ -3151,12 +3176,12 @@ Uwaga: Ponieważ opłata jest naliczana za każdy bajt, opłata "100 satoshi za
     <message>
         <source>External signer not found</source>
         <extracomment>"External signer" means using devices such as hardware wallets.</extracomment>
-        <translation type="unfinished">Nie znaleziono zewnętrznego sygnatariusza </translation>
+        <translation type="unfinished">Nie znaleziono zewnętrznego urządzenia podpisującego</translation>
     </message>
     <message>
         <source>External signer failure</source>
         <extracomment>"External signer" means using devices such as hardware wallets.</extracomment>
-        <translation type="unfinished">Błąd zewnętrznego sygnatariusza </translation>
+        <translation type="unfinished">Błąd zewnętrznego urządzenia podpisującego</translation>
     </message>
     <message>
         <source>Save Transaction Data</source>
@@ -3232,16 +3257,12 @@ Uwaga: Ponieważ opłata jest naliczana za każdy bajt, opłata "100 satoshi za
     </message>
     <message>
         <source>PSBT saved to disk</source>
-        <translation type="unfinished">PSBT zapisana na dysk</translation>
+        <translation type="unfinished">PSBT zapisano na dysk</translation>
     </message>
     <message>
         <source>Confirm send coins</source>
         <translation type="unfinished">Potwierdź wysyłanie monet</translation>
     </message>
-    <message>
-        <source>Watch-only balance:</source>
-        <translation type="unfinished">Saldo na kontach tylko do obserwacji:</translation>
-    </message>
     <message>
         <source>The recipient address is not valid. Please recheck.</source>
         <translation type="unfinished">Adres odbiorcy jest nieprawidłowy, proszę sprawdzić ponownie.</translation>
@@ -3254,10 +3275,6 @@ Uwaga: Ponieważ opłata jest naliczana za każdy bajt, opłata "100 satoshi za
         <source>The amount exceeds your balance.</source>
         <translation type="unfinished">Kwota przekracza twoje saldo.</translation>
     </message>
-    <message>
-        <source>The total exceeds your balance when the %1 transaction fee is included.</source>
-        <translation type="unfinished">Suma przekracza twoje saldo, gdy doliczymy %1 opłaty transakcyjnej.</translation>
-    </message>
     <message>
         <source>Duplicate address found: addresses should only be used once each.</source>
         <translation type="unfinished">Znaleziono zduplikowany adres: adresy powinny zostać użyte tylko raz.</translation>
@@ -3273,9 +3290,9 @@ Uwaga: Ponieważ opłata jest naliczana za każdy bajt, opłata "100 satoshi za
     <message numerus="yes">
         <source>Estimated to begin confirmation within %n block(s).</source>
         <translation type="unfinished">
-            <numerusform>Szacuje się, że potwierdzenie rozpocznie się w ciągu %n bloku.</numerusform>
-            <numerusform>Szacuje się, że potwierdzenie rozpocznie się w ciągu %n bloków.</numerusform>
-            <numerusform>Szacuje się, że potwierdzenie rozpocznie się w ciągu %n bloków.</numerusform>
+            <numerusform>Estimated to begin confirmation within %n block(s).</numerusform>
+            <numerusform>Estimated to begin confirmation within %n block(s).</numerusform>
+            <numerusform>Estimated to begin confirmation within %n block(s).</numerusform>
         </translation>
     </message>
     <message>
@@ -3339,7 +3356,7 @@ Uwaga: Ponieważ opłata jest naliczana za każdy bajt, opłata "100 satoshi za
     </message>
     <message>
         <source>S&amp;ubtract fee from amount</source>
-        <translation type="unfinished">Odejmij opłatę od kwoty</translation>
+        <translation type="unfinished">&amp;Odejmij opłatę od kwoty</translation>
     </message>
     <message>
         <source>Use available balance</source>
@@ -3404,8 +3421,8 @@ Uwaga: Ponieważ opłata jest naliczana za każdy bajt, opłata "100 satoshi za
         <translation type="unfinished">Podpis</translation>
     </message>
     <message>
-        <source>Copy the current signature to the system clipboard</source>
-        <translation type="unfinished">Kopiuj aktualny podpis do schowka</translation>
+        <source>Copy the current signature to the clipboard</source>
+        <translation type="unfinished">Skopiuj aktualny podpis do schowka</translation>
     </message>
     <message>
         <source>Sign the message to prove you own this Bitcoin address</source>
@@ -3429,8 +3446,7 @@ Uwaga: Ponieważ opłata jest naliczana za każdy bajt, opłata "100 satoshi za
     </message>
     <message>
         <source>Enter the receiver's address, message (ensure you copy line breaks, spaces, tabs, etc. exactly) and signature below to verify the message. Be careful not to read more into the signature than what is in the signed message itself, to avoid being tricked by a man-in-the-middle attack. Note that this only proves the signing party receives with the address, it cannot prove sendership of any transaction!</source>
-        <translation type="unfinished">Wpisz adres, wiadomość oraz sygnaturę (podpis) odbiorcy (upewnij się, że dokładnie skopiujesz wszystkie zakończenia linii, spacje, tabulacje itp.).  Uważaj by nie dodać więcej do podpisu niż do samej podpisywanej wiadomości by uniknąć ataku man-in-the-middle. 
-Zwróć uwagę, że poprawnie zweryfikowana wiadomość potwierdza to, że nadawca posiada klucz do adresu, natomiast nie potwierdza to, że poprawne wysłanie jakiejkolwiek transakcji!</translation>
+        <translation type="unfinished">Wpisz poniżej adres odbiorcy, wiadomość (upewnij się, że dokładnie skopiujesz podziały wierszy, spacje, tabulatory itp.) oraz podpis, aby zweryfikować wiadomość. Uważaj, aby nie doszukiwać się w podpisie więcej, niż wynika z samej podpisanej wiadomości, aby nie dać się oszukać atakiem typu man-in-the-middle. Zwróć uwagę, że dowodzi to jedynie, iż podpisujący kontroluje ten adres; nie dowodzi wysłania żadnej transakcji!</translation>
     </message>
     <message>
         <source>The Bitcoin address the message was signed with</source>
@@ -3442,11 +3458,11 @@ Zwróć uwagę, że poprawnie zweryfikowana wiadomość potwierdza to, że nadaw
     </message>
     <message>
         <source>The signature given when the message was signed</source>
-        <translation type="unfinished">Sygnatura podawana przy podpisywaniu wiadomości</translation>
+        <translation type="unfinished">Podpis podawany przy podpisywaniu wiadomości</translation>
     </message>
     <message>
         <source>Verify the message to ensure it was signed with the specified Bitcoin address</source>
-        <translation type="unfinished">Zweryfikuj wiadomość,  aby upewnić się, że została podpisana odpowiednim adresem Bitcoin.</translation>
+        <translation type="unfinished">Zweryfikuj wiadomość, aby upewnić się, że została podpisana podanym adresem Bitcoin.</translation>
     </message>
     <message>
         <source>Verify &amp;Message</source>
@@ -3458,7 +3474,7 @@ Zwróć uwagę, że poprawnie zweryfikowana wiadomość potwierdza to, że nadaw
     </message>
     <message>
         <source>Click "Sign Message" to generate signature</source>
-        <translation type="unfinished">Kliknij "Podpisz Wiadomość" żeby uzyskać podpis</translation>
+        <translation type="unfinished">Kliknij "Podpisz Wiadomość" żeby wygenerować podpis</translation>
     </message>
     <message>
         <source>The entered address is invalid.</source>
@@ -3466,7 +3482,7 @@ Zwróć uwagę, że poprawnie zweryfikowana wiadomość potwierdza to, że nadaw
     </message>
     <message>
         <source>Please check the address and try again.</source>
-        <translation type="unfinished">Proszę sprawdzić adres i spróbować ponownie.</translation>
+        <translation type="unfinished">Sprawdź adres i spróbuj ponownie.</translation>
     </message>
     <message>
         <source>The entered address does not refer to a legacy (P2PKH) key. Message signing for SegWit and other non-P2PKH address types is not supported in this version of %1. Please check the address and try again.</source>
@@ -3574,7 +3590,7 @@ Zwróć uwagę, że poprawnie zweryfikowana wiadomość potwierdza to, że nadaw
     </message>
     <message>
         <source>unknown</source>
-        <translation type="unfinished">nieznane</translation>
+        <translation type="unfinished">nieznany</translation>
     </message>
     <message>
         <source>To</source>
@@ -3584,10 +3600,6 @@ Zwróć uwagę, że poprawnie zweryfikowana wiadomość potwierdza to, że nadaw
         <source>own address</source>
         <translation type="unfinished">własny adres</translation>
     </message>
-    <message>
-        <source>watch-only</source>
-        <translation type="unfinished">tylko do obserwacji</translation>
-    </message>
     <message>
         <source>label</source>
         <translation type="unfinished">etykieta</translation>
@@ -3610,15 +3622,15 @@ Zwróć uwagę, że poprawnie zweryfikowana wiadomość potwierdza to, że nadaw
     </message>
     <message>
         <source>Debit</source>
-        <translation type="unfinished">Debet</translation>
+        <translation type="unfinished">Obciążenie</translation>
     </message>
     <message>
         <source>Total debit</source>
-        <translation type="unfinished">Łączne obciążenie</translation>
+        <translation type="unfinished">Obciążenia ogółem</translation>
     </message>
     <message>
         <source>Total credit</source>
-        <translation type="unfinished">Łączne uznanie</translation>
+        <translation type="unfinished">Suma uznań</translation>
     </message>
     <message>
         <source>Transaction fee</source>
@@ -3752,16 +3764,12 @@ Zwróć uwagę, że poprawnie zweryfikowana wiadomość potwierdza to, że nadaw
     </message>
     <message>
         <source>Sent to</source>
-        <translation type="unfinished">Wysłane do</translation>
+        <translation type="unfinished">Wysłano do</translation>
     </message>
     <message>
         <source>Mined</source>
         <translation type="unfinished">Wydobyto</translation>
     </message>
-    <message>
-        <source>watch-only</source>
-        <translation type="unfinished">tylko do obserwacji</translation>
-    </message>
     <message>
         <source>(n/a)</source>
         <translation type="unfinished">(brak)</translation>
@@ -3782,10 +3790,6 @@ Zwróć uwagę, że poprawnie zweryfikowana wiadomość potwierdza to, że nadaw
         <source>Type of transaction.</source>
         <translation type="unfinished">Rodzaj transakcji.</translation>
     </message>
-    <message>
-        <source>Whether or not a watch-only address is involved in this transaction.</source>
-        <translation type="unfinished">Czy w transakcji jest użyty adres tylko do obserwacji.</translation>
-    </message>
     <message>
         <source>User-defined intent/purpose of the transaction.</source>
         <translation type="unfinished">Zdefiniowana przez użytkownika intencja/cel transakcji.</translation>
@@ -3847,11 +3851,11 @@ Zwróć uwagę, że poprawnie zweryfikowana wiadomość potwierdza to, że nadaw
     </message>
     <message>
         <source>Range…</source>
-        <translation type="unfinished">Zakres…</translation>
+        <translation type="unfinished">Zakres...</translation>
     </message>
     <message>
         <source>&amp;Copy address</source>
-        <translation type="unfinished">&amp;Kopiuj adres</translation>
+        <translation type="unfinished">Kopiuj adres</translation>
     </message>
     <message>
         <source>Copy &amp;label</source>
@@ -3867,11 +3871,11 @@ Zwróć uwagę, że poprawnie zweryfikowana wiadomość potwierdza to, że nadaw
     </message>
     <message>
         <source>Copy &amp;raw transaction</source>
-        <translation type="unfinished">Kopiuj &amp;raw transakcję</translation>
+        <translation type="unfinished">Kopiuj su&amp;rową transakcję</translation>
     </message>
     <message>
         <source>Copy full transaction &amp;details</source>
-        <translation type="unfinished">Kopiuj pełne &amp;szczegóły transakcji</translation>
+        <translation type="unfinished">Skopiuj pełne &amp;detale transakcji</translation>
     </message>
     <message>
         <source>&amp;Show transaction details</source>
@@ -3879,15 +3883,15 @@ Zwróć uwagę, że poprawnie zweryfikowana wiadomość potwierdza to, że nadaw
     </message>
     <message>
         <source>Increase transaction &amp;fee</source>
-        <translation type="unfinished">Zwiększ opłatę transakcji</translation>
+        <translation type="unfinished">Zwiększ &amp;opłatę transakcji</translation>
     </message>
     <message>
         <source>A&amp;bandon transaction</source>
-        <translation type="unfinished">Porzuć transakcję</translation>
+        <translation type="unfinished">&amp;Porzuć transakcję</translation>
     </message>
     <message>
         <source>&amp;Edit address label</source>
-        <translation type="unfinished">Wy&amp;edytuj etykietę adresu</translation>
+        <translation type="unfinished">&amp;Edytuj etykietę adresu</translation>
     </message>
     <message>
         <source>Show in %1</source>
@@ -3898,19 +3902,10 @@ Zwróć uwagę, że poprawnie zweryfikowana wiadomość potwierdza to, że nadaw
         <source>Export Transaction History</source>
         <translation type="unfinished">Eksport historii transakcji</translation>
     </message>
-    <message>
-        <source>Comma separated file</source>
-        <extracomment>Expanded name of the CSV file format. See: https://en.wikipedia.org/wiki/Comma-separated_values.</extracomment>
-        <translation type="unfinished">Plik rozdzielany przecinkami</translation>
-    </message>
     <message>
         <source>Confirmed</source>
         <translation type="unfinished">Potwierdzone</translation>
     </message>
-    <message>
-        <source>Watch-only</source>
-        <translation type="unfinished">Tylko do obserwacji</translation>
-    </message>
     <message>
         <source>Date</source>
         <translation type="unfinished">Data</translation>
@@ -3937,7 +3932,7 @@ Zwróć uwagę, że poprawnie zweryfikowana wiadomość potwierdza to, że nadaw
     </message>
     <message>
         <source>Exporting Successful</source>
-        <translation type="unfinished">Eksport ukończone pomyślnie</translation>
+        <translation type="unfinished">Eksport powiódł się</translation>
     </message>
     <message>
         <source>The transaction history was successfully saved to %1.</source>
@@ -3958,8 +3953,8 @@ Zwróć uwagę, że poprawnie zweryfikowana wiadomość potwierdza to, że nadaw
         <source>No wallet has been loaded.
 Go to File &gt; Open Wallet to load a wallet.
 - OR -</source>
-        <translation type="unfinished">Portfel nie został wybrany.
-Przejdź do Plik &gt; Otwórz Portfel aby wgrać portfel.
+        <translation type="unfinished">Nie załadowano żadnego portfela.
+Przejdź do Plik &gt; Otwórz Portfel, aby wczytać portfel.
 - LUB -</translation>
     </message>
     <message>
@@ -3972,7 +3967,7 @@ Przejdź do Plik &gt; Otwórz Portfel aby wgrać portfel.
     </message>
     <message>
         <source>Unable to decode PSBT from clipboard (invalid base64)</source>
-        <translation type="unfinished">Nie udało się załadować częściowo podpisanej transakcji (nieprawidłowy base64)</translation>
+        <translation type="unfinished">Nie udało się zdekodować PSBT ze schowka (nieprawidłowy base64)</translation>
     </message>
     <message>
         <source>Load Transaction Data</source>
@@ -3984,7 +3979,7 @@ Przejdź do Plik &gt; Otwórz Portfel aby wgrać portfel.
     </message>
     <message>
         <source>PSBT file must be smaller than 100 MiB</source>
-        <translation type="unfinished">Plik PSBT musi być mniejszy niż 100MiB</translation>
+        <translation type="unfinished">Plik PSBT musi być mniejszy niż 100 MiB</translation>
     </message>
     <message>
         <source>Unable to decode PSBT</source>
@@ -3999,16 +3994,16 @@ Przejdź do Plik &gt; Otwórz Portfel aby wgrać portfel.
     </message>
     <message>
         <source>Fee bump error</source>
-        <translation type="unfinished">Błąd podczas zwiększania opłaty</translation>
+        <translation type="unfinished">Błąd zwiększenia prowizji</translation>
     </message>
     <message>
         <source>Increasing transaction fee failed</source>
-        <translation type="unfinished">Zwiększenie opłaty nie powiodło się</translation>
+        <translation type="unfinished">Nieudane zwiększenie prowizji</translation>
     </message>
     <message>
         <source>Do you want to increase the fee?</source>
         <extracomment>Asks a user if they would like to manually increase the fee of a transaction that has already been created.</extracomment>
-        <translation type="unfinished">Czy chcesz zwiększyć opłatę?</translation>
+        <translation type="unfinished">Czy chcesz zwiększyć prowizję?</translation>
     </message>
     <message>
         <source>Current fee:</source>
@@ -4016,7 +4011,7 @@ Przejdź do Plik &gt; Otwórz Portfel aby wgrać portfel.
     </message>
     <message>
         <source>Increase:</source>
-        <translation type="unfinished">Zwiększenie:</translation>
+        <translation type="unfinished">Zwiększ:</translation>
     </message>
     <message>
         <source>New fee:</source>
@@ -4024,7 +4019,7 @@ Przejdź do Plik &gt; Otwórz Portfel aby wgrać portfel.
     </message>
     <message>
         <source>Warning: This may pay the additional fee by reducing change outputs or adding inputs, when necessary. It may add a new change output if one does not already exist. These changes may potentially leak privacy.</source>
-        <translation type="unfinished">Ostrzeżenie: Może to spowodować opłacenie dodatkowej opłaty poprzez zmniejszenie wyjść reszty lub dodanie wejść, jeśli będzie to konieczne. Może również dodać nowe wyjście reszty, jeśli jeszcze nie istnieje. Zmiany te mogą potencjalnie naruszyć prywatność.</translation>
+        <translation type="unfinished">Ostrzeżenie: Może to spowodować uiszczenie dodatkowej opłaty poprzez zmniejszenie wyjść reszty lub dodanie wejść, jeśli jest to konieczne. Może dodać nowe wyjście reszty, jeśli jeszcze nie istnieje. Zmiany te mogą potencjalnie naruszyć prywatność.</translation>
     </message>
     <message>
         <source>Confirm fee bump</source>
@@ -4076,7 +4071,7 @@ Przejdź do Plik &gt; Otwórz Portfel aby wgrać portfel.
     <message>
         <source>Wallet Data</source>
         <extracomment>Name of the wallet data file format.</extracomment>
-        <translation type="unfinished">Informacje portfela</translation>
+        <translation type="unfinished">Dane portfela</translation>
     </message>
     <message>
         <source>Backup Failed</source>
@@ -4105,25 +4100,13 @@ Przejdź do Plik &gt; Otwórz Portfel aby wgrać portfel.
         <source>The %s developers</source>
         <translation type="unfinished">Deweloperzy %s</translation>
     </message>
-    <message>
-        <source>%s corrupt. Try using the wallet tool bitcoin-wallet to salvage or restoring a backup.</source>
-        <translation type="unfinished">%s jest uszkodzony. Spróbuj użyć narzędzia bitcoin-portfel, aby uratować portfel lub przywrócić kopię zapasową.</translation>
-    </message>
     <message>
         <source>%s failed to validate the -assumeutxo snapshot state. This indicates a hardware problem, or a bug in the software, or a bad software modification that allowed an invalid snapshot to be loaded. As a result of this, the node will shut down and stop using any state that was built on the snapshot, resetting the chain height from %d to %d. On the next restart, the node will resume syncing from %d without using any snapshot data. Please report this incident to %s, including how you obtained the snapshot. The invalid snapshot chainstate will be left on disk in case it is helpful in diagnosing the issue that caused this error.</source>
         <translation type="unfinished">%s nie zdołał zwalidować stanu migawki -assumeutxo. Wskazuje to na problem ze sprzętem, błąd w oprogramowaniu lub nieprawidłową modyfikacją programu, która zezwoliła na załadowanie nieprawidłowej migawki. Z tego powodu węzeł zostanie zamknięty i przestanie używać danych zbudowanych na bazie migawki, resetując wysokość łańcucha z %d do %d. Po ponownym uruchomieniu, węzeł wznowi synchronizację od %d, bez wykorzystania jakichkolwiek danych z migawki. Prosimy zgłosić ten incydent do %s, wliczając w to jak wszedłeś w posiadanie tej migawki. Nieprawidłowy stan łańcucha w oparciu o tą migawkę zostanie zachowany na dysku w przypadku, gdyby okazał się przydatny w diagnostyce problemu, który spowodował ten błąd.</translation>
     </message>
     <message>
         <source>%s request to listen on port %u. This port is considered "bad" and thus it is unlikely that any peer will connect to it. See doc/p2p-bad-ports.md for details and a full list.</source>
-        <translation type="unfinished">%sżąda nasłuchiwania na porcie %u. Ten port jest uznany za "zły" i nie jest zbyt prawdopodobne, aby jakikolwiek węzeł połączył się do niego. Zobacz doc/p2p-bad-ports.md, aby dowiedzieć się więcej i zobaczyć pełną listę.</translation>
-    </message>
-    <message>
-        <source>Cannot downgrade wallet from version %i to version %i. Wallet version unchanged.</source>
-        <translation type="unfinished">Nie można zmienić wersji portfela z wersji %i na wersję %i. Wersja portfela pozostaje niezmieniona.</translation>
-    </message>
-    <message>
-        <source>Cannot upgrade a non HD split wallet from version %i to version %i without upgrading to support pre-split keypool. Please use version %i or no version specified.</source>
-        <translation type="unfinished">Nie można zaktualizować portfela dzielonego innego niż HD z wersji %i do wersji %i bez aktualizacji w celu obsługi wstępnie podzielonej puli kluczy. Użyj wersji %i lub nie określono wersji.</translation>
+        <translation type="unfinished">%s żąda nasłuchiwania na porcie %u. Ten port jest uznany za "zły" i dlatego jest mało prawdopodobne, że jakikolwiek węzeł połączy się z nim. Zobacz doc/p2p-bad-ports.md, aby uzyskać szczegóły i pełną listę.</translation>
     </message>
     <message>
         <source>Disk space for %s may not accommodate the block files. Approximately %u GB of data will be stored in this directory.</source>
@@ -4135,7 +4118,7 @@ Przejdź do Plik &gt; Otwórz Portfel aby wgrać portfel.
     </message>
     <message>
         <source>Error loading wallet. Wallet requires blocks to be downloaded, and software does not currently support loading wallets while blocks are being downloaded out of order when using assumeutxo snapshots. Wallet should be able to load successfully after node sync reaches height %s</source>
-        <translation type="unfinished">Błąd ładowania portfela. Portfel wymaga ściągnięcia bloków, a oprogramowanie obecnie nie wspiera ładowania portfeli podczas ściągania bloków poza kolejnością gdy używa się zrzutów assumeutxo. Portfel powinien załadować się poprawnie po osiągnięciu przez węzeł synchronizacji%s</translation>
+        <translation type="unfinished">Błąd podczas ładowania portfela. Portfel wymaga pobranych bloków, a oprogramowanie obecnie nie obsługuje ładowania portfeli podczas pobierania bloków w nieprawidłowej kolejności przy użyciu snapshotów assumeutxo. Portfel powinien załadować się poprawnie po osiągnięciu przez węzeł wysokości bloku %s</translation>
     </message>
     <message>
         <source>Error reading %s! Transaction data may be missing or incorrect. Rescanning wallet.</source>
@@ -4147,7 +4130,7 @@ Przejdź do Plik &gt; Otwórz Portfel aby wgrać portfel.
     </message>
     <message>
         <source>Error: Dumpfile format record is incorrect. Got "%s", expected "format".</source>
-        <translation type="unfinished">Błąd: rekord formatu pliku zrzutu jest nieprawidłowy. Otrzymano "%s", oczekiwany "format".</translation>
+        <translation type="unfinished">Błąd: rekord formatu pliku zrzutu jest nieprawidłowy. Otrzymano „1%s”, oczekiwany „format”.</translation>
     </message>
     <message>
         <source>Error: Dumpfile identifier record is incorrect. Got "%s", expected "%s".</source>
@@ -4155,19 +4138,15 @@ Przejdź do Plik &gt; Otwórz Portfel aby wgrać portfel.
     </message>
     <message>
         <source>Error: Dumpfile version is not supported. This version of bitcoin-wallet only supports version 1 dumpfiles. Got dumpfile with version %s</source>
-        <translation type="unfinished">Błąd: wersja pliku zrzutu nie jest obsługiwana. Ta wersja bitcoin-wallet obsługuje tylko pliki zrzutów w wersji 1. Mam plik zrzutu w wersji %s</translation>
-    </message>
-    <message>
-        <source>Error: Legacy wallets only support the "legacy", "p2sh-segwit", and "bech32" address types</source>
-        <translation type="unfinished">Błąd: starsze portfele obsługują tylko typy adresów "legacy", "p2sh-segwit" i "bech32"</translation>
+        <translation type="unfinished">Błąd: wersja pliku zrzutu nie jest obsługiwana. Ta wersja bitcoin-wallet obsługuje tylko pliki zrzutu w wersji 1. Otrzymano plik zrzutu w wersji %s</translation>
     </message>
     <message>
         <source>Error: Unable to produce descriptors for this legacy wallet. Make sure to provide the wallet's passphrase if it is encrypted.</source>
-        <translation type="unfinished">Błąd: Nie można wygenerować deskryptorów dla tego starego portfela. Upewnij się najpierw, że portfel jest zaszyfrowany.</translation>
+        <translation type="unfinished">Błąd: Nie można wygenerować deskryptorów dla tego portfela typu legacy. Upewnij się, że podano hasło portfela, jeśli jest on zaszyfrowany.</translation>
     </message>
     <message>
         <source>File %s already exists. If you are sure this is what you want, move it out of the way first.</source>
-        <translation type="unfinished">Plik %s już istnieje. Jeśli jesteś pewien, że tego chcesz, najpierw go przenieś.</translation>
+        <translation type="unfinished">Plik %s już istnieje. Jeśli jesteś pewien, że tego chcesz, najpierw usuń to z drogi.</translation>
     </message>
     <message>
         <source>Invalid or corrupt peers.dat (%s). If you believe this is a bug, please report it to %s. As a workaround, you can move the file (%s) out of the way (rename, move, or delete) to have a new one created on the next start.</source>
@@ -4177,29 +4156,17 @@ Przejdź do Plik &gt; Otwórz Portfel aby wgrać portfel.
         <source>Invalid value detected for '-wallet' or '-nowallet'. '-wallet' requires a string value, while '-nowallet' accepts only '1' to disable all wallets</source>
         <translation type="unfinished">Nieprawidłowa wartość wykryta dla '-wallet' lub '-nowallet'. '-wallet' wymaga ciągu znaków, podczas gdy '-nowallet' akceptuje jedynie '1' dla wyłączenia wszystkich portfeli</translation>
     </message>
-    <message>
-        <source>More than one onion bind address is provided. Using %s for the automatically created Tor onion service.</source>
-        <translation type="unfinished">Podano więcej niż jeden adres onion. Używam %s dla automatycznie utworzonej usługi Tor onion.</translation>
-    </message>
     <message>
         <source>No dump file provided. To use createfromdump, -dumpfile=&lt;filename&gt; must be provided.</source>
-        <translation type="unfinished">Nie podano pliku zrzutu. Aby użyć funkcji -createfromdump, należy podać -dumpfile=&lt;filename&gt;</translation>
+        <translation type="unfinished">Nie dostarczono pliku zrzutu. Aby użyć createfromdump, należy podać -dumpfile=&lt;filename&gt;.</translation>
     </message>
     <message>
         <source>No dump file provided. To use dump, -dumpfile=&lt;filename&gt; must be provided.</source>
-        <translation type="unfinished">Nie podano pliku zrzutu. Aby go użyć, należy podać -dumpfile=&lt;filename&gt;</translation>
-    </message>
-    <message>
-        <source>No wallet file format provided. To use createfromdump, -format=&lt;format&gt; must be provided.</source>
-        <translation type="unfinished">Nie podano formatu pliku portfela. Aby użyć funkcji -createfromdump, należy podać -format=&lt;format&gt;</translation>
-    </message>
-    <message>
-        <source>Option '-upnp' is set but UPnP support was dropped in version 29.0. Consider using '-natpmp' instead.</source>
-        <translation type="unfinished">Opcja '-upnp' jest włączona, lecz wsparcie UPnP zostało porzucone w wersji 29.0. Rozpatrz w zamian użycie '-natpmp'.</translation>
+        <translation type="unfinished">Nie dostarczono pliku zrzutu. Aby użyć zrzutu, należy podać -dumpfile=&lt;filename&gt;.</translation>
     </message>
     <message>
         <source>Please contribute if you find %s useful. Visit %s for further information about the software.</source>
-        <translation type="unfinished">Wspomóż proszę, jeśli uznasz %s za użyteczne. Odwiedź  %s, aby uzyskać więcej informacji o tym oprogramowaniu.</translation>
+        <translation type="unfinished">Wspomóż proszę, jeśli uznasz %s za użyteczne. Odwiedź %s, aby uzyskać więcej informacji o tym oprogramowaniu.</translation>
     </message>
     <message>
         <source>Prune configured below the minimum of %d MiB.  Please use a higher number.</source>
@@ -4209,10 +4176,6 @@ Przejdź do Plik &gt; Otwórz Portfel aby wgrać portfel.
         <source>Prune mode is incompatible with -reindex-chainstate. Use full -reindex instead.</source>
         <translation type="unfinished">Tryb przycięty jest niekompatybilny z -reindex-chainstate. Użyj pełnego -reindex.</translation>
     </message>
-    <message>
-        <source>Prune: last wallet synchronisation goes beyond pruned data. You need to -reindex (download the whole blockchain again in case of pruned node)</source>
-        <translation type="unfinished">Prune: ostatnia synchronizacja portfela jest za danymi. Muszisz -reindexować (pobrać cały ciąg bloków ponownie w przypadku przyciętego węzła)</translation>
-    </message>
     <message>
         <source>Rename of '%s' -&gt; '%s' failed. You should resolve this by manually moving or deleting the invalid snapshot directory %s, otherwise you will encounter the same error again on the next startup.</source>
         <translation type="unfinished">Zmiana nazwy '%s' -&gt; '%s' nie powiodła się. Spróbuj to rozwiązać ręcznie przenosząc lub usuwając nieprawidłowy katalog zrzutu %s, w przeciwnym wypadku zobaczysz ten sam błąd przy kolejnym włączeniu.</translation>
@@ -4229,10 +4192,6 @@ Przejdź do Plik &gt; Otwórz Portfel aby wgrać portfel.
         <source>The transaction amount is too small to send after the fee has been deducted</source>
         <translation type="unfinished">Zbyt niska kwota transakcji do wysłania po odjęciu opłaty</translation>
     </message>
-    <message>
-        <source>This error could occur if this wallet was not shutdown cleanly and was last loaded using a build with a newer version of Berkeley DB. If so, please use the software that last loaded this wallet</source>
-        <translation type="unfinished">Ten błąd mógł wystąpić jeżeli portfel nie został poprawnie zamknięty oraz był ostatnio załadowany przy użyciu buildu z nowszą wersją Berkley DB. Jeżeli tak, proszę użyć oprogramowania które ostatnio załadowało ten portfel</translation>
-    </message>
     <message>
         <source>This is a pre-release test build - use at your own risk - do not use for mining or merchant applications</source>
         <translation type="unfinished">To jest wersja testowa - używać na własne ryzyko - nie używać do kopania albo zastosowań komercyjnych.</translation>
@@ -4251,16 +4210,12 @@ Przejdź do Plik &gt; Otwórz Portfel aby wgrać portfel.
     </message>
     <message>
         <source>Total length of network version string (%i) exceeds maximum length (%i). Reduce the number or size of uacomments.</source>
-        <translation type="unfinished">Całkowita długość łańcucha wersji (%i) przekracza maksymalną dopuszczalną długość (%i). Zmniejsz ilość lub rozmiar parametru uacomment.</translation>
+        <translation type="unfinished">Całkowita długość ciągu wersji sieci (%i) przekracza maksymalną długość (%i). Zmniejsz liczbę lub rozmiar uacomments.</translation>
     </message>
     <message>
         <source>Unable to replay blocks. You will need to rebuild the database using -reindex-chainstate.</source>
         <translation type="unfinished">Nie można przetworzyć bloków. Konieczne będzie przebudowanie bazy danych za pomocą -reindex-chainstate.</translation>
     </message>
-    <message>
-        <source>Unknown wallet file format "%s" provided. Please provide one of "bdb" or "sqlite".</source>
-        <translation type="unfinished">Podano nieznany typ pliku portfela "%s". Proszę podać jeden z "bdb" lub "sqlite".</translation>
-    </message>
     <message>
         <source>Unsupported category-specific logging level %1$s=%2$s. Expected %1$s=&lt;category&gt;:&lt;loglevel&gt;. Valid categories: %3$s. Valid loglevels: %4$s.</source>
         <translation type="unfinished">Nieobsługiwany poziom logowania specyficzny dla kategorii %1$s=%2$s. Oczekiwano %1$s=&lt;category&gt;:&lt;loglevel&gt;. Poprawne kategorie %3$s. Poprawne poziomy logowania: %4$s.</translation>
@@ -4269,25 +4224,9 @@ Przejdź do Plik &gt; Otwórz Portfel aby wgrać portfel.
         <source>Unsupported chainstate database format found. Please restart with -reindex-chainstate. This will rebuild the chainstate database.</source>
         <translation type="unfinished">Znaleziono nieobsługiwany format bazy danych chainstate. Proszę uruchomić ponownie z opcją -reindex-chainstate. To odbuduje bazę danych chainstate.</translation>
     </message>
-    <message>
-        <source>Wallet created successfully. The legacy wallet type is being deprecated and support for creating and opening legacy wallets will be removed in the future.</source>
-        <translation type="unfinished">Portfel stworzony pomyślnie. Starszy typ portfela jest przestarzały, a obsługa tworzenia i otwierania starszych portfeli zostanie usunięta w przyszłości.</translation>
-    </message>
-    <message>
-        <source>Wallet loaded successfully. The legacy wallet type is being deprecated and support for creating and opening legacy wallets will be removed in the future. Legacy wallets can be migrated to a descriptor wallet with migratewallet.</source>
-        <translation type="unfinished">Portfel został załadowany pomyślnie. Starszy typ portfela jest przestarzały, a obsługa tworzenia i otwierania starszych portfeli zostanie usunięta w przyszłości. Starsze portfele można migrować do portfela deskryptora za pomocą migratewallet.</translation>
-    </message>
-    <message>
-        <source>Warning: Dumpfile wallet format "%s" does not match command line specified format "%s".</source>
-        <translation type="unfinished">Ostrzeżenie: Format portfela Dumpfile "%s" nie pasuje do formatu określonego w wierszu poleceń "%s".</translation>
-    </message>
     <message>
         <source>Warning: Private keys detected in wallet {%s} with disabled private keys</source>
-        <translation type="unfinished">Uwaga: Wykryto klucze prywatne w portfelu [%s] który ma wyłączone klucze prywatne</translation>
-    </message>
-    <message>
-        <source>Warning: We do not appear to fully agree with our peers! You may need to upgrade, or other nodes may need to upgrade.</source>
-        <translation type="unfinished">Uwaga: Wygląda na to, że nie ma pełnej zgodności z naszymi węzłami! Możliwe, że potrzebujesz aktualizacji bądź inne węzły jej potrzebują</translation>
+        <translation type="unfinished">Ostrzeżenie: Wykryto klucze prywatne w portfelu {%s} z wyłączonymi kluczami prywatnymi</translation>
     </message>
     <message>
         <source>Witness data for blocks after height %d requires validation. Please restart with -reindex.</source>
@@ -4323,7 +4262,7 @@ Przejdź do Plik &gt; Otwórz Portfel aby wgrać portfel.
     </message>
     <message>
         <source>%s is set very high! Fees this large could be paid on a single transaction.</source>
-        <translation type="unfinished">%sto bardzo dużo!  Tak duże opłaty można uiścić w ramach jednej transakcji.</translation>
+        <translation type="unfinished">%s jest ustawione bardzo wysoko! Tak duże opłaty można uiścić w ramach jednej transakcji.</translation>
     </message>
     <message>
         <source>Cannot provide specific connections and have addrman find outgoing connections at the same time.</source>
@@ -4347,11 +4286,7 @@ Przejdź do Plik &gt; Otwórz Portfel aby wgrać portfel.
     </message>
     <message>
         <source>Error: Transaction %s in wallet cannot be identified to belong to migrated wallets</source>
-        <translation type="unfinished">Błąd: Transakcja %s w portfelu nie może być zidentyfikowana jako należąca do zmigrowanych portfeli</translation>
-    </message>
-    <message>
-        <source>Failed to calculate bump fees, because unconfirmed UTXOs depend on enormous cluster of unconfirmed transactions.</source>
-        <translation type="unfinished">Nie udało się obliczyć zwiększonej opłaty, ponieważ niepotwierdzone UTXO zależą od ogromnego skupiska niepotwierdzonych transakcji.</translation>
+        <translation type="unfinished">Błąd: Transakcja %s w portfelu nie może być zidentyfikowana jako należąca do przemigrowanych portfeli</translation>
     </message>
     <message>
         <source>Failed to remove snapshot chainstate dir (%s). Manually remove it before restarting.
@@ -4373,7 +4308,7 @@ Przejdź do Plik &gt; Otwórz Portfel aby wgrać portfel.
     </message>
     <message>
         <source>Flushing undo file to disk failed. This is likely the result of an I/O error.</source>
-        <translation type="unfinished">Zrzut pliku odtwarzającego na dysk się nie powiódł. To najpewniej wynik błędu wejścia/wyjścia.</translation>
+        <translation type="unfinished">Opróżnienie buforów pliku cofania na dysk nie powiodło się. Prawdopodobnie jest to wynik błędu operacji wejścia/wyjścia (I/O).</translation>
     </message>
     <message>
         <source>Incompatible options: -dnsseed=1 was explicitly specified, but -onlynet forbids connections to IPv4/IPv6</source>
@@ -4391,6 +4326,10 @@ Przejdź do Plik &gt; Otwórz Portfel aby wgrać portfel.
         <source>Maximum transaction weight is too low, can not accommodate change output</source>
         <translation type="unfinished">Maksymalna waga transakcji jest zbyt niska, nie wystarczy na wyjście reszty</translation>
     </message>
+    <message>
+        <source>Option '-checkpoints' is set but checkpoints were removed. This option has no effect.</source>
+        <translation type="unfinished">Opcja "-checkpoints" jest zaznaczona, ale punkty zaczepienia zostały usunięte. Ta opcja nie ma efektu.</translation>
+    </message>
     <message>
         <source>Outbound connections restricted to CJDNS (-onlynet=cjdns) but -cjdnsreachable is not provided</source>
         <translation type="unfinished">Połączenia wychodzące ograniczone do CJDNS (-onlynet=cjdns), ale nie podano -cjdnsreachable</translation>
@@ -4401,12 +4340,16 @@ Przejdź do Plik &gt; Otwórz Portfel aby wgrać portfel.
     </message>
     <message>
         <source>Outbound connections restricted to Tor (-onlynet=onion) but the proxy for reaching the Tor network is not provided: none of -proxy, -onion or -listenonion is given</source>
-        <translation type="unfinished">Połączenia wychodzące ograniczone do Tor (-onlynet=onion), lecz nie zostało zapewnione proxy do łączenia z siecią Tor: nie podano ani -proxy ani -onion ani -listeonion</translation>
+        <translation type="unfinished">Połączenia wychodzące ograniczone do Tor (-onlynet=onion), lecz nie zostało zapewnione proxy do łączenia z siecią Tor: nie podano ani -proxy ani -onion ani -listenonion</translation>
     </message>
     <message>
         <source>Outbound connections restricted to i2p (-onlynet=i2p) but -i2psam is not provided</source>
         <translation type="unfinished">Połączenia wychodzące ograniczone do i2p (-onlynet=i2p), lecz nie podano -i2psam</translation>
     </message>
+    <message>
+        <source>Prune: last wallet synchronisation goes beyond pruned data. You need to -reindex (download the whole blockchain again in case of a pruned node)</source>
+        <translation type="unfinished">Tryb przycinania: ostatnia synchronizacja portfela wykracza poza przycięte dane. Musisz użyć opcji -reindex (pobierz ponownie cały łańcuch bloków w przypadku przyciętego węzła).</translation>
+    </message>
     <message>
         <source>Rename of '%s' -&gt; '%s' failed. Cannot clean up the background chainstate leveldb directory.</source>
         <translation type="unfinished">Zmiana nazwy z '%s' na '%s' nie powiodła się. Nie można wyczyścić katalogu chainstate leveldb. </translation>
@@ -4436,8 +4379,8 @@ Przejdź do Plik &gt; Otwórz Portfel aby wgrać portfel.
         <translation type="unfinished">Suma wstępnie wybranych monet nie pokrywa kwoty transakcji. Zezwól na automatyczne wybranie wejść lub ręcznie dołącz więcej monet</translation>
     </message>
     <message>
-        <source>Transaction requires one destination of non-0 value, a non-0 feerate, or a pre-selected input</source>
-        <translation type="unfinished">Transakcja wymaga jednego adresu docelowego z niezerową wartością, niezerowej stawki opłaty lub wcześniej wybranego wejścia.</translation>
+        <source>UTXO snapshot failed to validate. Restart to resume normal initial block download, or try loading a different snapshot.</source>
+        <translation type="unfinished">Nie udało się zweryfikować migawki UTXO. Uruchom ponownie, aby wznowić normalne początkowe pobieranie bloków, lub spróbuj załadować inną migawkę.</translation>
     </message>
     <message>
         <source>Unconfirmed UTXOs are available, but spending them creates a chain of transactions that will be rejected by the mempool</source>
@@ -4448,8 +4391,7 @@ Przejdź do Plik &gt; Otwórz Portfel aby wgrać portfel.
 
 The wallet might have been tampered with or created with malicious intent.
 </source>
-        <translation type="unfinished">W portfelu typu descriptor znaleziono nieoczekiwany wpis typu legacy.
-Ładowanie portfela %s
+        <translation type="unfinished">W portfelu typu descriptor znaleziono nieoczekiwany wpis typu legacy. Ładowanie portfela %s
 
 Portfel mógł zostać naruszony lub utworzony w złośliwym celu.
 </translation>
@@ -4468,7 +4410,11 @@ Nie można wyczyścić nieudanej migracji</translation>
         <source>
 Unable to restore backup of wallet.</source>
         <translation type="unfinished">
-Nie można przywrócić kopii zapasowej portfela.</translation>
+Nie można przywrócić kopii zapasowej portfela</translation>
+    </message>
+    <message>
+        <source>default wallet</source>
+        <translation type="unfinished">domyślny portfel</translation>
     </message>
     <message>
         <source>whitebind may only be used for incoming connections ("out" was passed)</source>
@@ -4486,6 +4432,14 @@ Nie można przywrócić kopii zapasowej portfela.</translation>
         <source>Block verification was interrupted</source>
         <translation type="unfinished">Weryfikacja bloków została przerwana</translation>
     </message>
+    <message>
+        <source>Can't spend unconfirmed version %d pre-selected input with a version 3 tx</source>
+        <translation type="unfinished">Nie można wydać niepotwierdzonego, wstępnie wybranego wejścia w wersji %d za pomocą transakcji w wersji 3</translation>
+    </message>
+    <message>
+        <source>Can't spend unconfirmed version 3 pre-selected input with a version %d tx</source>
+        <translation type="unfinished">Nie można wydać niepotwierdzonego, wstępnie wybranego wejścia w wersji 3 za pomocą transakcji w wersji %d</translation>
+    </message>
     <message>
         <source>Cannot write to directory '%s'; check permissions.</source>
         <translation type="unfinished">Nie można zapisać w lokalizacji  '%s'; sprawdź uprawnienia.</translation>
@@ -4510,10 +4464,22 @@ Nie można przywrócić kopii zapasowej portfela.</translation>
         <source>Could not find asmap file %s</source>
         <translation type="unfinished">Nie można odnaleźć pliku asmap %s</translation>
     </message>
+    <message>
+        <source>Could not generate scriptPubKeys (cache is empty)</source>
+        <translation type="unfinished">Nie można wygenerować scriptPubKeys (pamięć podręczna jest pusta)</translation>
+    </message>
     <message>
         <source>Could not parse asmap file %s</source>
         <translation type="unfinished">Nie można zainterpretować pliku asmap %s</translation>
     </message>
+    <message>
+        <source>Could not read embedded asmap data</source>
+        <translation type="unfinished">Nie można odczytać osadzonych danych asmap</translation>
+    </message>
+    <message>
+        <source>Could not top up scriptPubKeys</source>
+        <translation type="unfinished">Nie można uzupełnić scriptPubKeys</translation>
+    </message>
     <message>
         <source>Disk space is too low!</source>
         <translation type="unfinished">Zbyt mało miejsca na dysku!</translation>
@@ -4531,25 +4497,17 @@ Nie można przywrócić kopii zapasowej portfela.</translation>
         <translation type="unfinished">Błąd kontroli poprawności kryptografii krzywych eliptycznych. %s wyłącza się.</translation>
     </message>
     <message>
-        <source>Error creating %s</source>
-        <translation type="unfinished">Błąd podczas tworzenia %s</translation>
+        <source>Embedded asmap data not available</source>
+        <translation type="unfinished">Osadzone dane asmap są niedostępne</translation>
     </message>
     <message>
         <source>Error initializing block database</source>
         <translation type="unfinished">Błąd inicjowania bazy danych bloków</translation>
     </message>
-    <message>
-        <source>Error initializing wallet database environment %s!</source>
-        <translation type="unfinished">Błąd inicjowania środowiska bazy portfela %s!</translation>
-    </message>
     <message>
         <source>Error loading %s</source>
         <translation type="unfinished">Błąd ładowania %s</translation>
     </message>
-    <message>
-        <source>Error loading %s: Private keys can only be disabled during creation</source>
-        <translation type="unfinished">Błąd ładowania %s: Klucze prywatne mogą być wyłączone tylko podczas tworzenia</translation>
-    </message>
     <message>
         <source>Error loading %s: Wallet corrupted</source>
         <translation type="unfinished">Błąd ładowania %s: Uszkodzony portfel</translation>
@@ -4608,11 +4566,11 @@ Nie można przywrócić kopii zapasowej portfela.</translation>
     </message>
     <message>
         <source>Error: Got key that was not hex: %s</source>
-        <translation type="unfinished">Błąd: Otrzymano klucz, który nie jest szestnastkowy %s</translation>
+        <translation type="unfinished">Błąd: Otrzymano klucz, który nie jest szesnastkowy: %s</translation>
     </message>
     <message>
         <source>Error: Got value that was not hex: %s</source>
-        <translation type="unfinished">Błąd: Otrzymano wartość, która nie jest szestnastkowa %s</translation>
+        <translation type="unfinished">Błąd: Otrzymano wartość, która nie jest szesnastkowa: %s</translation>
     </message>
     <message>
         <source>Error: Keypool ran out, please call keypoolrefill first</source>
@@ -4626,6 +4584,14 @@ Nie można przywrócić kopii zapasowej portfela.</translation>
         <source>Error: No %s addresses available.</source>
         <translation type="unfinished">Błąd: Brak dostępnych adresów %s</translation>
     </message>
+    <message>
+        <source>Error: Not all address book records were migrated</source>
+        <translation type="unfinished">Błąd: Nie wszystkie wpisy z książki adresowej zostały przeniesione</translation>
+    </message>
+    <message>
+        <source>Error: Not all transaction records were migrated</source>
+        <translation type="unfinished">Błąd: Nie wszystkie wpisy transakcji zostały przeniesione</translation>
+    </message>
     <message>
         <source>Error: This wallet already uses SQLite</source>
         <translation type="unfinished">Błąd: Ten portfel już używa SQLite</translation>
@@ -4676,11 +4642,19 @@ Nie można przywrócić kopii zapasowej portfela.</translation>
     </message>
     <message>
         <source>Error: database transaction cannot be executed for wallet %s</source>
-        <translation type="unfinished">Błąd: transakcja bazy danych nie może zostać wykonana dla portfela%s</translation>
+        <translation type="unfinished">Błąd: transakcja bazy danych nie może zostać wykonana dla portfela %s</translation>
+    </message>
+    <message>
+        <source>Failed to acquire rescan reserver during wallet initialization</source>
+        <translation type="unfinished">Nie udało się uzyskać rezerwacji ponownego skanowania podczas inicjalizacji portfela.</translation>
     </message>
     <message>
-        <source>Failed to connect best block (%s).</source>
-        <translation type="unfinished">Nie udało się połączyć najlepszego bloku (%s).</translation>
+        <source>Failed to close block undo file.</source>
+        <translation type="unfinished">Nie udało się zamknąć pliku cofania bloków.</translation>
+    </message>
+    <message>
+        <source>Failed to close file when writing block.</source>
+        <translation type="unfinished">Nie udało się zamknąć pliku podczas zapisu bloku.</translation>
     </message>
     <message>
         <source>Failed to disconnect block.</source>
@@ -4696,11 +4670,7 @@ Nie można przywrócić kopii zapasowej portfela.</translation>
     </message>
     <message>
         <source>Failed to rescan the wallet during initialization</source>
-        <translation type="unfinished">Nie udało się ponownie przeskanować portfela podczas inicjalizacji.</translation>
-    </message>
-    <message>
-        <source>Failed to start indexes, shutting down..</source>
-        <translation type="unfinished">Nie udało się uruchomić indeksów, zamykanie…</translation>
+        <translation type="unfinished">Nie udało się ponownie przeskanować portfela podczas inicjalizacji</translation>
     </message>
     <message>
         <source>Failed to verify database</source>
@@ -4710,17 +4680,9 @@ Nie można przywrócić kopii zapasowej portfela.</translation>
         <source>Failed to write block.</source>
         <translation type="unfinished">Nie udało się zapisać bloku.</translation>
     </message>
-    <message>
-        <source>Failed to write to block index database.</source>
-        <translation type="unfinished">Nie udało się zapisać do bazy indeksu bloków.</translation>
-    </message>
-    <message>
-        <source>Failed to write to coin database.</source>
-        <translation type="unfinished">Nie udało się zapisać do bazy monet.</translation>
-    </message>
     <message>
         <source>Failed to write undo data.</source>
-        <translation type="unfinished">Nie udało się zapisać danych odtwarzających.</translation>
+        <translation type="unfinished">Nie udało się zapisać danych cofających.</translation>
     </message>
     <message>
         <source>Failure removing transaction: %s</source>
@@ -4734,10 +4696,6 @@ Nie można przywrócić kopii zapasowej portfela.</translation>
         <source>Ignoring duplicate -wallet %s.</source>
         <translation type="unfinished">Ignorowanie zduplikowanej opcji -wallet %s</translation>
     </message>
-    <message>
-        <source>Importing…</source>
-        <translation type="unfinished">Importowanie…</translation>
-    </message>
     <message>
         <source>Incorrect or no genesis block found. Wrong datadir for network?</source>
         <translation type="unfinished">Niepoprawny lub brakujący blok genesis. Niewłaściwy katalog danych dla sieci?</translation>
@@ -4774,14 +4732,26 @@ Nie można przywrócić kopii zapasowej portfela.</translation>
         <source>Invalid P2P permission: '%s'</source>
         <translation type="unfinished">Nieprawidłowe uprawnienia P2P: '%s'</translation>
     </message>
-    <message>
-        <source>Invalid amount for %s=&lt;amount&gt;: '%s' (must be at least %s)</source>
-        <translation type="unfinished">Nieprawidłowa kwota dla %s=&lt;amount&gt;: '%s' (musi być co najmniej %s)</translation>
-    </message>
     <message>
         <source>Invalid amount for %s=&lt;amount&gt;: '%s'</source>
         <translation type="unfinished">Nieprawidłowa kwota dla %s=&lt;amount&gt;: '%s'</translation>
     </message>
+    <message>
+        <source>A %zu MiB dbcache may be too large for a system memory of only %zu MiB.</source>
+        <translation type="unfinished">dbcache o rozmiarze %zu MiB może być zbyt duży dla systemu z pamięcią wynoszącą tylko %zu MiB.</translation>
+    </message>
+    <message>
+        <source>Creating wallet…</source>
+        <translation type="unfinished">Tworzenie portfela…</translation>
+    </message>
+    <message>
+        <source>Duplicate binding configuration for address %s. Please check your -bind, -bind=...=onion and -whitebind settings.</source>
+        <translation type="unfinished">Zduplikowana konfiguracja powiązania dla adresu %s. Sprawdź ustawienia -bind, -bind=...=onion oraz -whitebind.</translation>
+    </message>
+    <message>
+        <source>Error creating %s: Could not write version metadata.</source>
+        <translation type="unfinished">Błąd tworzenia %s: Nie można zapisać metadanych wersji.</translation>
+    </message>
     <message>
         <source>Invalid amount for -%s=&lt;amount&gt;: '%s'</source>
         <translation type="unfinished">Nieprawidłowa kwota dla -%s=&lt;amount&gt;: '%s'</translation>
@@ -4794,10 +4764,6 @@ Nie można przywrócić kopii zapasowej portfela.</translation>
         <source>Invalid port specified in %s: '%s'</source>
         <translation type="unfinished">Nieprawidłowy port podany w %s: '%s'</translation>
     </message>
-    <message>
-        <source>Invalid pre-selected input %s</source>
-        <translation type="unfinished">Nieprawidłowe wstępnie wybrane dane wejściowe %s</translation>
-    </message>
     <message>
         <source>Listening for incoming connections failed (listen returned error %s)</source>
         <translation type="unfinished">Nasłuchiwanie połączeń przychodzących nie powiodło się (nasłuch zwrócił błąd %s)</translation>
@@ -4812,11 +4778,11 @@ Nie można przywrócić kopii zapasowej portfela.</translation>
     </message>
     <message>
         <source>Loading block index…</source>
-        <translation type="unfinished">Ładowanie indeksu bloku...</translation>
+        <translation type="unfinished">Ładowanie indeksu bloku…</translation>
     </message>
     <message>
         <source>Loading wallet…</source>
-        <translation type="unfinished">Ładowanie portfela...</translation>
+        <translation type="unfinished">Ładowanie portfela…</translation>
     </message>
     <message>
         <source>Maximum transaction weight must be between %d and %d</source>
@@ -4850,17 +4816,41 @@ Nie można przywrócić kopii zapasowej portfela.</translation>
         <source>Only direction was set, no permissions: '%s'</source>
         <translation type="unfinished">Tylko kierunek został ustalony, brak uprawnień: '%s'</translation>
     </message>
+    <message>
+        <source>Option '-limitancestorsize' is given but ancestor size limits have been replaced with cluster size limits (see -limitclustersize). This option has no effect.</source>
+        <translation type="unfinished">Podano opcję „-limitancestorsize”, ale limity rozmiaru przodków zostały zastąpione limitami rozmiaru klastra (zobacz -limitclustersize). Ta opcja nie ma żadnego wpływu.</translation>
+    </message>
+    <message>
+        <source>Option '-limitdescendantsize' is given but descendant size limits have been replaced with cluster size limits (see -limitclustersize). This option has no effect.</source>
+        <translation type="unfinished">Podano opcję „-limitdescendantsize”, ale limity rozmiaru potomków zostały zastąpione limitami rozmiaru klastra (zobacz -limitclustersize). Ta opcja nie ma żadnego wpływu.</translation>
+    </message>
+    <message>
+        <source>Private broadcast of own transactions requested (-privatebroadcast) and -proxyrandomize is disabled. Tor circuits for private broadcast connections may be correlated to other connections over Tor. For maximum privacy set -proxyrandomize=1.</source>
+        <translation type="unfinished">Zażądano prywatnej transmisji własnych transakcji (-privatebroadcast), a opcja -proxyrandomize jest wyłączona. Obwody Tor używane do połączeń prywatnej transmisji mogą zostać powiązane z innymi połączeniami przez Tor. Aby uzyskać maksymalną prywatność, ustaw -proxyrandomize=1.</translation>
+    </message>
+    <message>
+        <source>Private broadcast of own transactions requested (-privatebroadcast), but -connect is also configured. They are incompatible because the private broadcast needs to open new connections to randomly chosen Tor or I2P peers. Consider using -maxconnections=0 -addnode=... instead</source>
+        <translation type="unfinished">Zażądano prywatnej transmisji własnych transakcji (-privatebroadcast), ale skonfigurowano również opcję -connect. Są one niekompatybilne, ponieważ prywatna transmisja wymaga otwierania nowych połączeń z losowo wybranymi węzłami Tor lub I2P. Zamiast tego użyj -maxconnections=0 -addnode=...</translation>
+    </message>
+    <message>
+        <source>Private broadcast of own transactions requested (-privatebroadcast), but none of Tor or I2P networks is reachable</source>
+        <translation type="unfinished">Zażądano prywatnej transmisji własnych transakcji (-privatebroadcast), ale żadna z sieci Tor ani I2P nie jest osiągalna.</translation>
+    </message>
     <message>
         <source>Prune cannot be configured with a negative value.</source>
-        <translation type="unfinished">Przycinanie (pruning) nie może być skonfigurowane z negatywną wartością.</translation>
+        <translation type="unfinished">Przycinanie nie może być skonfigurowane z negatywną wartością.</translation>
     </message>
     <message>
         <source>Prune mode is incompatible with -txindex.</source>
         <translation type="unfinished">Tryb ograniczony jest niekompatybilny z -txindex.</translation>
     </message>
+    <message>
+        <source>Prune mode is incompatible with -txospenderindex.</source>
+        <translation type="unfinished">Tryb przycinania jest niezgodny z -txospenderindex.</translation>
+    </message>
     <message>
         <source>Pruning blockstore…</source>
-        <translation type="unfinished">Przycinanie (pruning) bloków na dysku…</translation>
+        <translation type="unfinished">Przycinanie bloków na dysku...</translation>
     </message>
     <message>
         <source>Reducing -maxconnections from %d to %d, because of system limitations.</source>
@@ -4946,6 +4936,10 @@ Nie można przywrócić kopii zapasowej portfela.</translation>
         <source>System error while saving block to disk: %s</source>
         <translation type="unfinished">Błąd systemowy podczas zapisywania bloku na dysk: %s</translation>
     </message>
+    <message>
+        <source>The %s path uses exFAT, which is known to have intermittent corruption problems on macOS. Move this directory to a different filesystem to avoid data loss.</source>
+        <translation type="unfinished">Ścieżka %s używa systemu plików exFAT, który na macOS jest znany ze sporadycznych problemów z uszkodzeniem danych. Przenieś ten katalog na inny system plików, aby uniknąć utraty danych.</translation>
+    </message>
     <message>
         <source>The source code is available from %s.</source>
         <translation type="unfinished">Kod źródłowy dostępny jest z %s.</translation>
@@ -4954,21 +4948,25 @@ Nie można przywrócić kopii zapasowej portfela.</translation>
         <source>The specified config file %s does not exist</source>
         <translation type="unfinished">Podany plik konfiguracyjny %s nie istnieje</translation>
     </message>
+    <message>
+        <source>The total exceeds your balance when the %s transaction fee is included.</source>
+        <translation type="unfinished">Suma przekracza twoje saldo po uwzględnieniu opłaty transakcyjnej %s.</translation>
+    </message>
     <message>
         <source>The transaction amount is too small to pay the fee</source>
         <translation type="unfinished">Zbyt niska kwota transakcji by zapłacić opłatę</translation>
     </message>
     <message>
         <source>The transactions removal process can only be executed within a db txn</source>
-        <translation type="unfinished">Proces usuwania transakcji może być wykonany tylko w ramach transakcji bazy danych.</translation>
+        <translation type="unfinished">Proces usuwania transakcji może być wykonany tylko w ramach transakcji bazy danych</translation>
     </message>
     <message>
         <source>The wallet will avoid paying less than the minimum relay fee.</source>
-        <translation type="unfinished">Portfel będzie unikał płacenia niższej niż minimalna opłata za przekazanie.</translation>
+        <translation type="unfinished">Portfel będzie unikał płacenia mniej niż minimalna opłata za przekazywanie transakcji.</translation>
     </message>
     <message>
         <source>There is no ScriptPubKeyManager for this address</source>
-        <translation type="unfinished">Nie istnieje ScriptPubKeyManager dla tego adresu</translation>
+        <translation type="unfinished">Brak ScriptPubKeyManagera dla tego adresu</translation>
     </message>
     <message>
         <source>This is experimental software.</source>
@@ -4978,10 +4976,6 @@ Nie można przywrócić kopii zapasowej portfela.</translation>
         <source>This is the minimum transaction fee you pay on every transaction.</source>
         <translation type="unfinished">Minimalna opłata transakcyjna którą płacisz przy każdej transakcji.</translation>
     </message>
-    <message>
-        <source>This is the transaction fee you will pay if you send a transaction.</source>
-        <translation type="unfinished">To jest opłata transakcyjna którą zapłacisz jeśli wyślesz transakcję.</translation>
-    </message>
     <message>
         <source>Transaction %s does not belong to this wallet</source>
         <translation type="unfinished">Transakcja %s nie należy do tego portfela</translation>
@@ -5026,30 +5020,18 @@ Nie można przywrócić kopii zapasowej portfela.</translation>
         <source>Unable to find UTXO for external input</source>
         <translation type="unfinished">Nie mogę znaleźć UTXO dla zewnętrznego wejścia</translation>
     </message>
-    <message>
-        <source>Unable to generate initial keys</source>
-        <translation type="unfinished">Nie można wygenerować kluczy początkowych</translation>
-    </message>
-    <message>
-        <source>Unable to generate keys</source>
-        <translation type="unfinished">Nie można wygenerować kluczy</translation>
-    </message>
     <message>
         <source>Unable to open %s for writing</source>
         <translation type="unfinished">Nie można otworzyć %s w celu zapisu</translation>
     </message>
     <message>
         <source>Unable to parse -maxuploadtarget: '%s'</source>
-        <translation type="unfinished">Nie można zinterpretować -maxuploadtarget: '%s'</translation>
+        <translation type="unfinished">Nie można przeanalizować -maxuploadtarget: „%s”</translation>
     </message>
     <message>
         <source>Unable to start HTTP server. See debug log for details.</source>
         <translation type="unfinished">Uruchomienie serwera HTTP nie powiodło się. Zobacz dziennik debugowania, aby uzyskać więcej szczegółów.</translation>
     </message>
-    <message>
-        <source>Unable to unload the wallet before migrating</source>
-        <translation type="unfinished">Nie mogę zamknąć portfela przed migracją</translation>
-    </message>
     <message>
         <source>Unknown -blockfilterindex value %s.</source>
         <translation type="unfinished">Nieznana wartość -blockfilterindex %s.</translation>
@@ -5076,19 +5058,51 @@ Nie można przywrócić kopii zapasowej portfela.</translation>
     </message>
     <message>
         <source>Unsupported global logging level %s=%s. Valid values: %s.</source>
-        <translation type="unfinished">Niewspierany globalny poziom logowania%s=%s. Poprawne wartości: %s.</translation>
+        <translation type="unfinished">Niewspierany globalny poziom logowania %s=%s. Poprawne wartości: %s.</translation>
     </message>
     <message>
         <source>Wallet file creation failed: %s</source>
         <translation type="unfinished">Utworzenie pliku portfela nie powiodło się: %s</translation>
     </message>
+    <message>
+        <source>Warning: Found invalid chain more than 6 blocks longer than our best chain. This could be due to database corruption or consensus incompatibility with peers.</source>
+        <translation type="unfinished">Ostrzeżenie: Wykryto nieprawidłowy łańcuch dłuższy o ponad 6 bloków niż nasz najlepszy łańcuch. Może to być spowodowane uszkodzeniem bazy danych lub niezgodnością zasad konsensusu z innymi węzłami.</translation>
+    </message>
     <message>
         <source>acceptstalefeeestimates is not supported on %s chain.</source>
-        <translation type="unfinished">akceptowalne nieaktualne szacunki opłat nie są wspierane na łańcuchu %s</translation>
+        <translation type="unfinished">opcja acceptstalefeeestimates nie jest wspierana na łańcuchu %s.</translation>
     </message>
     <message>
         <source>Unsupported logging category %s=%s.</source>
-        <translation type="unfinished">Nieobsługiwana kategoria logowania %s=%s.</translation>
+        <translation type="unfinished">Nieobsługiwana kategoria rejestrowania %s=%s.</translation>
+    </message>
+    <message>
+        <source>Error loading %s: Wallet is a legacy wallet. Please migrate to a descriptor wallet using the migration tool (migratewallet RPC).</source>
+        <translation type="unfinished">Błąd podczas ładowania %s: portfel jest portfelem typu legacy. Proszę przeprowadzić migrację do portfela opartego na deskryptorach za pomocą narzędzia migracyjnego (RPC migratewallet).</translation>
+    </message>
+    <message>
+        <source>Error: Dumpfile specifies an unsupported database format (%s). Only sqlite database dumps are supported</source>
+        <translation type="unfinished">Błąd: Plik zrzutu określa nieobsługiwany format bazy danych (%s). Obsługiwane są tylko zrzuty baz danych w formacie sqlite.</translation>
+    </message>
+    <message>
+        <source>Failed to calculate bump fees, because unconfirmed UTXOs depend on an enormous cluster of unconfirmed transactions.</source>
+        <translation type="unfinished">Nie udało się obliczyć zwiększonej opłaty, ponieważ niepotwierdzone UTXO zależą od ogromnego skupiska niepotwierdzonych transakcji.</translation>
+    </message>
+    <message>
+        <source>Transaction requires one destination of non-zero value, a non-zero feerate, or a pre-selected input</source>
+        <translation type="unfinished">Transakcja wymaga jednego adresu docelowego o niezerowej wartości, niezerowej stawki opłaty lub wstępnie wybranego wejścia</translation>
+    </message>
+    <message>
+        <source>Unrecognized descriptor found. Loading wallet %s
+
+The wallet might have been created on a newer version.
+Please try running the latest software version.
+</source>
+        <translation type="unfinished">Wykryto nierozpoznany deskryptor. Ładowanie portfela %s
+
+Portfel mógł zostać utworzony w nowszej wersji oprogramowania.
+Spróbuj uruchomić najnowszą wersję programu.
+</translation>
     </message>
     <message>
         <source>Do you want to rebuild the databases now?</source>
@@ -5110,10 +5124,22 @@ Nie można przywrócić kopii zapasowej portfela.</translation>
         <source>Error: cannot remove legacy wallet records</source>
         <translation type="unfinished">Błąd: nie można usunąć zapisów starszych portfeli</translation>
     </message>
+    <message>
+        <source>Failed to start indexes, shutting down…</source>
+        <translation type="unfinished">Nie udało się uruchomić indeksów, trwa zamykanie…</translation>
+    </message>
+    <message>
+        <source>Invalid -proxy address or hostname, ends with '=': '%s'</source>
+        <translation type="unfinished">Nieprawidłowy adres lub nazwa hosta dla -proxy, kończy się znakiem '=': '%s'</translation>
+    </message>
     <message>
         <source>Not enough file descriptors available. %d available, %d required.</source>
         <translation type="unfinished">Zbyt mało dostępnych deskryptorów plików. %d dostępnych, %d wymaganych.</translation>
     </message>
+    <message>
+        <source>Unrecognized network in -proxy='%s': '%s'</source>
+        <translation type="unfinished">Nierozpoznana sieć w -proxy='%s': '%s'</translation>
+    </message>
     <message>
         <source>User Agent comment (%s) contains unsafe characters.</source>
         <translation type="unfinished">Komentarz User Agent (%s) zawiera niebezpieczne znaki.</translation>
diff --git a/src/qt/locale/bitcoin_ps.ts b/src/qt/locale/bitcoin_ps.ts
index 9ddb1c57aa12..953e1258507b 100644
--- a/src/qt/locale/bitcoin_ps.ts
+++ b/src/qt/locale/bitcoin_ps.ts
@@ -1064,6 +1064,16 @@ The migration process will create a backup of the wallet before migrating. This
         <source>Solvable but not watched scripts have been migrated to a new wallet named '%1'.</source>
         <translation type="unfinished">حل کیدونکي خو نه لیدل شوي سکریپټونه یوې نوې بکسې ته انتقال شوي چې نوم یې '%1' دی."</translation>
     </message>
+    <message>
+        <source>Restore Wallet</source>
+        <extracomment>Title of progress window which is displayed when wallets are being restored.</extracomment>
+        <translation type="unfinished">والټ بېرته راګرځول</translation>
+    </message>
+    <message>
+        <source>Restoring Wallet &lt;b&gt;%1&lt;/b&gt;…</source>
+        <extracomment>Descriptive text of the restore wallets progress window which indicates to the user that wallets are currently being restored.</extracomment>
+        <translation type="unfinished">"والټ بیا راګرځول ..&lt;b&gt;%1&lt;/b&gt;…</translation>
+    </message>
     <message>
         <source>Migration failed</source>
         <translation type="unfinished">هجرت ناکام شو</translation>
@@ -1183,10 +1193,6 @@ The migration process will create a backup of the wallet before migrating. This
         <source>Disable Private Keys</source>
         <translation type="unfinished">د خصوصي کليدونه غير فعاله کړئ.</translation>
     </message>
-    <message>
-        <source>Make a blank wallet. Blank wallets do not initially have private keys or scripts. Private keys and addresses can be imported, or an HD seed can be set, at a later time.</source>
-        <translation type="unfinished">یو خالي والیټ جوړ کړئ. خالي والیټونه په لومړي سر کې خصوصي کیلي او سکریپټونه نه لري. خصوصي کیلي او پته کولی شي وارد شي، یا د HD تخم وروسته ټاکل کیدی شي."</translation>
-    </message>
     <message>
         <source>Make Blank Wallet</source>
         <translation type="unfinished">خالي بټوه جوړ کړه</translation>
@@ -1636,6 +1642,23 @@ The migration process will create a backup of the wallet before migrating. This
         <translation type="unfinished">"فورمه:</translation>
     </message>
     </context>
+<context>
+    <name>PSBTOperationsDialog</name>
+    <message numerus="yes">
+        <source>Signed %n input(s), but more signatures are still required.</source>
+        <translation type="unfinished">
+            <numerusform />
+            <numerusform />
+        </translation>
+    </message>
+    <message numerus="yes">
+        <source>Transaction has %n unsigned input(s).</source>
+        <translation type="unfinished">
+            <numerusform />
+            <numerusform />
+        </translation>
+    </message>
+    </context>
 <context>
     <name>PeerTableModel</name>
     <message>
diff --git a/src/qt/locale/bitcoin_pt.ts b/src/qt/locale/bitcoin_pt.ts
index 079d318dd6ad..26b841f0124b 100644
--- a/src/qt/locale/bitcoin_pt.ts
+++ b/src/qt/locale/bitcoin_pt.ts
@@ -65,7 +65,7 @@ A assinatura só é possível com endereços do tipo "legado".</translation>
     </message>
     <message>
         <source>&amp;Copy Address</source>
-        <translation type="unfinished">&amp;Copiar endereço</translation>
+        <translation type="unfinished">&amp;Copiar Endereço</translation>
     </message>
     <message>
         <source>Copy &amp;Label</source>
@@ -77,7 +77,7 @@ A assinatura só é possível com endereços do tipo "legado".</translation>
     </message>
     <message>
         <source>Export Address List</source>
-        <translation type="unfinished">Exportar lista de endereços</translation>
+        <translation type="unfinished">Exportar Lista de Endereços</translation>
     </message>
     <message>
         <source>Comma separated file</source>
@@ -91,11 +91,11 @@ A assinatura só é possível com endereços do tipo "legado".</translation>
     </message>
     <message>
         <source>Sending addresses - %1</source>
-        <translation type="unfinished">Endereço de envio - %1</translation>
+        <translation type="unfinished">Endereços de envio - %1</translation>
     </message>
     <message>
         <source>Receiving addresses - %1</source>
-        <translation type="unfinished">Endereços de receção - %1</translation>
+        <translation type="unfinished">Endereços de receber - %1</translation>
     </message>
     <message>
         <source>Exporting Failed</source>
@@ -348,17 +348,22 @@ A assinatura só é possível com endereços do tipo "legado".</translation>
     <message>
         <source>Block Relay</source>
         <extracomment>Peer connection type that relays network information about blocks and not transactions or addresses.</extracomment>
-        <translation type="unfinished">Retransmissão de Blocos</translation>
+        <translation type="unfinished">Retransmissão de blocos</translation>
     </message>
     <message>
         <source>Feeler</source>
         <extracomment>Short-lived peer connection type that tests the aliveness of known addresses.</extracomment>
-        <translation type="unfinished">Antena</translation>
+        <translation type="unfinished">Sensor</translation>
     </message>
     <message>
         <source>Address Fetch</source>
         <extracomment>Short-lived peer connection type that solicits known addresses from a peer.</extracomment>
-        <translation type="unfinished">Procura de endreços</translation>
+        <translation type="unfinished">Obtenção de endereços</translation>
+    </message>
+    <message>
+        <source>Private Broadcast</source>
+        <extracomment>Short-lived peer connection type that is used for broadcasting privacy-sensitive data.</extracomment>
+        <translation type="unfinished">Transmissão privada</translation>
     </message>
     <message>
         <source>None</source>
@@ -562,6 +567,10 @@ A assinatura só é possível com endereços do tipo "legado".</translation>
         <source>Close All Wallets…</source>
         <translation type="unfinished">Fechar todas as carteiras…</translation>
     </message>
+    <message>
+        <source>Restore and Migrate Wallet File…</source>
+        <translation type="unfinished">Restaurar e migrar arquivo da carteira...</translation>
+    </message>
     <message>
         <source>&amp;File</source>
         <translation type="unfinished">&amp;Ficheiro</translation>
@@ -675,11 +684,11 @@ A assinatura só é possível com endereços do tipo "legado".</translation>
     </message>
     <message>
         <source>&amp;Sending addresses</source>
-        <translation type="unfinished">&amp;Endereço de envio</translation>
+        <translation type="unfinished">&amp;Endereços de envio</translation>
     </message>
     <message>
         <source>&amp;Receiving addresses</source>
-        <translation type="unfinished">&amp;Endereços de receção</translation>
+        <translation type="unfinished">&amp;Endereços de receber</translation>
     </message>
     <message>
         <source>Open a bitcoin: URI</source>
@@ -709,7 +718,7 @@ A assinatura só é possível com endereços do tipo "legado".</translation>
     </message>
     <message>
         <source>Close all wallets</source>
-        <translation type="unfinished">Fechar todas carteiras.</translation>
+        <translation type="unfinished">Fechar todas carteiras</translation>
     </message>
     <message>
         <source>Migrate Wallet</source>
@@ -755,6 +764,23 @@ A assinatura só é possível com endereços do tipo "legado".</translation>
         <extracomment>Label of the input field where the name of the wallet is entered.</extracomment>
         <translation type="unfinished">Nome da Carteira</translation>
     </message>
+    <message>
+        <source>Invalid Wallet Name</source>
+        <translation type="unfinished">Nome da carteira inválido</translation>
+    </message>
+    <message>
+        <source>Wallet name cannot be empty</source>
+        <translation type="unfinished">O nome da carteira não pode estar vazio</translation>
+    </message>
+    <message>
+        <source>Restore and Migrate Wallet Backup</source>
+        <translation type="unfinished">Restaurar e migrar backup da carteira</translation>
+    </message>
+    <message>
+        <source>Restore and Migrate Wallet</source>
+        <extracomment>Title of pop-up window shown when the user is attempting to restore a wallet.</extracomment>
+        <translation type="unfinished">A restaurar e migrar carteira</translation>
+    </message>
     <message>
         <source>&amp;Window</source>
         <translation type="unfinished">&amp;Janela</translation>
@@ -915,7 +941,7 @@ A assinatura só é possível com endereços do tipo "legado".</translation>
     </message>
     <message>
         <source>After Fee:</source>
-        <translation type="unfinished">Depois da taxa:</translation>
+        <translation type="unfinished">Após a taxa:</translation>
     </message>
     <message>
         <source>Change:</source>
@@ -1110,6 +1136,40 @@ O processo de migração criará uma cópia de segurança da carteira antes da m
         <source>Solvable but not watched scripts have been migrated to a new wallet named '%1'.</source>
         <translation type="unfinished">Os scripts solucionáveis mas não observados/watched foram migrados para uma nova carteira chamada '%1'.</translation>
     </message>
+    <message>
+        <source>Restore and Migrate wallet</source>
+        <translation type="unfinished">A restaurar e migrar carteira</translation>
+    </message>
+    <message>
+        <source>Are you sure you wish to restore the wallet file &lt;i&gt;%1&lt;/i&gt; to &lt;i&gt;%2&lt;/i&gt; and migrate it?</source>
+        <translation type="unfinished">Tem a certeza de que deseja restaurar o ficheiro da carteira &lt;i&gt;%1&lt;/i&gt; para &lt;i&gt;%2&lt;/i&gt; e migrá-lo?</translation>
+    </message>
+    <message>
+        <source>Restoring the wallet will copy the backup file to the wallets directory and place it in the standard wallet directory layout. The original file will not be modified.
+
+Migrating the wallet will convert the restored wallet to one or more descriptor wallets. A new wallet backup will need to be made.
+If this wallet contains any watchonly scripts, a new wallet will be created which contains those watchonly scripts.
+If this wallet contains any solvable but not watched scripts, a different and new wallet will be created which contains those scripts.
+
+The migration process will create a backup of the wallet before migrating. This backup file will be named &lt;wallet name&gt;-&lt;timestamp&gt;.legacy.bak and can be found in the directory for this wallet. In the event of an incorrect migration, the backup can be restored with the "Restore Wallet" functionality.</source>
+        <translation type="unfinished">A restauração da carteira copiará o ficheiro de backup para o diretório de carteiras e o colocará no layout padrão do diretório de carteiras. O ficheiro original não será modificado.
+
+A migração da carteira converterá a carteira restaurada em uma ou mais carteiras descritoras. Será necessário fazer um novo backup da carteira.
+Se esta carteira contiver quaisquer scripts watchonly, será criada uma nova carteira que contém esses scripts watchonly.
+Se esta carteira contiver quaisquer scripts solucionáveis, mas não vigiados, será criada uma carteira diferente e nova que contém esses scripts.
+
+O processo de migração criará um backup da carteira antes da migração. Este ficheiro de backup será nomeado &lt;wallet name&gt;-&lt;timestamp&gt;.legacy.bak e pode ser encontrado no diretório desta carteira. No caso de uma migração incorreta, o backup pode ser restaurado com a funcionalidade "Restaurar Carteira".</translation>
+    </message>
+    <message>
+        <source>Restore Wallet</source>
+        <extracomment>Title of progress window which is displayed when wallets are being restored.</extracomment>
+        <translation type="unfinished">Restaurar carteira</translation>
+    </message>
+    <message>
+        <source>Restoring Wallet &lt;b&gt;%1&lt;/b&gt;…</source>
+        <extracomment>Descriptive text of the restore wallets progress window which indicates to the user that wallets are currently being restored.</extracomment>
+        <translation type="unfinished">A restaurar a carteira &lt;b&gt;%1&lt;/b&gt;…</translation>
+    </message>
     <message>
         <source>Migration failed</source>
         <translation type="unfinished">Falha na migração</translation>
@@ -1234,8 +1294,8 @@ O processo de migração criará uma cópia de segurança da carteira antes da m
         <translation type="unfinished">Desativar chaves privadas</translation>
     </message>
     <message>
-        <source>Make a blank wallet. Blank wallets do not initially have private keys or scripts. Private keys and addresses can be imported, or an HD seed can be set, at a later time.</source>
-        <translation type="unfinished">Crie uma carteira em branco. As carteiras em branco não têm inicialmente chaves privadas ou scripts. As chaves privadas e os endereços podem ser importados ou pode ser definida uma semente HD numa altura posterior.</translation>
+        <source>Make a blank wallet. Blank wallets do not initially have private keys or scripts. Private keys and addresses can be imported using descriptors at a later time.</source>
+        <translation type="unfinished">Cria uma carteira em branco. As carteiras em branco não têm inicialmente chaves privadas ou scripts. As chaves privadas e os endereços podem ser importados posteriormente utilizando descritores.</translation>
     </message>
     <message>
         <source>Make Blank Wallet</source>
@@ -1256,7 +1316,7 @@ O processo de migração criará uma cópia de segurança da carteira antes da m
     <message>
         <source>Compiled without external signing support (required for external signing)</source>
         <extracomment>"External signing" means using devices such as hardware wallets.</extracomment>
-        <translation type="unfinished">Compilado sem suporte de assinatura externa (necessário para assinatura externa)</translation>
+        <translation type="unfinished">Compilado sem suporte de assinatura externa. (necessário para assinatura externa)</translation>
     </message>
 </context>
 <context>
@@ -1271,11 +1331,11 @@ O processo de migração criará uma cópia de segurança da carteira antes da m
     </message>
     <message>
         <source>The label associated with this address list entry</source>
-        <translation type="unfinished">A etiqueta associada a esta entrada da lista de endereços</translation>
+        <translation type="unfinished">A etiqueta associada com esta entrada da lista de endereços</translation>
     </message>
     <message>
         <source>The address associated with this address list entry. This can only be modified for sending addresses.</source>
-        <translation type="unfinished">O endereço associado a esta entrada da lista de endereços. Isto só pode ser alterado para os endereços de envio.</translation>
+        <translation type="unfinished">O endereço associado com o esta entrada da lista de endereços. Isto só pode ser alterado para os endereços de envio.</translation>
     </message>
     <message>
         <source>&amp;Address</source>
@@ -1799,7 +1859,7 @@ O processo de migração criará uma cópia de segurança da carteira antes da m
     <message>
         <source>Compiled without external signing support (required for external signing)</source>
         <extracomment>"External signing" means using devices such as hardware wallets.</extracomment>
-        <translation type="unfinished">Compilado sem suporte de assinatura externa (necessário para assinatura externa)</translation>
+        <translation type="unfinished">Compilado sem suporte de assinatura externa. (necessário para assinatura externa)</translation>
     </message>
     <message>
         <source>default</source>
@@ -1919,7 +1979,7 @@ O processo de migração criará uma cópia de segurança da carteira antes da m
     </message>
     <message>
         <source>Privacy mode activated for the Overview tab. To unmask the values, uncheck Settings-&gt;Mask values.</source>
-        <translation type="unfinished">Modo de privacidade ativado para a aba de visão geral. para desmascarar os valores, desmarque nas Configurações -&gt; Valores de máscara</translation>
+        <translation type="unfinished">Modo de privacidade ativado para a aba Resumo. para desmascarar os valores, desmarque nas Configurações -&gt; Valores de máscara</translation>
     </message>
 </context>
 <context>
@@ -1950,27 +2010,30 @@ O processo de migração criará uma cópia de segurança da carteira antes da m
     </message>
     <message>
         <source>Failed to load transaction: %1</source>
-        <translation type="unfinished">Falha ao carregar transação: %1</translation>
+        <translation type="unfinished">Falha ao carregar a transação: %1</translation>
     </message>
     <message>
         <source>Failed to sign transaction: %1</source>
-        <translation type="unfinished">Falha ao assinar transação: %1</translation>
+        <translation type="unfinished">Falha ao assinar a transação: %1</translation>
     </message>
     <message>
         <source>Cannot sign inputs while wallet is locked.</source>
-        <translation type="unfinished">Não é possível assinar entradas enquanto a carteira está trancada.</translation>
+        <translation type="unfinished">Não é possível assinar entradas enquanto a carteira estiver bloqueada.</translation>
     </message>
     <message>
         <source>Could not sign any more inputs.</source>
         <translation type="unfinished">Não pode assinar mais nenhuma entrada.</translation>
     </message>
-    <message>
-        <source>Signed %1 inputs, but more signatures are still required.</source>
-        <translation type="unfinished">Assinadas entradas %1, mas mais assinaturas ainda são necessárias.</translation>
+    <message numerus="yes">
+        <source>Signed %n input(s), but more signatures are still required.</source>
+        <translation type="unfinished">
+            <numerusform>Assinou %n entrada, mas ainda são necessárias mais assinaturas.</numerusform>
+            <numerusform>Assinou %n entradas, mas ainda são necessárias mais assinaturas.</numerusform>
+        </translation>
     </message>
     <message>
         <source>Signed transaction successfully. Transaction is ready to broadcast.</source>
-        <translation type="unfinished">Transação assinada com sucesso. Transação está pronta para ser transmitida.</translation>
+        <translation type="unfinished">Transação assinada com sucesso. A transação está pronta para ser transmitida.</translation>
     </message>
     <message>
         <source>Unknown error processing transaction.</source>
@@ -1979,7 +2042,7 @@ O processo de migração criará uma cópia de segurança da carteira antes da m
     <message>
         <source>Transaction broadcast successfully! Transaction ID: %1</source>
         <translation type="unfinished">Transação transmitida com sucesso.
-ID transação: %1</translation>
+ID da transação: %1</translation>
     </message>
     <message>
         <source>Transaction broadcast failed: %1</source>
@@ -1991,16 +2054,16 @@ ID transação: %1</translation>
     </message>
     <message>
         <source>Save Transaction Data</source>
-        <translation type="unfinished">Salvar informação de transação</translation>
+        <translation type="unfinished">Guardar informação da transação</translation>
     </message>
     <message>
         <source>Partially Signed Transaction (Binary)</source>
         <extracomment>Expanded name of the binary PSBT file format. See: BIP 174.</extracomment>
-        <translation type="unfinished">Transação parcialmente assinada (Binário)</translation>
+        <translation type="unfinished">Transação parcialmente assinada (binário)</translation>
     </message>
     <message>
         <source>PSBT saved to disk.</source>
-        <translation type="unfinished">PSBT salva no disco.</translation>
+        <translation type="unfinished">PSBT guardada no disco.</translation>
     </message>
     <message>
         <source>Sends %1 to %2</source>
@@ -2012,7 +2075,7 @@ ID transação: %1</translation>
     </message>
     <message>
         <source>Unable to calculate transaction fee or total transaction amount.</source>
-        <translation type="unfinished">Incapaz de calcular a taxa de transação ou o valor total da transação.</translation>
+        <translation type="unfinished">Não foi possível calcular a taxa de transação ou a quantia total da transação.</translation>
     </message>
     <message>
         <source>Pays transaction fee: </source>
@@ -2020,23 +2083,26 @@ ID transação: %1</translation>
     </message>
     <message>
         <source>Total Amount</source>
-        <translation type="unfinished">Valor Total</translation>
+        <translation type="unfinished">Quantia total</translation>
     </message>
     <message>
         <source>or</source>
         <translation type="unfinished">ou</translation>
     </message>
-    <message>
-        <source>Transaction has %1 unsigned inputs.</source>
-        <translation type="unfinished">Transação tem %1 entradas não assinadas.</translation>
+    <message numerus="yes">
+        <source>Transaction has %n unsigned input(s).</source>
+        <translation type="unfinished">
+            <numerusform>A transação tem %n entrada não assinada.</numerusform>
+            <numerusform>A transação tem %n entradas não assinadas.</numerusform>
+        </translation>
     </message>
     <message>
         <source>Transaction is missing some information about inputs.</source>
-        <translation type="unfinished">Transação está com alguma informação faltando sobre as entradas.</translation>
+        <translation type="unfinished">A transação não contém algumas informações sobre as entradas.</translation>
     </message>
     <message>
         <source>Transaction still needs signature(s).</source>
-        <translation type="unfinished">Transação continua precisando de assinatura(s).</translation>
+        <translation type="unfinished">A transação ainda precisa de assinatura(s).</translation>
     </message>
     <message>
         <source>(But no wallet is loaded.)</source>
@@ -2052,11 +2118,11 @@ ID transação: %1</translation>
     </message>
     <message>
         <source>Transaction is fully signed and ready for broadcast.</source>
-        <translation type="unfinished">Transação está completamente assinada e pronta para ser transmitida.</translation>
+        <translation type="unfinished">A transação está totalmente assinada e pronta para ser transmitida.</translation>
     </message>
     <message>
         <source>Transaction status is unknown.</source>
-        <translation type="unfinished">Status da transação é desconhecido.</translation>
+        <translation type="unfinished">O estado da transação é desconhecido.</translation>
     </message>
 </context>
 <context>
@@ -2067,7 +2133,7 @@ ID transação: %1</translation>
     </message>
     <message>
         <source>Cannot start bitcoin: click-to-pay handler</source>
-        <translation type="unfinished">Impossível iniciar o controlador de bitcoin: click-to-pay</translation>
+        <translation type="unfinished">Não é possível iniciar o bitcoin: manipulador do click-to-pay</translation>
     </message>
     <message>
         <source>URI handling</source>
@@ -2082,20 +2148,25 @@ ID transação: %1</translation>
 Due to widespread security flaws in BIP70 it's strongly recommended that any merchant instructions to switch wallets be ignored.
 If you are receiving this error you should request the merchant provide a BIP21 compatible URI.</source>
         <translation type="unfinished">Não é possível processar o pagamento pedido porque o BIP70 não é suportado.
-Devido a falhas de segurança no BIP70, é recomendado que todas as instruçōes ao comerciante para mudar de carteiras sejam ignorada.
+Devido a falhas de segurança no BIP70, é recomendado que todas as instruções ao comerciante para mudar de carteiras sejam ignorada.
 Se está a receber este erro, deverá pedir ao comerciante para fornecer um URI compatível com BIP21.</translation>
     </message>
     <message>
         <source>URI cannot be parsed! This can be caused by an invalid Bitcoin address or malformed URI parameters.</source>
-        <translation type="unfinished">URI não foi lido corretamente! Isto pode ser causado por um endereço Bitcoin inválido ou por parâmetros URI malformados.</translation>
+        <translation type="unfinished">O URI não pode ser analisado! Isto pode ser causado por um endereço Bitcoin inválido ou por parâmetros URI malformados.</translation>
     </message>
     <message>
         <source>Payment request file handling</source>
-        <translation type="unfinished">Controlo de pedidos de pagamento.</translation>
+        <translation type="unfinished">Manuseamento do ficheiro de pedidos de pagamento.</translation>
     </message>
 </context>
 <context>
     <name>PeerTableModel</name>
+    <message>
+        <source>User Agent</source>
+        <extracomment>Title of Peers Table column which contains the peer's User Agent string.</extracomment>
+        <translation type="unfinished">Agente do utilizador</translation>
+    </message>
     <message>
         <source>Ping</source>
         <extracomment>Title of Peers Table column which indicates the current latency of the connection with the peer.</extracomment>
@@ -2109,7 +2180,7 @@ Se está a receber este erro, deverá pedir ao comerciante para fornecer um URI
     <message>
         <source>Age</source>
         <extracomment>Title of Peers Table column which indicates the duration (length of time) since the peer connection started.</extracomment>
-        <translation type="unfinished">idade</translation>
+        <translation type="unfinished">Idade</translation>
     </message>
     <message>
         <source>Direction</source>
@@ -2168,7 +2239,7 @@ Se está a receber este erro, deverá pedir ao comerciante para fornecer um URI
     </message>
     <message>
         <source>Error encoding URI into QR Code.</source>
-        <translation type="unfinished">Erro ao codificar URI em código QR.</translation>
+        <translation type="unfinished">Erro ao codificar o URI em código QR</translation>
     </message>
     <message>
         <source>QR code support not available.</source>
@@ -2318,10 +2389,6 @@ Se está a receber este erro, deverá pedir ao comerciante para fornecer um URI
         <source>Transaction Relay</source>
         <translation type="unfinished">Retransmissão de transação</translation>
     </message>
-    <message>
-        <source>Starting Block</source>
-        <translation type="unfinished">Bloco inicial</translation>
-    </message>
     <message>
         <source>Synced Headers</source>
         <translation type="unfinished">Cabeçalhos sincronizados</translation>
@@ -2372,6 +2439,10 @@ Se está a receber este erro, deverá pedir ao comerciante para fornecer um URI
         <extracomment>Text title for the Addresses Rate-Limited field in the peer details area, which displays the total number of addresses received from this peer that were dropped (not processed) due to rate-limiting.</extracomment>
         <translation type="unfinished">Endereços rejeitados devido a limitação de volume</translation>
     </message>
+    <message>
+        <source>User Agent</source>
+        <translation type="unfinished">Agente do utilizador</translation>
+    </message>
     <message>
         <source>Node window</source>
         <translation type="unfinished">Janela do nó</translation>
@@ -2535,6 +2606,11 @@ Se está a receber este erro, deverá pedir ao comerciante para fornecer um URI
         <extracomment>Explanatory text for a short-lived outbound peer connection that is used to request addresses from a peer.</extracomment>
         <translation type="unfinished">Obtenção de endereço de saída: de curta duração, para solicitar endereços</translation>
     </message>
+    <message>
+        <source>Private broadcast: short-lived, for broadcasting privacy-sensitive transactions</source>
+        <extracomment>Explanatory text for a short-lived outbound peer connection that is used to broadcast privacy-sensitive data (like our transactions).</extracomment>
+        <translation type="unfinished">Transmissão privada: de curta duração, para transmissão de transações confidenciais</translation>
+    </message>
     <message>
         <source>detecting: peer could be v1 or v2</source>
         <extracomment>Explanatory text for "detecting" transport type.</extracomment>
@@ -3100,12 +3176,12 @@ Nota: como a taxa é calculada por byte, uma taxa de "100 satoshis por kvB" para
     </message>
     <message>
         <source>Save Transaction Data</source>
-        <translation type="unfinished">Guardar informação da transação</translation>
+        <translation type="unfinished">Salvar informação de transação</translation>
     </message>
     <message>
         <source>Partially Signed Transaction (Binary)</source>
         <extracomment>Expanded name of the binary PSBT file format. See: BIP 174.</extracomment>
-        <translation type="unfinished">Transação parcialmente assinada (binário)</translation>
+        <translation type="unfinished">Transação parcialmente assinada (Binário)</translation>
     </message>
     <message>
         <source>PSBT saved</source>
@@ -3190,10 +3266,6 @@ Nota: como a taxa é calculada por byte, uma taxa de "100 satoshis por kvB" para
         <source>The amount exceeds your balance.</source>
         <translation type="unfinished">A quantia excede o seu saldo.</translation>
     </message>
-    <message>
-        <source>The total exceeds your balance when the %1 transaction fee is included.</source>
-        <translation type="unfinished">O total excede o seu saldo quando a taxa de transação %1 está incluída.</translation>
-    </message>
     <message>
         <source>Duplicate address found: addresses should only be used once each.</source>
         <translation type="unfinished">Endereço duplicado encontrado: os endereços devem ser usados ​​apenas uma vez.</translation>
@@ -3826,7 +3898,7 @@ Nota: como a taxa é calculada por byte, uma taxa de "100 satoshis por kvB" para
     </message>
     <message>
         <source>Confirmed</source>
-        <translation type="unfinished">Confirmada</translation>
+        <translation type="unfinished">Confirmado</translation>
     </message>
     <message>
         <source>Date</source>
@@ -3846,7 +3918,7 @@ Nota: como a taxa é calculada por byte, uma taxa de "100 satoshis por kvB" para
     </message>
     <message>
         <source>Exporting Failed</source>
-        <translation type="unfinished">Exportação falhou</translation>
+        <translation type="unfinished">Falha na exportação</translation>
     </message>
     <message>
         <source>There was an error trying to save the transaction history to %1.</source>
@@ -4154,10 +4226,6 @@ Vá ao menu Ficheiro &gt; Abrir carteira para carregar uma carteira
         <source>Warning: Private keys detected in wallet {%s} with disabled private keys</source>
         <translation type="unfinished">Aviso: foram detetadas chaves privadas na carteira {%s} com chaves privadas desativadas</translation>
     </message>
-    <message>
-        <source>Warning: We do not appear to fully agree with our peers! You may need to upgrade, or other nodes may need to upgrade.</source>
-        <translation type="unfinished">Aviso: parece que nós não estamos de acordo com os nossos pares! Poderá ter que atualizar, ou os outros pares podem ter que ser atualizados.</translation>
-    </message>
     <message>
         <source>Witness data for blocks after height %d requires validation. Please restart with -reindex.</source>
         <translation type="unfinished">Os dados da testemunha para blocos após a altura %d requerem validação. Reinicie com -reindex.</translation>
@@ -4196,11 +4264,11 @@ Vá ao menu Ficheiro &gt; Abrir carteira para carregar uma carteira
     </message>
     <message>
         <source>Cannot provide specific connections and have addrman find outgoing connections at the same time.</source>
-        <translation type="unfinished">Não é possível fornecer conexões específicas e fazer com que o addrman encontre conexões de saída ao mesmo tempo.</translation>
+        <translation type="unfinished">Não é possível fornecer conexões específicas e ter addrman procurando conexões ao mesmo tempo.</translation>
     </message>
     <message>
         <source>Error loading %s: External signer wallet being loaded without external signer support compiled</source>
-        <translation type="unfinished">Erro ao abrir %s: carteira com assinante externo. Não foi compilado suporte para assinantes externos</translation>
+        <translation type="unfinished">Erro ao abrir %s: Carteira com assinador externo. Não foi compilado suporte para assinadores externos</translation>
     </message>
     <message>
         <source>Error reading %s! All keys read correctly, but transaction data or address metadata may be missing or incorrect.</source>
@@ -4208,15 +4276,15 @@ Vá ao menu Ficheiro &gt; Abrir carteira para carregar uma carteira
     </message>
     <message>
         <source>Error: Address book data in wallet cannot be identified to belong to migrated wallets</source>
-        <translation type="unfinished">Erro: os dados do livro de endereços na carteira não podem ser identificados como pertencentes a carteiras migradas</translation>
+        <translation type="unfinished">Erro: Os dados do livro de endereços da carteira  não puderam ser identificados por pertencerem a carteiras migradas</translation>
     </message>
     <message>
         <source>Error: Duplicate descriptors created during migration. Your wallet may be corrupted.</source>
-        <translation type="unfinished">Erro: foram criados descritores duplicados durante a migração. A sua carteira pode estar corrompida.</translation>
+        <translation type="unfinished">Erro: Descritores duplicados criados durante a migração. Sua carteira pode estar corrompida.</translation>
     </message>
     <message>
         <source>Error: Transaction %s in wallet cannot be identified to belong to migrated wallets</source>
-        <translation type="unfinished">Erro: a transação %s na carteira não pode ser identificada como pertencente a carteiras migradas</translation>
+        <translation type="unfinished">Erro: A transação %s na carteira não pôde ser identificada por pertencer a carteiras migradas</translation>
     </message>
     <message>
         <source>Failed to remove snapshot chainstate dir (%s). Manually remove it before restarting.
@@ -4386,6 +4454,10 @@ Não foi possível restaurar a cópia de segurança da carteira.</translation>
         <source>Could not parse asmap file %s</source>
         <translation type="unfinished">Não foi possível analisar o ficheiro asmap %s.</translation>
     </message>
+    <message>
+        <source>Could not read embedded asmap data</source>
+        <translation type="unfinished">Não foi possível ler os dados asmap embutidos</translation>
+    </message>
     <message>
         <source>Disk space is too low!</source>
         <translation type="unfinished">O espaço em disco é demasiado pequeno!</translation>
@@ -4403,8 +4475,8 @@ Não foi possível restaurar a cópia de segurança da carteira.</translation>
         <translation type="unfinished">Falha na verificação de integridade da criptografia de curva elíptica. %s está sendo desligado.</translation>
     </message>
     <message>
-        <source>Error creating %s</source>
-        <translation type="unfinished">Erro ao criar %s</translation>
+        <source>Embedded asmap data not available</source>
+        <translation type="unfinished">Dados asmap embutidos não disponíveis</translation>
     </message>
     <message>
         <source>Error initializing block database</source>
@@ -4414,10 +4486,6 @@ Não foi possível restaurar a cópia de segurança da carteira.</translation>
         <source>Error loading %s</source>
         <translation type="unfinished">Erro ao carregar %s</translation>
     </message>
-    <message>
-        <source>Error loading %s: Private keys can only be disabled during creation</source>
-        <translation type="unfinished">Erro ao carregar %s: as chaves privadas só podem ser desativadas durante a criação</translation>
-    </message>
     <message>
         <source>Error loading %s: Wallet corrupted</source>
         <translation type="unfinished">Erro ao carregar %s: carteira corrompida</translation>
@@ -4546,10 +4614,6 @@ Não foi possível restaurar a cópia de segurança da carteira.</translation>
         <source>Error: database transaction cannot be executed for wallet %s</source>
         <translation type="unfinished">Erro: a transação da base de dados não pode ser executada para a carteira %s</translation>
     </message>
-    <message>
-        <source>Failed to connect best block (%s).</source>
-        <translation type="unfinished">Falha ao conectar o melhor bloco (%s).</translation>
-    </message>
     <message>
         <source>Failed to disconnect block.</source>
         <translation type="unfinished">Falha ao desconectar o bloco.</translation>
@@ -4574,14 +4638,6 @@ Não foi possível restaurar a cópia de segurança da carteira.</translation>
         <source>Failed to write block.</source>
         <translation type="unfinished">Falha ao escrever bloco.</translation>
     </message>
-    <message>
-        <source>Failed to write to block index database.</source>
-        <translation type="unfinished">Falha ao escrever na base de dados de índices de blocos.</translation>
-    </message>
-    <message>
-        <source>Failed to write to coin database.</source>
-        <translation type="unfinished">Falha ao escrever na base de dados de moedas.</translation>
-    </message>
     <message>
         <source>Failed to write undo data.</source>
         <translation type="unfinished">Falha ao escrever dados de anulação.</translation>
@@ -4634,14 +4690,26 @@ Não foi possível restaurar a cópia de segurança da carteira.</translation>
         <source>Invalid P2P permission: '%s'</source>
         <translation type="unfinished">Permissões P2P inválidas: '%s'</translation>
     </message>
-    <message>
-        <source>Invalid amount for %s=&lt;amount&gt;: '%s' (must be at least %s)</source>
-        <translation type="unfinished">Quantia inválida para %s=&lt;amount&gt;: '%s' (tem de ser pelo menos %s)</translation>
-    </message>
     <message>
         <source>Invalid amount for %s=&lt;amount&gt;: '%s'</source>
         <translation type="unfinished">Quantia inválida para %s=&lt;amount&gt;: '%s'</translation>
     </message>
+    <message>
+        <source>A %zu MiB dbcache may be too large for a system memory of only %zu MiB.</source>
+        <translation type="unfinished">Um %zu MiB dbcache pode ser demasiado grande para uma memória de sistema de apenas %zu MiB.</translation>
+    </message>
+    <message>
+        <source>Creating wallet…</source>
+        <translation type="unfinished">A criar carteira...</translation>
+    </message>
+    <message>
+        <source>Duplicate binding configuration for address %s. Please check your -bind, -bind=...=onion and -whitebind settings.</source>
+        <translation type="unfinished">Configuração de ligação duplicada para o endereço %s. Verifique as suas definições -bind, -bind=...=onion e -whitebind.</translation>
+    </message>
+    <message>
+        <source>Error creating %s: Could not write version metadata.</source>
+        <translation type="unfinished">Erro ao criar %s: Não foi possível gravar os metadados da versão.</translation>
+    </message>
     <message>
         <source>Invalid amount for -%s=&lt;amount&gt;: '%s'</source>
         <translation type="unfinished">Quantia inválida para -%s=&lt;amount&gt;: '%s'</translation>
@@ -4706,6 +4774,26 @@ Não foi possível restaurar a cópia de segurança da carteira.</translation>
         <source>Only direction was set, no permissions: '%s'</source>
         <translation type="unfinished">Apenas a direção foi definida, sem permissões: '%s'</translation>
     </message>
+    <message>
+        <source>Option '-limitancestorsize' is given but ancestor size limits have been replaced with cluster size limits (see -limitclustersize). This option has no effect.</source>
+        <translation type="unfinished">A opção '-limitancestorsize' é fornecida, mas os limites de tamanho dos antepassados foram substituídos por limites de tamanho dos clusters (consulte -limitclustersize). Esta opção não tem efeito.</translation>
+    </message>
+    <message>
+        <source>Option '-limitdescendantsize' is given but descendant size limits have been replaced with cluster size limits (see -limitclustersize). This option has no effect.</source>
+        <translation type="unfinished">A opção '-limitdescendantsize' é fornecida, mas os limites de tamanho dos descendentes foram substituídos por limites de tamanho dos clusters (consulte -limitclustersize). Esta opção não tem efeito.</translation>
+    </message>
+    <message>
+        <source>Private broadcast of own transactions requested (-privatebroadcast) and -proxyrandomize is disabled. Tor circuits for private broadcast connections may be correlated to other connections over Tor. For maximum privacy set -proxyrandomize=1.</source>
+        <translation type="unfinished">Transmissão privada das suas próprias transações solicitada (-privatebroadcast) e -proxyrandomize desativado. Os circuitos Tor para ligações de transmissão privada podem estar correlacionados com outras ligações através do Tor. Para máxima privacidade, defina -proxyrandomize=1.</translation>
+    </message>
+    <message>
+        <source>Private broadcast of own transactions requested (-privatebroadcast), but -connect is also configured. They are incompatible because the private broadcast needs to open new connections to randomly chosen Tor or I2P peers. Consider using -maxconnections=0 -addnode=... instead</source>
+        <translation type="unfinished">Transmissão privada das próprias transações solicitada (-privatebroadcast), mas -connect também está configurado. Eles são incompatíveis porque a transmissão privada precisa abrir novas conexões com pares Tor ou I2P escolhidos aleatoriamente. Considere usar -maxconnections=0 -addnode=... em vez disso</translation>
+    </message>
+    <message>
+        <source>Private broadcast of own transactions requested (-privatebroadcast), but none of Tor or I2P networks is reachable</source>
+        <translation type="unfinished">Transmissão privada das próprias transações solicitada (-privatebroadcast), mas nenhuma das redes Tor ou I2P está acessível</translation>
+    </message>
     <message>
         <source>Prune cannot be configured with a negative value.</source>
         <translation type="unfinished">A redução (prune) não pode ser configurada com um valor negativo.</translation>
@@ -4714,6 +4802,10 @@ Não foi possível restaurar a cópia de segurança da carteira.</translation>
         <source>Prune mode is incompatible with -txindex.</source>
         <translation type="unfinished">O modo de redução (prune) é incompatível com -txindex.</translation>
     </message>
+    <message>
+        <source>Prune mode is incompatible with -txospenderindex.</source>
+        <translation type="unfinished">O modo prune é incompatível com -txospenderindex.</translation>
+    </message>
     <message>
         <source>Pruning blockstore…</source>
         <translation type="unfinished">Prunando os blocos existentes…</translation>
@@ -4796,11 +4888,11 @@ Não foi possível restaurar a cópia de segurança da carteira.</translation>
     </message>
     <message>
         <source>System error while loading external block file: %s</source>
-        <translation type="unfinished">Erro do sistema ao carregar o ficheiro de bloco externo: %s</translation>
+        <translation type="unfinished">Erro do sistema ao carregar arquivo de bloco externo: %s</translation>
     </message>
     <message>
         <source>System error while saving block to disk: %s</source>
-        <translation type="unfinished">Erro do sistema ao guardar o bloco no disco: %s</translation>
+        <translation type="unfinished">Erro do sistema ao salvar bloco no disco: %s</translation>
     </message>
     <message>
         <source>The %s path uses exFAT, which is known to have intermittent corruption problems on macOS. Move this directory to a different filesystem to avoid data loss.</source>
@@ -4808,19 +4900,23 @@ Não foi possível restaurar a cópia de segurança da carteira.</translation>
     </message>
     <message>
         <source>The source code is available from %s.</source>
-        <translation type="unfinished">O código fonte está disponível em %s.</translation>
+        <translation type="unfinished">O código-fonte está disponível em %s.</translation>
     </message>
     <message>
         <source>The specified config file %s does not exist</source>
         <translation type="unfinished">O ficheiro de configuração especificado %s não existe</translation>
     </message>
+    <message>
+        <source>The total exceeds your balance when the %s transaction fee is included.</source>
+        <translation type="unfinished">O total excede o seu saldo quando a taxa de transação %s é incluída.</translation>
+    </message>
     <message>
         <source>The transaction amount is too small to pay the fee</source>
-        <translation type="unfinished">O valor da transação é demasiado baixo para pagar a taxa</translation>
+        <translation type="unfinished">A quantia da transação é demasiado baixa para pagar a taxa</translation>
     </message>
     <message>
         <source>The transactions removal process can only be executed within a db txn</source>
-        <translation type="unfinished">O processo de remoção das transações só pode ser executado dentro de um db txn</translation>
+        <translation type="unfinished">O processo de remoção de transações só pode ser executado dentro de um db txn</translation>
     </message>
     <message>
         <source>The wallet will avoid paying less than the minimum relay fee.</source>
@@ -4832,15 +4928,11 @@ Não foi possível restaurar a cópia de segurança da carteira.</translation>
     </message>
     <message>
         <source>This is experimental software.</source>
-        <translation type="unfinished">É um programa experimental.</translation>
+        <translation type="unfinished">Isto é um software experimental.</translation>
     </message>
     <message>
         <source>This is the minimum transaction fee you pay on every transaction.</source>
-        <translation type="unfinished">É a taxa mínima de transação que paga em cada transação.</translation>
-    </message>
-    <message>
-        <source>This is the transaction fee you will pay if you send a transaction.</source>
-        <translation type="unfinished">É a taxa de transação que irá pagar se enviar uma transação.</translation>
+        <translation type="unfinished">Esta é a taxa mínima de transação que paga em cada transação.</translation>
     </message>
     <message>
         <source>Transaction %s does not belong to this wallet</source>
@@ -4848,7 +4940,7 @@ Não foi possível restaurar a cópia de segurança da carteira.</translation>
     </message>
     <message>
         <source>Transaction amount too small</source>
-        <translation type="unfinished">Valor de transação demasiado baixo</translation>
+        <translation type="unfinished">Quantia da transação demasiado baixa</translation>
     </message>
     <message>
         <source>Transaction amounts must not be negative</source>
@@ -4930,6 +5022,10 @@ Não foi possível restaurar a cópia de segurança da carteira.</translation>
         <source>Wallet file creation failed: %s</source>
         <translation type="unfinished">Falha na criação do ficheiro da carteira: %s</translation>
     </message>
+    <message>
+        <source>Warning: Found invalid chain more than 6 blocks longer than our best chain. This could be due to database corruption or consensus incompatibility with peers.</source>
+        <translation type="unfinished">Aviso: Encontrada cadeia inválida com mais de 6 blocos a mais do que a nossa melhor cadeia. Isso pode ser devido a corrupção da base de dados ou incompatibilidade de consenso com os pares.</translation>
+    </message>
     <message>
         <source>acceptstalefeeestimates is not supported on %s chain.</source>
         <translation type="unfinished">acceptstalefeeestimates não é suportado na cadeia %s.</translation>
diff --git a/src/qt/locale/bitcoin_pt_BR.ts b/src/qt/locale/bitcoin_pt_BR.ts
index c74e6f439033..17b5bc00f7ca 100644
--- a/src/qt/locale/bitcoin_pt_BR.ts
+++ b/src/qt/locale/bitcoin_pt_BR.ts
@@ -29,6 +29,10 @@
         <source>Enter address or label to search</source>
         <translation type="unfinished">Insira um endereço ou rótulo para buscar</translation>
     </message>
+    <message>
+        <source>Copy the currently selected address to the clipboard</source>
+        <translation type="unfinished">Copiar o endereço selecionado para a área de transferência</translation>
+    </message>
     <message>
         <source>Export the data in the current tab to a file</source>
         <translation type="unfinished">Exportar os dados do separador atual para um arquivo</translation>
@@ -47,11 +51,11 @@
     </message>
     <message>
         <source>Choose the address to receive coins with</source>
-        <translation type="unfinished">Escolha o endereço para receber moedas</translation>
+        <translation type="unfinished">Escolha o endereço para receber as moedas</translation>
     </message>
     <message>
         <source>C&amp;hoose</source>
-        <translation type="unfinished">E&amp;scolher</translation>
+        <translation type="unfinished">Escol&amp;her</translation>
     </message>
     <message>
         <source>These are your Bitcoin addresses for sending payments. Always check the amount and the receiving address before sending coins.</source>
@@ -129,11 +133,11 @@ Só é possível assinar com endereços do tipo 'legado'.</translation>
     </message>
     <message>
         <source>New passphrase</source>
-        <translation type="unfinished">Nova frase de segurança</translation>
+        <translation type="unfinished">senhasenha</translation>
     </message>
     <message>
         <source>Repeat new passphrase</source>
-        <translation type="unfinished">Repita a nova frase de segurança</translation>
+        <translation type="unfinished">senhasenha</translation>
     </message>
     <message>
         <source>Show passphrase</source>
@@ -332,6 +336,11 @@ Só é possível assinar com endereços do tipo 'legado'.</translation>
         <extracomment>An outbound connection to a peer. An outbound connection is a connection initiated by us.</extracomment>
         <translation type="unfinished">Saída</translation>
     </message>
+    <message>
+        <source>Private Broadcast</source>
+        <extracomment>Short-lived peer connection type that is used for broadcasting privacy-sensitive data.</extracomment>
+        <translation type="unfinished">Transmissão privada</translation>
+    </message>
     <message>
         <source>None</source>
         <translation type="unfinished">Nenhum</translation>
@@ -530,6 +539,10 @@ Só é possível assinar com endereços do tipo 'legado'.</translation>
         <source>Close All Wallets…</source>
         <translation type="unfinished">Fechar todas as Carteiras...</translation>
     </message>
+    <message>
+        <source>Restore and Migrate Wallet File…</source>
+        <translation type="unfinished">Restaurar e migrar arquivo da carteira...</translation>
+    </message>
     <message>
         <source>&amp;File</source>
         <translation type="unfinished">&amp;Arquivo</translation>
@@ -623,7 +636,7 @@ Só é possível assinar com endereços do tipo 'legado'.</translation>
     </message>
     <message>
         <source>Load Partially Signed Bitcoin Transaction</source>
-        <translation type="unfinished">Carregar</translation>
+        <translation type="unfinished">Carregar Transação de Bitcoin Parcialmente Assinada</translation>
     </message>
     <message>
         <source>Load PSBT from &amp;clipboard…</source>
@@ -718,6 +731,23 @@ Só é possível assinar com endereços do tipo 'legado'.</translation>
         <extracomment>Label of the input field where the name of the wallet is entered.</extracomment>
         <translation type="unfinished">Nome da Carteira</translation>
     </message>
+    <message>
+        <source>Invalid Wallet Name</source>
+        <translation type="unfinished">Nome da carteira inválido</translation>
+    </message>
+    <message>
+        <source>Wallet name cannot be empty</source>
+        <translation type="unfinished">O nome da carteira não pode estar vazio</translation>
+    </message>
+    <message>
+        <source>Restore and Migrate Wallet Backup</source>
+        <translation type="unfinished">Restaurar e migrar backup da carteira</translation>
+    </message>
+    <message>
+        <source>Restore and Migrate Wallet</source>
+        <extracomment>Title of pop-up window shown when the user is attempting to restore a wallet.</extracomment>
+        <translation type="unfinished">A restaurar e migrar carteira</translation>
+    </message>
     <message>
         <source>&amp;Window</source>
         <translation type="unfinished">&amp;Janelas</translation>
@@ -924,6 +954,18 @@ Só é possível assinar com endereços do tipo 'legado'.</translation>
         <source>Copy amount</source>
         <translation type="unfinished">Copiar quantia</translation>
     </message>
+    <message>
+        <source>&amp;Copy address</source>
+        <translation type="unfinished">&amp;Copiar endereço</translation>
+    </message>
+    <message>
+        <source>Copy &amp;label</source>
+        <translation type="unfinished">&amp;Copiar etiqueta</translation>
+    </message>
+    <message>
+        <source>Copy &amp;amount</source>
+        <translation type="unfinished">&amp;Copiar valor</translation>
+    </message>
     <message>
         <source>Copy transaction &amp;ID and output index</source>
         <translation type="unfinished">Copiar &amp;ID da transação e index do output</translation>
@@ -1053,6 +1095,40 @@ O processo de migração criará um backup da carteira antes da migração. Este
         <source>Solvable but not watched scripts have been migrated to a new wallet named '%1'.</source>
         <translation type="unfinished">Os guiões solucionáveis mas não observados foram migrados para uma nova pasta chamada '%1'.</translation>
     </message>
+    <message>
+        <source>Restore and Migrate wallet</source>
+        <translation type="unfinished">A restaurar e migrar carteira</translation>
+    </message>
+    <message>
+        <source>Are you sure you wish to restore the wallet file &lt;i&gt;%1&lt;/i&gt; to &lt;i&gt;%2&lt;/i&gt; and migrate it?</source>
+        <translation type="unfinished">Tem a certeza de que deseja restaurar o ficheiro da carteira &lt;i&gt;%1&lt;/i&gt; para &lt;i&gt;%2&lt;/i&gt; e migrá-lo?</translation>
+    </message>
+    <message>
+        <source>Restoring the wallet will copy the backup file to the wallets directory and place it in the standard wallet directory layout. The original file will not be modified.
+
+Migrating the wallet will convert the restored wallet to one or more descriptor wallets. A new wallet backup will need to be made.
+If this wallet contains any watchonly scripts, a new wallet will be created which contains those watchonly scripts.
+If this wallet contains any solvable but not watched scripts, a different and new wallet will be created which contains those scripts.
+
+The migration process will create a backup of the wallet before migrating. This backup file will be named &lt;wallet name&gt;-&lt;timestamp&gt;.legacy.bak and can be found in the directory for this wallet. In the event of an incorrect migration, the backup can be restored with the "Restore Wallet" functionality.</source>
+        <translation type="unfinished">A restauração da carteira copiará o ficheiro de backup para o diretório de carteiras e o colocará no layout padrão do diretório de carteiras. O ficheiro original não será modificado.
+
+A migração da carteira converterá a carteira restaurada em uma ou mais carteiras descritoras. Será necessário fazer um novo backup da carteira.
+Se esta carteira contiver quaisquer scripts watchonly, será criada uma nova carteira que contém esses scripts watchonly.
+Se esta carteira contiver quaisquer scripts solucionáveis, mas não vigiados, será criada uma carteira diferente e nova que contém esses scripts.
+
+O processo de migração criará um backup da carteira antes da migração. Este ficheiro de backup será nomeado &lt;wallet name&gt;-&lt;timestamp&gt;.legacy.bak e pode ser encontrado no diretório desta carteira. No caso de uma migração incorreta, o backup pode ser restaurado com a funcionalidade "Restaurar Carteira".</translation>
+    </message>
+    <message>
+        <source>Restore Wallet</source>
+        <extracomment>Title of progress window which is displayed when wallets are being restored.</extracomment>
+        <translation type="unfinished">Restaurar Carteira</translation>
+    </message>
+    <message>
+        <source>Restoring Wallet &lt;b&gt;%1&lt;/b&gt;…</source>
+        <extracomment>Descriptive text of the restore wallets progress window which indicates to the user that wallets are currently being restored.</extracomment>
+        <translation type="unfinished">Restaurando Carteira &lt;b&gt;%1&lt;/b&gt;...</translation>
+    </message>
     <message>
         <source>Migration failed</source>
         <translation type="unfinished">Falha na migração</translation>
@@ -1177,8 +1253,8 @@ O processo de migração criará um backup da carteira antes da migração. Este
         <translation type="unfinished">Desabilitar Chaves Privadas</translation>
     </message>
     <message>
-        <source>Make a blank wallet. Blank wallets do not initially have private keys or scripts. Private keys and addresses can be imported, or an HD seed can be set, at a later time.</source>
-        <translation type="unfinished">Criar uma carteira vazia. Carteiras vazias não possuem inicialmente chaves privadas ou scripts. Chaves privadas ou endereços podem ser importados, ou um conjunto de palavras "seed HD" pode ser definidos, posteriormente.</translation>
+        <source>Make a blank wallet. Blank wallets do not initially have private keys or scripts. Private keys and addresses can be imported using descriptors at a later time.</source>
+        <translation type="unfinished">Cria uma carteira em branco. As carteiras em branco não têm inicialmente chaves privadas ou scripts. As chaves privadas e os endereços podem ser importados posteriormente utilizando descritores.</translation>
     </message>
     <message>
         <source>Make Blank Wallet</source>
@@ -1870,9 +1946,12 @@ O processo de migração criará um backup da carteira antes da migração. Este
         <source>Could not sign any more inputs.</source>
         <translation type="unfinished">Não foi possível assinar mais nenhuma entrada.</translation>
     </message>
-    <message>
-        <source>Signed %1 inputs, but more signatures are still required.</source>
-        <translation type="unfinished">Assinou %1 entradas, mas ainda são necessárias mais assinaturas.</translation>
+    <message numerus="yes">
+        <source>Signed %n input(s), but more signatures are still required.</source>
+        <translation type="unfinished">
+            <numerusform>Assinou %n entrada, mas ainda são necessárias mais assinaturas.</numerusform>
+            <numerusform>Assinou %n entradas, mas ainda são necessárias mais assinaturas.</numerusform>
+        </translation>
     </message>
     <message>
         <source>Signed transaction successfully. Transaction is ready to broadcast.</source>
@@ -1926,9 +2005,12 @@ O processo de migração criará um backup da carteira antes da migração. Este
         <source>or</source>
         <translation type="unfinished">ou</translation>
     </message>
-    <message>
-        <source>Transaction has %1 unsigned inputs.</source>
-        <translation type="unfinished">Transação possui %1 entradas não assinadas.</translation>
+    <message numerus="yes">
+        <source>Transaction has %n unsigned input(s).</source>
+        <translation type="unfinished">
+            <numerusform>A transação tem %n entrada não assinada.</numerusform>
+            <numerusform>A transação tem %n entradas não assinadas.</numerusform>
+        </translation>
     </message>
     <message>
         <source>Transaction is missing some information about inputs.</source>
@@ -2196,10 +2278,6 @@ O processo de migração criará um backup da carteira antes da migração. Este
         <source>Transaction Relay</source>
         <translation type="unfinished">Retransmissão de transação</translation>
     </message>
-    <message>
-        <source>Starting Block</source>
-        <translation type="unfinished">Bloco Inicial</translation>
-    </message>
     <message>
         <source>Synced Headers</source>
         <translation type="unfinished">Cabeçalhos Sincronizados</translation>
@@ -2346,6 +2424,11 @@ O processo de migração criará um backup da carteira antes da migração. Este
         <source>Out:</source>
         <translation type="unfinished">Saída:</translation>
     </message>
+    <message>
+        <source>Private broadcast: short-lived, for broadcasting privacy-sensitive transactions</source>
+        <extracomment>Explanatory text for a short-lived outbound peer connection that is used to broadcast privacy-sensitive data (like our transactions).</extracomment>
+        <translation type="unfinished">Transmissão privada: de curta duração, para transmissão de transações confidenciais</translation>
+    </message>
     <message>
         <source>detecting: peer could be v1 or v2</source>
         <extracomment>Explanatory text for "detecting" transport type.</extracomment>
@@ -2556,14 +2639,6 @@ Para mais informações sobre a utilização desse console. digite %6.
         <source>&amp;Copy address</source>
         <translation type="unfinished">&amp;Copiar endereço</translation>
     </message>
-    <message>
-        <source>Copy &amp;label</source>
-        <translation type="unfinished">&amp;Copiar etiqueta</translation>
-    </message>
-    <message>
-        <source>Copy &amp;amount</source>
-        <translation type="unfinished">&amp;Copiar valor</translation>
-    </message>
     <message>
         <source>Not recommended due to higher fees and less protection against typos.</source>
         <translation type="unfinished">Não recomendado devido a taxas mais altas e menor proteção contra erros de digitação.</translation>
@@ -2948,10 +3023,6 @@ Nota: Como a taxa é calculada por byte, uma taxa de "100 satoshis por kvB" para
         <source>The amount exceeds your balance.</source>
         <translation type="unfinished">A quantia excede o seu saldo.</translation>
     </message>
-    <message>
-        <source>The total exceeds your balance when the %1 transaction fee is included.</source>
-        <translation type="unfinished">O total excede o seu saldo quando a taxa da transação %1 é incluída.</translation>
-    </message>
     <message>
         <source>Duplicate address found: addresses should only be used once each.</source>
         <translation type="unfinished">Endereço duplicado encontrado: Endereços devem ser usados somente uma vez cada.</translation>
@@ -3697,7 +3768,7 @@ Go to File &gt; Open Wallet to load a wallet.
     </message>
     <message>
         <source>Export the data in the current tab to a file</source>
-        <translation type="unfinished">Exportar os dados do separador atual para um arquivo</translation>
+        <translation type="unfinished">Exportar os dados no separador atual para um ficheiro</translation>
     </message>
     <message>
         <source>Backup Wallet</source>
@@ -3838,10 +3909,6 @@ Go to File &gt; Open Wallet to load a wallet.
         <source>Warning: Private keys detected in wallet {%s} with disabled private keys</source>
         <translation type="unfinished">Aviso: Chaves privadas detectadas na carteira {%s} com chaves privadas desativadas</translation>
     </message>
-    <message>
-        <source>Warning: We do not appear to fully agree with our peers! You may need to upgrade, or other nodes may need to upgrade.</source>
-        <translation type="unfinished">Atenção: Nós não parecemos concordar plenamente com nossos nós! Você pode precisar atualizar ou outros nós podem precisar atualizar.</translation>
-    </message>
     <message>
         <source>Witness data for blocks after height %d requires validation. Please restart with -reindex.</source>
         <translation type="unfinished">Testemunhar dados de blocos após 1%d requer validação. Por favor reinicie com -reindex.</translation>
@@ -4070,6 +4137,10 @@ Impossível restaurar backup da carteira.</translation>
         <source>Could not parse asmap file %s</source>
         <translation type="unfinished">O arquivo asmap %s não pode ser analisado</translation>
     </message>
+    <message>
+        <source>Could not read embedded asmap data</source>
+        <translation type="unfinished">Não foi possível ler os dados asmap embutidos</translation>
+    </message>
     <message>
         <source>Disk space is too low!</source>
         <translation type="unfinished">Espaço em disco insuficiente!</translation>
@@ -4082,6 +4153,10 @@ Impossível restaurar backup da carteira.</translation>
         <source>Elliptic curve cryptography sanity check failure. %s is shutting down.</source>
         <translation type="unfinished">Falha na verificação de integridade da criptografia de curva elíptica. %s está sendo desligado.</translation>
     </message>
+    <message>
+        <source>Embedded asmap data not available</source>
+        <translation type="unfinished">Dados asmap embutidos não disponíveis</translation>
+    </message>
     <message>
         <source>Error initializing block database</source>
         <translation type="unfinished">Erro ao inicializar banco de dados de blocos</translation>
@@ -4090,10 +4165,6 @@ Impossível restaurar backup da carteira.</translation>
         <source>Error loading %s</source>
         <translation type="unfinished">Erro ao carregar %s</translation>
     </message>
-    <message>
-        <source>Error loading %s: Private keys can only be disabled during creation</source>
-        <translation type="unfinished">Erro ao carregar %s: Chaves privadas só podem ser desativadas durante a criação</translation>
-    </message>
     <message>
         <source>Error loading %s: Wallet corrupted</source>
         <translation type="unfinished">Erro ao carregar %s Carteira corrompida</translation>
@@ -4191,10 +4262,6 @@ Impossível restaurar backup da carteira.</translation>
         <source>Error: database transaction cannot be executed for wallet %s</source>
         <translation type="unfinished">Erro: a transação do banco de dados não pode ser executada para a carteira %s</translation>
     </message>
-    <message>
-        <source>Failed to connect best block (%s).</source>
-        <translation type="unfinished">Falha ao conectar o melhor bloco (%s).</translation>
-    </message>
     <message>
         <source>Failed to disconnect block.</source>
         <translation type="unfinished">Falha ao desconectar o bloco.</translation>
@@ -4219,14 +4286,6 @@ Impossível restaurar backup da carteira.</translation>
         <source>Failed to write block.</source>
         <translation type="unfinished">Falha ao escrever bloco.</translation>
     </message>
-    <message>
-        <source>Failed to write to block index database.</source>
-        <translation type="unfinished">Falha ao escrever na base de dados de índices de blocos.</translation>
-    </message>
-    <message>
-        <source>Failed to write to coin database.</source>
-        <translation type="unfinished">Falha ao escrever na base de dados de moedas.</translation>
-    </message>
     <message>
         <source>Failed to write undo data.</source>
         <translation type="unfinished">Falha ao escrever dados de anulação.</translation>
@@ -4275,14 +4334,26 @@ Impossível restaurar backup da carteira.</translation>
         <source>Invalid P2P permission: '%s'</source>
         <translation type="unfinished">Permissão P2P inválida: '%s'</translation>
     </message>
-    <message>
-        <source>Invalid amount for %s=&lt;amount&gt;: '%s' (must be at least %s)</source>
-        <translation type="unfinished">Valor inválido para %s=&lt;amount&gt;: '%s' (precisa ser no mínimo %s)</translation>
-    </message>
     <message>
         <source>Invalid amount for %s=&lt;amount&gt;: '%s'</source>
         <translation type="unfinished">Valor inválido para %s=&lt;amount&gt;: '%s'</translation>
     </message>
+    <message>
+        <source>A %zu MiB dbcache may be too large for a system memory of only %zu MiB.</source>
+        <translation type="unfinished">Um %zu MiB dbcache pode ser demasiado grande para uma memória de sistema de apenas %zu MiB.</translation>
+    </message>
+    <message>
+        <source>Creating wallet…</source>
+        <translation type="unfinished">A criar carteira...</translation>
+    </message>
+    <message>
+        <source>Duplicate binding configuration for address %s. Please check your -bind, -bind=...=onion and -whitebind settings.</source>
+        <translation type="unfinished">Configuração de ligação duplicada para o endereço %s. Verifique as suas definições -bind, -bind=...=onion e -whitebind.</translation>
+    </message>
+    <message>
+        <source>Error creating %s: Could not write version metadata.</source>
+        <translation type="unfinished">Erro ao criar %s: Não foi possível gravar os metadados da versão.</translation>
+    </message>
     <message>
         <source>Invalid amount for -%s=&lt;amount&gt;: '%s'</source>
         <translation type="unfinished">Quantidade inválida para -%s=&lt;amount&gt;: '%s'</translation>
@@ -4347,6 +4418,26 @@ Impossível restaurar backup da carteira.</translation>
         <source>Only direction was set, no permissions: '%s'</source>
         <translation type="unfinished">Apenas a direção foi definida, sem permissões: '%s'</translation>
     </message>
+    <message>
+        <source>Option '-limitancestorsize' is given but ancestor size limits have been replaced with cluster size limits (see -limitclustersize). This option has no effect.</source>
+        <translation type="unfinished">A opção '-limitancestorsize' é fornecida, mas os limites de tamanho dos antepassados foram substituídos por limites de tamanho dos clusters (consulte -limitclustersize). Esta opção não tem efeito.</translation>
+    </message>
+    <message>
+        <source>Option '-limitdescendantsize' is given but descendant size limits have been replaced with cluster size limits (see -limitclustersize). This option has no effect.</source>
+        <translation type="unfinished">A opção '-limitdescendantsize' é fornecida, mas os limites de tamanho dos descendentes foram substituídos por limites de tamanho dos clusters (consulte -limitclustersize). Esta opção não tem efeito.</translation>
+    </message>
+    <message>
+        <source>Private broadcast of own transactions requested (-privatebroadcast) and -proxyrandomize is disabled. Tor circuits for private broadcast connections may be correlated to other connections over Tor. For maximum privacy set -proxyrandomize=1.</source>
+        <translation type="unfinished">Transmissão privada das suas próprias transações solicitada (-privatebroadcast) e -proxyrandomize desativado. Os circuitos Tor para ligações de transmissão privada podem estar correlacionados com outras ligações através do Tor. Para máxima privacidade, defina -proxyrandomize=1.</translation>
+    </message>
+    <message>
+        <source>Private broadcast of own transactions requested (-privatebroadcast), but -connect is also configured. They are incompatible because the private broadcast needs to open new connections to randomly chosen Tor or I2P peers. Consider using -maxconnections=0 -addnode=... instead</source>
+        <translation type="unfinished">Transmissão privada das próprias transações solicitada (-privatebroadcast), mas -connect também está configurado. Eles são incompatíveis porque a transmissão privada precisa abrir novas conexões com pares Tor ou I2P escolhidos aleatoriamente. Considere usar -maxconnections=0 -addnode=... em vez disso</translation>
+    </message>
+    <message>
+        <source>Private broadcast of own transactions requested (-privatebroadcast), but none of Tor or I2P networks is reachable</source>
+        <translation type="unfinished">Transmissão privada das próprias transações solicitada (-privatebroadcast), mas nenhuma das redes Tor ou I2P está acessível</translation>
+    </message>
     <message>
         <source>Prune cannot be configured with a negative value.</source>
         <translation type="unfinished">O modo prune não pode ser configurado com um valor negativo.</translation>
@@ -4355,6 +4446,10 @@ Impossível restaurar backup da carteira.</translation>
         <source>Prune mode is incompatible with -txindex.</source>
         <translation type="unfinished">O modo prune é incompatível com -txindex.</translation>
     </message>
+    <message>
+        <source>Prune mode is incompatible with -txospenderindex.</source>
+        <translation type="unfinished">O modo prune é incompatível com -txospenderindex.</translation>
+    </message>
     <message>
         <source>Pruning blockstore…</source>
         <translation type="unfinished">Prunando os blocos existentes...</translation>
@@ -4452,6 +4547,10 @@ Impossível restaurar backup da carteira.</translation>
         <source>The source code is available from %s.</source>
         <translation type="unfinished">O código fonte está disponível pelo %s.</translation>
     </message>
+    <message>
+        <source>The total exceeds your balance when the %s transaction fee is included.</source>
+        <translation type="unfinished">O total excede o seu saldo quando a taxa de transação %s é incluída.</translation>
+    </message>
     <message>
         <source>The transaction amount is too small to pay the fee</source>
         <translation type="unfinished">A quantidade da transação é pequena demais para  pagar a taxa</translation>
@@ -4476,10 +4575,6 @@ Impossível restaurar backup da carteira.</translation>
         <source>This is the minimum transaction fee you pay on every transaction.</source>
         <translation type="unfinished">Esta é a taxa mínima que você paga em todas as transações.</translation>
     </message>
-    <message>
-        <source>This is the transaction fee you will pay if you send a transaction.</source>
-        <translation type="unfinished">Esta é a taxa que você irá pagar se enviar uma transação.</translation>
-    </message>
     <message>
         <source>Transaction %s does not belong to this wallet</source>
         <translation type="unfinished">A transação %s não pertence a esta carteira.</translation>
@@ -4560,6 +4655,10 @@ Impossível restaurar backup da carteira.</translation>
         <source>Wallet file creation failed: %s</source>
         <translation type="unfinished">falha na criação do ficheiro da pasta: %s</translation>
     </message>
+    <message>
+        <source>Warning: Found invalid chain more than 6 blocks longer than our best chain. This could be due to database corruption or consensus incompatibility with peers.</source>
+        <translation type="unfinished">Aviso: Encontrada cadeia inválida com mais de 6 blocos a mais do que a nossa melhor cadeia. Isso pode ser devido a corrupção da base de dados ou incompatibilidade de consenso com os pares.</translation>
+    </message>
     <message>
         <source>acceptstalefeeestimates is not supported on %s chain.</source>
         <translation type="unfinished">acceptstalefeeestimates não é suportado na cadeia %s.</translation>
diff --git a/src/qt/locale/bitcoin_ro.ts b/src/qt/locale/bitcoin_ro.ts
index 1fcea30b0710..943d330a8981 100644
--- a/src/qt/locale/bitcoin_ro.ts
+++ b/src/qt/locale/bitcoin_ro.ts
@@ -29,6 +29,10 @@
         <source>Enter address or label to search</source>
         <translation type="unfinished">Introduceţi adresa sau eticheta pentru căutare</translation>
     </message>
+    <message>
+        <source>Copy the currently selected address to the clipboard</source>
+        <translation type="unfinished">Copiază adresa selectată curent în clipboard</translation>
+    </message>
     <message>
         <source>Export the data in the current tab to a file</source>
         <translation type="unfinished">Exportă datele din tab-ul curent într-un fişier</translation>
@@ -604,9 +608,9 @@ Semnarea este posibilă numai cu adrese de tip "legacy".</translation>
     <message numerus="yes">
         <source>Processed %n block(s) of transaction history.</source>
         <translation type="unfinished">
-            <numerusform />
-            <numerusform />
-            <numerusform />
+            <numerusform>S-a procesat %nbloc din istoricul tranzacțiilor.</numerusform>
+            <numerusform>S-au procesat %n blocuri din istoria tranzacțiilor.</numerusform>
+            <numerusform>S-au procesat %n blocuri din istoria tranzacțiilor.</numerusform>
         </translation>
     </message>
     <message>
@@ -1075,6 +1079,16 @@ Semnarea este posibilă numai cu adrese de tip "legacy".</translation>
         <source>The wallet '%1' was migrated successfully.</source>
         <translation type="unfinished">Portofelul '%1' a fost migrat cu succes.</translation>
     </message>
+    <message>
+        <source>Restore Wallet</source>
+        <extracomment>Title of progress window which is displayed when wallets are being restored.</extracomment>
+        <translation type="unfinished">Restaurare portofel</translation>
+    </message>
+    <message>
+        <source>Restoring Wallet &lt;b&gt;%1&lt;/b&gt;…</source>
+        <extracomment>Descriptive text of the restore wallets progress window which indicates to the user that wallets are currently being restored.</extracomment>
+        <translation type="unfinished">Restabilirea Portofelului&lt;b&gt;%1&lt;/b&gt;</translation>
+    </message>
     <message>
         <source>Migration failed</source>
         <translation type="unfinished">Mutare esuata</translation>
@@ -1792,6 +1806,14 @@ Semnarea este posibilă numai cu adrese de tip "legacy".</translation>
         <source>Could not sign any more inputs.</source>
         <translation type="unfinished">Nu s-au mai putut semna alte intrări.</translation>
     </message>
+    <message numerus="yes">
+        <source>Signed %n input(s), but more signatures are still required.</source>
+        <translation type="unfinished">
+            <numerusform />
+            <numerusform />
+            <numerusform />
+        </translation>
+    </message>
     <message>
         <source>Unknown error processing transaction.</source>
         <translation type="unfinished">Eroare necunoscută la procesarea tranzacției.</translation>
@@ -1829,9 +1851,13 @@ Semnarea este posibilă numai cu adrese de tip "legacy".</translation>
         <source>or</source>
         <translation type="unfinished">sau</translation>
     </message>
-    <message>
-        <source>Transaction has %1 unsigned inputs.</source>
-        <translation type="unfinished">Tranzacția are %1 intrări nesemnate.</translation>
+    <message numerus="yes">
+        <source>Transaction has %n unsigned input(s).</source>
+        <translation type="unfinished">
+            <numerusform />
+            <numerusform />
+            <numerusform />
+        </translation>
     </message>
     <message>
         <source>Transaction still needs signature(s).</source>
@@ -2061,10 +2087,6 @@ Semnarea este posibilă numai cu adrese de tip "legacy".</translation>
         <source>Version</source>
         <translation type="unfinished">Versiune</translation>
     </message>
-    <message>
-        <source>Starting Block</source>
-        <translation type="unfinished">Bloc de început</translation>
-    </message>
     <message>
         <source>Synced Headers</source>
         <translation type="unfinished">Headere Sincronizate</translation>
@@ -2429,7 +2451,7 @@ Pentru mai multe informații privind folosirea consolei, tastează %6.
     <name>RecentRequestsTableModel</name>
     <message>
         <source>Date</source>
-        <translation type="unfinished">Dată</translation>
+        <translation type="unfinished">Data</translation>
     </message>
     <message>
         <source>Label</source>
@@ -2710,10 +2732,6 @@ Pentru mai multe informații privind folosirea consolei, tastează %6.
         <source>The amount exceeds your balance.</source>
         <translation type="unfinished">Suma depăşeşte soldul contului.</translation>
     </message>
-    <message>
-        <source>The total exceeds your balance when the %1 transaction fee is included.</source>
-        <translation type="unfinished">Totalul depăşeşte soldul contului dacă se include şi plata taxei de %1.</translation>
-    </message>
     <message>
         <source>Duplicate address found: addresses should only be used once each.</source>
         <translation type="unfinished">Adresă duplicat găsită: fiecare adresă ar trebui folosită o singură dată.</translation>
@@ -2991,7 +3009,7 @@ Pentru mai multe informații privind folosirea consolei, tastează %6.
     </message>
     <message>
         <source>Date</source>
-        <translation type="unfinished">Dată</translation>
+        <translation type="unfinished">Data</translation>
     </message>
     <message>
         <source>Source</source>
@@ -3117,7 +3135,7 @@ Pentru mai multe informații privind folosirea consolei, tastează %6.
     <name>TransactionTableModel</name>
     <message>
         <source>Date</source>
-        <translation type="unfinished">Dată</translation>
+        <translation type="unfinished">Data</translation>
     </message>
     <message>
         <source>Type</source>
@@ -3277,7 +3295,7 @@ Pentru mai multe informații privind folosirea consolei, tastează %6.
     <message>
         <source>Show in %1</source>
         <extracomment>Transactions table context menu action to show the selected transaction in a third-party block explorer. %1 is a stand-in argument for the URL of the explorer.</extracomment>
-        <translation type="unfinished">Arată in %1</translation>
+        <translation type="unfinished">Arata in %1</translation>
     </message>
     <message>
         <source>Export Transaction History</source>
@@ -3294,7 +3312,7 @@ Pentru mai multe informații privind folosirea consolei, tastează %6.
     </message>
     <message>
         <source>Date</source>
-        <translation type="unfinished">Dată</translation>
+        <translation type="unfinished">Data</translation>
     </message>
     <message>
         <source>Type</source>
@@ -3310,7 +3328,7 @@ Pentru mai multe informații privind folosirea consolei, tastează %6.
     </message>
     <message>
         <source>Exporting Failed</source>
-        <translation type="unfinished">Export nereușit</translation>
+        <translation type="unfinished">Export nereusit</translation>
     </message>
     <message>
         <source>There was an error trying to save the transaction history to %1.</source>
@@ -3502,10 +3520,6 @@ Mergi la Fisiere&gt;Deschide Portofel ca sa incarci un portofel.
         <source>Warning: Private keys detected in wallet {%s} with disabled private keys</source>
         <translation type="unfinished">Atentie: S-au detectat chei private in portofelul {%s} cu cheile private dezactivate</translation>
     </message>
-    <message>
-        <source>Warning: We do not appear to fully agree with our peers! You may need to upgrade, or other nodes may need to upgrade.</source>
-        <translation type="unfinished">Atenţie: Aparent, nu suntem de acord cu toţi partenerii noştri! Va trebui să faceţi o actualizare, sau alte noduri necesită actualizare.</translation>
-    </message>
     <message>
         <source>You need to rebuild the database using -reindex to go back to unpruned mode.  This will redownload the entire blockchain</source>
         <translation type="unfinished">Trebuie reconstruita intreaga baza de date folosind -reindex pentru a va intoarce la modul non-redus. Aceasta va determina descarcarea din nou a intregului blockchain</translation>
@@ -3552,10 +3566,6 @@ Restaurarea copiei de rezervă a portofelului a eșuat.</translation>
         <source>Done loading</source>
         <translation type="unfinished">Încărcare terminată</translation>
     </message>
-    <message>
-        <source>Error creating %s</source>
-        <translation type="unfinished">Eroare creând %s</translation>
-    </message>
     <message>
         <source>Error initializing block database</source>
         <translation type="unfinished">Eroare la iniţializarea bazei de date de blocuri</translation>
@@ -3564,10 +3574,6 @@ Restaurarea copiei de rezervă a portofelului a eșuat.</translation>
         <source>Error loading %s</source>
         <translation type="unfinished">Eroare la încărcarea %s</translation>
     </message>
-    <message>
-        <source>Error loading %s: Private keys can only be disabled during creation</source>
-        <translation type="unfinished">Eroare la incarcarea %s: Cheile private pot fi dezactivate doar in momentul crearii</translation>
-    </message>
     <message>
         <source>Error loading %s: Wallet corrupted</source>
         <translation type="unfinished">Eroare la încărcarea %s: Portofel corupt</translation>
@@ -3600,10 +3606,6 @@ Restaurarea copiei de rezervă a portofelului a eșuat.</translation>
         <source>Error: Disk space is low for %s</source>
         <translation type="unfinished">Eroare: Spațiul pe disc este redus pentru %s</translation>
     </message>
-    <message>
-        <source>Failed to connect best block (%s).</source>
-        <translation type="unfinished">Conectarea celui mai bun bloc a eșuat (%s).</translation>
-    </message>
     <message>
         <source>Failed to disconnect block.</source>
         <translation type="unfinished">Deconectarea blocului a eșuat.</translation>
@@ -3628,10 +3630,6 @@ Restaurarea copiei de rezervă a portofelului a eșuat.</translation>
         <source>Failed to write block.</source>
         <translation type="unfinished">Scrierea blocului a eșuat.</translation>
     </message>
-    <message>
-        <source>Failed to write to coin database.</source>
-        <translation type="unfinished">Scrierea la baza de date a monedei a eșuat.</translation>
-    </message>
     <message>
         <source>Failed to write undo data.</source>
         <translation type="unfinished">Scrierea datelor de anulare a eșuat.</translation>
@@ -3760,10 +3758,6 @@ Restaurarea copiei de rezervă a portofelului a eșuat.</translation>
         <source>This is the minimum transaction fee you pay on every transaction.</source>
         <translation type="unfinished">Acesta este minimum de taxa de tranzactie care va fi platit la fiecare tranzactie.</translation>
     </message>
-    <message>
-        <source>This is the transaction fee you will pay if you send a transaction.</source>
-        <translation type="unfinished">Aceasta este taxa de tranzactie pe care o platiti cand trimiteti o tranzactie.</translation>
-    </message>
     <message>
         <source>Transaction %s does not belong to this wallet</source>
         <translation type="unfinished">Tranzacția %s nu aparține acestui portofel</translation>
diff --git a/src/qt/locale/bitcoin_ru.ts b/src/qt/locale/bitcoin_ru.ts
index 33dc95bde5b1..38270c405037 100644
--- a/src/qt/locale/bitcoin_ru.ts
+++ b/src/qt/locale/bitcoin_ru.ts
@@ -318,52 +318,15 @@ Signing is only possible with addresses of the type 'legacy'.</source>
         <source>Custom…</source>
         <translation type="unfinished">Пользовательское значение...</translation>
     </message>
-    <message>
-        <source>Amount</source>
-        <translation type="unfinished">Сумма</translation>
-    </message>
-    <message>
-        <source>Enter a Bitcoin address (e.g. %1)</source>
-        <translation type="unfinished">Введите биткоин-адрес (например,%1)</translation>
-    </message>
-    <message>
-        <source>Unroutable</source>
-        <translation type="unfinished">Немаршрутизируемый</translation>
-    </message>
-    <message>
-        <source>Inbound</source>
-        <extracomment>An inbound connection from a peer. An inbound connection is a connection initiated by a peer.</extracomment>
-        <translation type="unfinished">Входящий</translation>
-    </message>
-    <message>
-        <source>Outbound</source>
-        <extracomment>An outbound connection to a peer. An outbound connection is a connection initiated by us.</extracomment>
-        <translation type="unfinished">Исходящий</translation>
-    </message>
-    <message>
-        <source>Full Relay</source>
-        <extracomment>Peer connection type that relays all network information.</extracomment>
-        <translation type="unfinished">Полный ретранслятор</translation>
-    </message>
-    <message>
-        <source>Block Relay</source>
-        <extracomment>Peer connection type that relays network information about blocks and not transactions or addresses.</extracomment>
-        <translation type="unfinished">Ретранслятор блоков</translation>
-    </message>
     <message>
         <source>Manual</source>
         <extracomment>Peer connection type established manually through one of several methods.</extracomment>
         <translation type="unfinished">Вручную</translation>
     </message>
     <message>
-        <source>Feeler</source>
-        <extracomment>Short-lived peer connection type that tests the aliveness of known addresses.</extracomment>
-        <translation type="unfinished">Пробный</translation>
-    </message>
-    <message>
-        <source>Address Fetch</source>
-        <extracomment>Short-lived peer connection type that solicits known addresses from a peer.</extracomment>
-        <translation type="unfinished">Получение адресов</translation>
+        <source>Private Broadcast</source>
+        <extracomment>Short-lived peer connection type that is used for broadcasting privacy-sensitive data.</extracomment>
+        <translation type="unfinished">Конфеденциальная трансляции транзакций</translation>
     </message>
     <message>
         <source>%1 d</source>
@@ -385,10 +348,6 @@ Signing is only possible with addresses of the type 'legacy'.</source>
         <source>None</source>
         <translation type="unfinished">Нет</translation>
     </message>
-    <message>
-        <source>N/A</source>
-        <translation type="unfinished">Н/д</translation>
-    </message>
     <message>
         <source>%1 ms</source>
         <translation type="unfinished">%1 мс</translation>
@@ -643,23 +602,23 @@ Signing is only possible with addresses of the type 'legacy'.</source>
     </message>
     <message>
         <source>Connecting to peers…</source>
-        <translation type="unfinished">Подключение к узлам…</translation>
+        <translation type="unfinished">Подключение к узлам...</translation>
     </message>
     <message>
         <source>Request payments (generates QR codes and bitcoin: URIs)</source>
-        <translation type="unfinished">Запросить платёж (генерирует QR-коды и URI протокола bitcoin:)</translation>
+        <translation type="unfinished">Запросить платеж (генерирует QR коды и bitcoin: URIs)</translation>
     </message>
     <message>
         <source>Show the list of used sending addresses and labels</source>
-        <translation type="unfinished">Показать список использованных адресов отправки и меток</translation>
+        <translation type="unfinished">Показать список адресов, на которые были отправлены средства, и их меток</translation>
     </message>
     <message>
         <source>Show the list of used receiving addresses and labels</source>
-        <translation type="unfinished">Показать список использованных адресов получения и меток</translation>
+        <translation type="unfinished">Показать список адресов, на которые были получены средства, и их меток</translation>
     </message>
     <message>
         <source>&amp;Command-line options</source>
-        <translation type="unfinished">&amp;Параметры командной строки</translation>
+        <translation type="unfinished">Параметры командной строки</translation>
     </message>
     <message numerus="yes">
         <source>Processed %n block(s) of transaction history.</source>
@@ -675,7 +634,7 @@ Signing is only possible with addresses of the type 'legacy'.</source>
     </message>
     <message>
         <source>Catching up…</source>
-        <translation type="unfinished">Синхронизация…</translation>
+        <translation type="unfinished">Синхронизация...</translation>
     </message>
     <message>
         <source>Last received block was generated %1 ago.</source>
@@ -699,11 +658,11 @@ Signing is only possible with addresses of the type 'legacy'.</source>
     </message>
     <message>
         <source>Up to date</source>
-        <translation type="unfinished">Синхронизированно</translation>
+        <translation type="unfinished">Синхронизировано</translation>
     </message>
     <message>
         <source>Load Partially Signed Bitcoin Transaction</source>
-        <translation type="unfinished">Загрузить частично подписанную биткоин-транзакцию (PSBT)</translation>
+        <translation type="unfinished">Загрузить частично подписанные биткоин-транзакции (PSBT)</translation>
     </message>
     <message>
         <source>Load PSBT from &amp;clipboard…</source>
@@ -803,6 +762,23 @@ Signing is only possible with addresses of the type 'legacy'.</source>
         <extracomment>Label of the input field where the name of the wallet is entered.</extracomment>
         <translation type="unfinished">Название кошелька</translation>
     </message>
+    <message>
+        <source>Invalid Wallet Name</source>
+        <translation type="unfinished">Неверное название кошелька</translation>
+    </message>
+    <message>
+        <source>Wallet name cannot be empty</source>
+        <translation type="unfinished">Название кошелька не может быть пустым</translation>
+    </message>
+    <message>
+        <source>Restore and Migrate Wallet Backup</source>
+        <translation type="unfinished">Восстановить и Перенести резервную копию кошелька</translation>
+    </message>
+    <message>
+        <source>Restore and Migrate Wallet</source>
+        <extracomment>Title of pop-up window shown when the user is attempting to restore a wallet.</extracomment>
+        <translation type="unfinished">Восстановить или Перенести кошелек</translation>
+    </message>
     <message>
         <source>&amp;Window</source>
         <translation type="unfinished">&amp;Окно</translation>
@@ -906,7 +882,7 @@ Signing is only possible with addresses of the type 'legacy'.</source>
     </message>
     <message>
         <source>Sent transaction</source>
-        <translation type="unfinished">Исходящая транзакция</translation>
+        <translation type="unfinished">Отправленная транзакция</translation>
     </message>
     <message>
         <source>Incoming transaction</source>
@@ -958,10 +934,6 @@ Signing is only possible with addresses of the type 'legacy'.</source>
         <source>Fee:</source>
         <translation type="unfinished">Комиссия:</translation>
     </message>
-    <message>
-        <source>After Fee:</source>
-        <translation type="unfinished">После комиссии:</translation>
-    </message>
     <message>
         <source>Change:</source>
         <translation type="unfinished">Сдача:</translation>
@@ -990,10 +962,6 @@ Signing is only possible with addresses of the type 'legacy'.</source>
         <source>Received with address</source>
         <translation type="unfinished">Получено на адрес</translation>
     </message>
-    <message>
-        <source>Date</source>
-        <translation type="unfinished">Дата</translation>
-    </message>
     <message>
         <source>Confirmations</source>
         <translation type="unfinished">Подтверждений</translation>
@@ -1155,6 +1123,20 @@ The migration process will create a backup of the wallet before migrating. This
         <source>Solvable but not watched scripts have been migrated to a new wallet named '%1'.</source>
         <translation type="unfinished">Решаемые, но не отслеживаемые скрипты были перемещены в новый кошелек с именем '%1'.</translation>
     </message>
+    <message>
+        <source>Restore and Migrate wallet</source>
+        <translation type="unfinished">Восстановить или Перенести кошелек</translation>
+    </message>
+    <message>
+        <source>Restore Wallet</source>
+        <extracomment>Title of progress window which is displayed when wallets are being restored.</extracomment>
+        <translation type="unfinished">Восстановление кошелька</translation>
+    </message>
+    <message>
+        <source>Restoring Wallet &lt;b&gt;%1&lt;/b&gt;…</source>
+        <extracomment>Descriptive text of the restore wallets progress window which indicates to the user that wallets are currently being restored.</extracomment>
+        <translation type="unfinished">Восстановление кошелька &lt;b&gt;%1&lt;/b&gt;…</translation>
+    </message>
     <message>
         <source>Migration failed</source>
         <translation type="unfinished">Перенос не удался</translation>
@@ -1190,7 +1172,7 @@ The migration process will create a backup of the wallet before migrating. This
     <message>
         <source>Restore Wallet</source>
         <extracomment>Title of progress window which is displayed when wallets are being restored.</extracomment>
-        <translation type="unfinished">Восстановить кошелёк</translation>
+        <translation type="unfinished">Восстановление кошелька</translation>
     </message>
     <message>
         <source>Restoring Wallet &lt;b&gt;%1&lt;/b&gt;…</source>
@@ -1273,10 +1255,6 @@ The migration process will create a backup of the wallet before migrating. This
         <source>Disable Private Keys</source>
         <translation type="unfinished">Отключить приватные ключи</translation>
     </message>
-    <message>
-        <source>Make a blank wallet. Blank wallets do not initially have private keys or scripts. Private keys and addresses can be imported, or an HD seed can be set, at a later time.</source>
-        <translation type="unfinished">Создать пустой кошелёк. В пустых кошельках изначально нет приватных ключей или скриптов. Позднее можно импортировать приватные ключи и адреса, либо установить HD мастер-ключ.</translation>
-    </message>
     <message>
         <source>Make Blank Wallet</source>
         <translation type="unfinished">Создать пустой кошелёк</translation>
@@ -1335,15 +1313,15 @@ The migration process will create a backup of the wallet before migrating. This
     </message>
     <message>
         <source>The entered address "%1" is not a valid Bitcoin address.</source>
-        <translation type="unfinished">Введенный адрес "%1" не является действительным биткоин-адресом.</translation>
+        <translation type="unfinished">Введенный адрес "%1" недействителен в сети Биткоин.</translation>
     </message>
     <message>
         <source>Address "%1" already exists as a receiving address with label "%2" and so cannot be added as a sending address.</source>
-        <translation type="unfinished">Адрес "%1" уже существует в качестве адреса для получения с меткой "%2" и поэтому не может быть добавлен в качестве адреса для отправки.</translation>
+        <translation type="unfinished">Адрес "%1" уже существует как адрес получателя с  именем "%2", и поэтому не может быть добавлен как адрес отправителя.</translation>
     </message>
     <message>
         <source>The entered address "%1" is already in the address book with label "%2".</source>
-        <translation type="unfinished">Введённый адрес "%1" уже существует в адресной книге с меткой "%2".</translation>
+        <translation type="unfinished">Введенный адрес "%1" уже существует в адресной книге под именем "%2".</translation>
     </message>
     <message>
         <source>Could not unlock wallet.</source>
@@ -1502,11 +1480,7 @@ The migration process will create a backup of the wallet before migrating. This
         <source>Error: Specified data directory "%1" cannot be created.</source>
         <translation type="unfinished">Ошибка: не удалось создать указанный каталог данных "%1".</translation>
     </message>
-    <message>
-        <source>Error</source>
-        <translation type="unfinished">Ошибка</translation>
-    </message>
-</context>
+    </context>
 <context>
     <name>ModalOverlay</name>
     <message>
@@ -1945,167 +1919,39 @@ The migration process will create a backup of the wallet before migrating. This
 </context>
 <context>
     <name>PSBTOperationsDialog</name>
-    <message>
-        <source>Sign Tx</source>
-        <translation type="unfinished">Подписать транзакцию</translation>
-    </message>
-    <message>
-        <source>Broadcast Tx</source>
-        <translation type="unfinished">Отправить транзакцию</translation>
-    </message>
-    <message>
-        <source>Copy to Clipboard</source>
-        <translation type="unfinished">Скопировать в буфер обмена</translation>
-    </message>
     <message>
         <source>Save…</source>
-        <translation type="unfinished">Сохранить...</translation>
+        <translation type="unfinished">Сохранить…</translation>
     </message>
     <message>
         <source>Close</source>
         <translation type="unfinished">Закрыть</translation>
     </message>
-    <message>
-        <source>Failed to load transaction: %1</source>
-        <translation type="unfinished">Не удалось загрузить транзакцию: %1</translation>
-    </message>
-    <message>
-        <source>Failed to sign transaction: %1</source>
-        <translation type="unfinished">Не удалось подписать транзакцию: %1</translation>
-    </message>
-    <message>
-        <source>Cannot sign inputs while wallet is locked.</source>
-        <translation type="unfinished">Невозможно подписать входы пока кошелёк заблокирован</translation>
-    </message>
-    <message>
-        <source>Could not sign any more inputs.</source>
-        <translation type="unfinished">Не удалось подписать оставшиеся входы.</translation>
-    </message>
-    <message>
-        <source>Signed %1 inputs, but more signatures are still required.</source>
-        <translation type="unfinished">Подписано %1 входов, но требуется больше подписей.</translation>
-    </message>
-    <message>
-        <source>Signed transaction successfully. Transaction is ready to broadcast.</source>
-        <translation type="unfinished">Транзакция успешно подписана. Транзакция готова к отправке.</translation>
-    </message>
-    <message>
-        <source>Unknown error processing transaction.</source>
-        <translation type="unfinished">Неизвестная ошибка во время обработки транзакции.</translation>
-    </message>
-    <message>
-        <source>Transaction broadcast successfully! Transaction ID: %1</source>
-        <translation type="unfinished">Транзакция успешно отправлена! Идентификатор транзакции: %1</translation>
-    </message>
-    <message>
-        <source>Transaction broadcast failed: %1</source>
-        <translation type="unfinished">Отправка транзакции не удалась: %1</translation>
-    </message>
-    <message>
-        <source>PSBT copied to clipboard.</source>
-        <translation type="unfinished">PSBT скопирована в буфер обмена</translation>
-    </message>
-    <message>
-        <source>Save Transaction Data</source>
-        <translation type="unfinished">Сохранить данные о транзакции</translation>
-    </message>
-    <message>
-        <source>Partially Signed Transaction (Binary)</source>
-        <extracomment>Expanded name of the binary PSBT file format. See: BIP 174.</extracomment>
-        <translation type="unfinished">Частично подписанная транзакция (двоичный файл)</translation>
-    </message>
-    <message>
-        <source>PSBT saved to disk.</source>
-        <translation type="unfinished">PSBT сохранена на диск.</translation>
+    <message numerus="yes">
+        <source>Signed %n input(s), but more signatures are still required.</source>
+        <translation type="unfinished">
+            <numerusform />
+            <numerusform />
+            <numerusform />
+        </translation>
     </message>
     <message>
         <source>Sends %1 to %2</source>
         <translation type="unfinished"> * Отправляет %1 на %2</translation>
     </message>
-    <message>
-        <source>Unable to calculate transaction fee or total transaction amount.</source>
-        <translation type="unfinished">Не удалось вычислить сумму комиссии или общую сумму транзакции.</translation>
-    </message>
-    <message>
-        <source>Pays transaction fee: </source>
-        <translation type="unfinished">Платит комиссию: </translation>
-    </message>
-    <message>
-        <source>Total Amount</source>
-        <translation type="unfinished">Итоговая сумма</translation>
-    </message>
     <message>
         <source>or</source>
         <translation type="unfinished">или</translation>
     </message>
-    <message>
-        <source>Transaction has %1 unsigned inputs.</source>
-        <translation type="unfinished">Транзакция имеет %1 неподписанных входов.</translation>
-    </message>
-    <message>
-        <source>Transaction is missing some information about inputs.</source>
-        <translation type="unfinished">Транзакция имеет недостаточно информации о некоторых входах.</translation>
-    </message>
-    <message>
-        <source>Transaction still needs signature(s).</source>
-        <translation type="unfinished">Транзакции требуется по крайней мере ещё одна подпись.</translation>
-    </message>
-    <message>
-        <source>(But no wallet is loaded.)</source>
-        <translation type="unfinished">(Но ни один кошелёк не загружен.)</translation>
-    </message>
-    <message>
-        <source>(But this wallet cannot sign transactions.)</source>
-        <translation type="unfinished">(Но этот кошелёк не может подписывать транзакции.)</translation>
-    </message>
-    <message>
-        <source>(But this wallet does not have the right keys.)</source>
-        <translation type="unfinished">(Но этот кошелёк не имеет необходимых ключей.)</translation>
-    </message>
-    <message>
-        <source>Transaction is fully signed and ready for broadcast.</source>
-        <translation type="unfinished">Транзакция полностью подписана и готова к отправке.</translation>
-    </message>
-    <message>
-        <source>Transaction status is unknown.</source>
-        <translation type="unfinished">Статус транзакции неизвестен.</translation>
-    </message>
-</context>
-<context>
-    <name>PaymentServer</name>
-    <message>
-        <source>Payment request error</source>
-        <translation type="unfinished">Ошибка запроса платежа</translation>
-    </message>
-    <message>
-        <source>Cannot start bitcoin: click-to-pay handler</source>
-        <translation type="unfinished">Невозможно запустить обработчик bitcoin: click-to-pay</translation>
-    </message>
-    <message>
-        <source>URI handling</source>
-        <translation type="unfinished">Обработка URI</translation>
-    </message>
-    <message>
-        <source>'bitcoin://' is not a valid URI. Use 'bitcoin:' instead.</source>
-        <translation type="unfinished">"bitcoin://" — это неверный URI. Используйте вместо него "bitcoin:".</translation>
-    </message>
-    <message>
-        <source>Cannot process payment request because BIP70 is not supported.
-Due to widespread security flaws in BIP70 it's strongly recommended that any merchant instructions to switch wallets be ignored.
-If you are receiving this error you should request the merchant provide a BIP21 compatible URI.</source>
-        <translation type="unfinished">Не удалось обработать транзакцию, потому что BIP70 не поддерживается.
-Из-за широко распространённых уязвимостей в BIP70, настоятельно рекомендуется игнорировать любые инструкции продавцов сменить кошелёк.
-Если вы получили эту ошибку, вам следует попросить у продавца URI, совместимый с BIP21.</translation>
-    </message>
-    <message>
-        <source>URI cannot be parsed! This can be caused by an invalid Bitcoin address or malformed URI parameters.</source>
-        <translation type="unfinished">Не удалось обработать URI! Это может быть вызвано тем, что биткоин-адрес неверен или параметры URI сформированы неправильно.</translation>
-    </message>
-    <message>
-        <source>Payment request file handling</source>
-        <translation type="unfinished">Обработка файла с запросом платежа</translation>
+    <message numerus="yes">
+        <source>Transaction has %n unsigned input(s).</source>
+        <translation type="unfinished">
+            <numerusform />
+            <numerusform />
+            <numerusform />
+        </translation>
     </message>
-</context>
+    </context>
 <context>
     <name>PeerTableModel</name>
     <message>
@@ -2113,36 +1959,6 @@ If you are receiving this error you should request the merchant provide a BIP21
         <extracomment>Title of Peers Table column which contains the peer's User Agent string.</extracomment>
         <translation type="unfinished">Пользовательский агент</translation>
     </message>
-    <message>
-        <source>Ping</source>
-        <extracomment>Title of Peers Table column which indicates the current latency of the connection with the peer.</extracomment>
-        <translation type="unfinished">Пинг</translation>
-    </message>
-    <message>
-        <source>Peer</source>
-        <extracomment>Title of Peers Table column which contains a unique number used to identify a connection.</extracomment>
-        <translation type="unfinished">Узел</translation>
-    </message>
-    <message>
-        <source>Age</source>
-        <extracomment>Title of Peers Table column which indicates the duration (length of time) since the peer connection started.</extracomment>
-        <translation type="unfinished">Возраст</translation>
-    </message>
-    <message>
-        <source>Direction</source>
-        <extracomment>Title of Peers Table column which indicates the direction the peer connection was initiated from.</extracomment>
-        <translation type="unfinished">Направление</translation>
-    </message>
-    <message>
-        <source>Sent</source>
-        <extracomment>Title of Peers Table column which indicates the total amount of network information we have sent to the peer.</extracomment>
-        <translation type="unfinished">Отправлено</translation>
-    </message>
-    <message>
-        <source>Received</source>
-        <extracomment>Title of Peers Table column which indicates the total amount of network information we have received from the peer.</extracomment>
-        <translation type="unfinished">Получено</translation>
-    </message>
     <message>
         <source>Address</source>
         <extracomment>Title of Peers Table column which contains the IP/Onion/I2P address of the connected peer.</extracomment>
@@ -2153,28 +1969,9 @@ If you are receiving this error you should request the merchant provide a BIP21
         <extracomment>Title of Peers Table column which describes the type of peer connection. The "type" describes why the connection exists.</extracomment>
         <translation type="unfinished">Тип</translation>
     </message>
-    <message>
-        <source>Network</source>
-        <extracomment>Title of Peers Table column which states the network the peer connected through.</extracomment>
-        <translation type="unfinished">Сеть</translation>
-    </message>
-    <message>
-        <source>Inbound</source>
-        <extracomment>An Inbound Connection from a Peer.</extracomment>
-        <translation type="unfinished">Входящий</translation>
-    </message>
-    <message>
-        <source>Outbound</source>
-        <extracomment>An Outbound Connection to a Peer.</extracomment>
-        <translation type="unfinished">Исходящий</translation>
-    </message>
-</context>
+    </context>
 <context>
     <name>RPCConsole</name>
-    <message>
-        <source>Network</source>
-        <translation type="unfinished">Сеть</translation>
-    </message>
     <message>
         <source>Local Addresses</source>
         <translation type="unfinished">Локальные Адреса</translation>
@@ -2191,10 +1988,6 @@ If you are receiving this error you should request the merchant provide a BIP21
         <source>Hide Peers Detail</source>
         <translation type="unfinished">Скрыть Подробности Узлов</translation>
     </message>
-    <message>
-        <source>User Agent</source>
-        <translation type="unfinished">Пользовательский агент</translation>
-    </message>
     <message>
         <source>Node window</source>
         <translation type="unfinished">Окно узла</translation>
@@ -2203,10 +1996,19 @@ If you are receiving this error you should request the merchant provide a BIP21
         <source>The BIP324 session ID string in hex.</source>
         <translation type="unfinished">Строка идентификатора сеанса BIP324 в шестнадцатеричном формате.</translation>
     </message>
+    <message>
+        <source>Private broadcast: short-lived, for broadcasting privacy-sensitive transactions</source>
+        <extracomment>Explanatory text for a short-lived outbound peer connection that is used to broadcast privacy-sensitive data (like our transactions).</extracomment>
+        <translation type="unfinished">Приватная рассылка: кратковременная, для трансляции транзакций, требующих защиты конфиденциальности</translation>
+    </message>
     <message>
         <source>1 &amp;year</source>
         <translation type="unfinished">1 &amp;год</translation>
     </message>
+    <message>
+        <source>None</source>
+        <translation type="unfinished">Нет</translation>
+    </message>
     <message>
         <source>Node window - [%1]</source>
         <translation type="unfinished">Окно ноды - [%1]</translation>
@@ -2214,6 +2016,10 @@ If you are receiving this error you should request the merchant provide a BIP21
     </context>
 <context>
     <name>ReceiveCoinsDialog</name>
+    <message>
+        <source>Copy &amp;label</source>
+        <translation type="unfinished">Копировать &amp;метку</translation>
+    </message>
     <message>
         <source>Copy &amp;amount</source>
         <translation type="unfinished">Копировать с&amp;умму</translation>
@@ -2232,6 +2038,14 @@ If you are receiving this error you should request the merchant provide a BIP21
     </context>
 <context>
     <name>RecentRequestsTableModel</name>
+    <message>
+        <source>Date</source>
+        <translation type="unfinished">Дата</translation>
+    </message>
+    <message>
+        <source>Label</source>
+        <translation type="unfinished">Метка</translation>
+    </message>
     <message>
         <source>(no label)</source>
         <translation type="unfinished">(нет метки)</translation>
@@ -2263,14 +2077,31 @@ If you are receiving this error you should request the merchant provide a BIP21
         <source>Copy amount</source>
         <translation type="unfinished">Копировать сумму</translation>
     </message>
+    <message>
+        <source>Copy fee</source>
+        <translation type="unfinished">Копировать комиссию</translation>
+    </message>
     <message>
         <source>Copy after fee</source>
         <translation type="unfinished">Копировать сумму после комиссии</translation>
     </message>
+    <message>
+        <source>Copy bytes</source>
+        <translation type="unfinished">Копировать байты</translation>
+    </message>
     <message>
         <source>Copy change</source>
         <translation type="unfinished">Копировать сдачу</translation>
     </message>
+    <message>
+        <source>Save Transaction Data</source>
+        <translation type="unfinished">Сохранить данные о транзакции</translation>
+    </message>
+    <message>
+        <source>Partially Signed Transaction (Binary)</source>
+        <extracomment>Expanded name of the binary PSBT file format. See: BIP 174.</extracomment>
+        <translation type="unfinished">Частично подписанная транзакция (двоичный файл)</translation>
+    </message>
     <message>
         <source>or</source>
         <translation type="unfinished">или</translation>
@@ -2325,10 +2156,6 @@ If you are receiving this error you should request the merchant provide a BIP21
         <source>%1 (Certificate was not verified)</source>
         <translation type="unfinished">%1 (Сертификат не был подтверждён)</translation>
     </message>
-    <message>
-        <source>Amount</source>
-        <translation type="unfinished">Сумма</translation>
-    </message>
     </context>
 <context>
     <name>TransactionTableModel</name>
@@ -2340,153 +2167,25 @@ If you are receiving this error you should request the merchant provide a BIP21
 <context>
     <name>TransactionView</name>
     <message>
-        <source>This year</source>
-        <translation type="unfinished">Этот год</translation>
-    </message>
-    <message>
-        <source>Copy &amp;amount</source>
-        <translation type="unfinished">Копировать с&amp;умму</translation>
-    </message>
-    <message>
-        <source>Confirmed</source>
-        <translation type="unfinished">Подтверждена</translation>
+        <source>Label</source>
+        <translation type="unfinished">Метка</translation>
     </message>
     <message>
         <source>Address</source>
         <translation type="unfinished">Адрес</translation>
     </message>
-    <message>
-        <source>ID</source>
-        <translation type="unfinished">Идентификатор</translation>
-    </message>
-    <message>
-        <source>Exporting Failed</source>
-        <translation type="unfinished">Ошибка при экспорте</translation>
-    </message>
-    <message>
-        <source>There was an error trying to save the transaction history to %1.</source>
-        <translation type="unfinished">При попытке сохранения истории транзакций в %1 произошла ошибка.</translation>
-    </message>
-    <message>
-        <source>Exporting Successful</source>
-        <translation type="unfinished">Экспорт выполнен успешно</translation>
-    </message>
-    <message>
-        <source>The transaction history was successfully saved to %1.</source>
-        <translation type="unfinished">История транзакций была успешно сохранена в %1.</translation>
-    </message>
-    <message>
-        <source>Range:</source>
-        <translation type="unfinished">Диапазон:</translation>
-    </message>
-    <message>
-        <source>to</source>
-        <translation type="unfinished">до</translation>
-    </message>
-</context>
-<context>
-    <name>WalletFrame</name>
-    <message>
-        <source>No wallet has been loaded.
-Go to File &gt; Open Wallet to load a wallet.
-- OR -</source>
-        <translation type="unfinished">Нет загруженных кошельков.
-Выберите в меню Файл -&gt; Открыть кошелёк, чтобы загрузить кошелёк.
-- ИЛИ -</translation>
-    </message>
-    <message>
-        <source>Create a new wallet</source>
-        <translation type="unfinished">Создать новый кошелёк</translation>
-    </message>
-    <message>
-        <source>Error</source>
-        <translation type="unfinished">Ошибка</translation>
-    </message>
-    <message>
-        <source>Unable to decode PSBT from clipboard (invalid base64)</source>
-        <translation type="unfinished">Не удалось декодировать PSBT из буфера обмена (неверный base64)</translation>
-    </message>
-    <message>
-        <source>Load Transaction Data</source>
-        <translation type="unfinished">Загрузить данные о транзакции</translation>
-    </message>
-    <message>
-        <source>Partially Signed Transaction (*.psbt)</source>
-        <translation type="unfinished">Частично подписанная транзакция (*.psbt)</translation>
-    </message>
-    <message>
-        <source>PSBT file must be smaller than 100 MiB</source>
-        <translation type="unfinished">Файл PSBT должен быть меньше 100 МиБ</translation>
-    </message>
-    <message>
-        <source>Unable to decode PSBT</source>
-        <translation type="unfinished">Не удалось декодировать PSBT</translation>
-    </message>
-</context>
+    </context>
 <context>
     <name>WalletModel</name>
-    <message>
-        <source>Fee bump error</source>
-        <translation type="unfinished">Ошибка повышения комиссии</translation>
-    </message>
-    <message>
-        <source>Increasing transaction fee failed</source>
-        <translation type="unfinished">Не удалось увеличить комиссию</translation>
-    </message>
-    <message>
-        <source>Do you want to increase the fee?</source>
-        <extracomment>Asks a user if they would like to manually increase the fee of a transaction that has already been created.</extracomment>
-        <translation type="unfinished">Вы хотите увеличить комиссию?</translation>
-    </message>
-    <message>
-        <source>Current fee:</source>
-        <translation type="unfinished">Текущая комиссия:</translation>
-    </message>
-    <message>
-        <source>Increase:</source>
-        <translation type="unfinished">Увеличить на:</translation>
-    </message>
-    <message>
-        <source>New fee:</source>
-        <translation type="unfinished">Новая комиссия:</translation>
-    </message>
-    <message>
-        <source>Warning: This may pay the additional fee by reducing change outputs or adding inputs, when necessary. It may add a new change output if one does not already exist. These changes may potentially leak privacy.</source>
-        <translation type="unfinished">Внимание: комиссия может быть увеличена путём уменьшения выходов для сдачи или добавления входов (по необходимости). Может быть добавлен новый вывод для сдачи, если он не существует. Эти изменения могут привести к ухудшению вашей конфиденциальности.</translation>
-    </message>
-    <message>
-        <source>Confirm fee bump</source>
-        <translation type="unfinished">Подтвердить увеличение комиссии</translation>
-    </message>
-    <message>
-        <source>Can't draft transaction.</source>
-        <translation type="unfinished">Не удалось подготовить черновик транзакции.</translation>
-    </message>
-    <message>
-        <source>PSBT copied</source>
-        <translation type="unfinished">PSBT скопирована</translation>
-    </message>
     <message>
         <source>Fee-bump PSBT copied to clipboard</source>
         <translation type="unfinished">PSBT скопирована в буфер обмена.</translation>
     </message>
-    <message>
-        <source>Can't sign transaction.</source>
-        <translation type="unfinished">Невозможно подписать транзакцию.</translation>
-    </message>
-    <message>
-        <source>Could not commit transaction</source>
-        <translation type="unfinished">Не удалось отправить транзакцию</translation>
-    </message>
     <message>
         <source>Signer error</source>
         <translation type="unfinished">Ошибка подписи</translation>
     </message>
-    <message>
-        <source>Can't display address</source>
-        <translation type="unfinished">Не удалось отобразить адрес</translation>
-    </message>
-</context>
+    </context>
 <context>
     <name>WalletView</name>
     <message>
@@ -2541,42 +2240,6 @@ Go to File &gt; Open Wallet to load a wallet.
         <source>%s request to listen on port %u. This port is considered "bad" and thus it is unlikely that any peer will connect to it. See doc/p2p-bad-ports.md for details and a full list.</source>
         <translation type="unfinished">%s хочет открыть порт %u на прослушивание. Этот порт считается "плохим", и другие узлы, скорее всего, не захотят общаться через этот порт. Список портов и подробности можно узнать в документе doc/p2p-bad-ports.md.</translation>
     </message>
-    <message>
-        <source>Error: Dumpfile format record is incorrect. Got "%s", expected "format".</source>
-        <translation type="unfinished">Ошибка: запись формата дамп-файла неверна. Обнаружено "%s", ожидалось "format".</translation>
-    </message>
-    <message>
-        <source>Error: Dumpfile identifier record is incorrect. Got "%s", expected "%s".</source>
-        <translation type="unfinished">Ошибка: запись идентификатора дамп-файла неверна. Обнаружено "%s", ожидалось "%s".</translation>
-    </message>
-    <message>
-        <source>Error: Dumpfile version is not supported. This version of bitcoin-wallet only supports version 1 dumpfiles. Got dumpfile with version %s</source>
-        <translation type="unfinished">Ошибка: версия дамп-файла не поддерживается. Эта версия биткоин-кошелька поддерживает только дамп-файлы версии 1. Обнаружен дамп-файл версии %s</translation>
-    </message>
-    <message>
-        <source>Error: Unable to produce descriptors for this legacy wallet. Make sure to provide the wallet's passphrase if it is encrypted.</source>
-        <translation type="unfinished">Ошибка: не удалось создать дескрипторы для этого кошелька старого формата. Не забудьте указать парольную фразу, если кошелёк был зашифрован.</translation>
-    </message>
-    <message>
-        <source>File %s already exists. If you are sure this is what you want, move it out of the way first.</source>
-        <translation type="unfinished">Файл %s уже существует. Если вы уверены, что так и должно быть, сначала уберите оттуда этот файл.</translation>
-    </message>
-    <message>
-        <source>Invalid or corrupt peers.dat (%s). If you believe this is a bug, please report it to %s. As a workaround, you can move the file (%s) out of the way (rename, move, or delete) to have a new one created on the next start.</source>
-        <translation type="unfinished">Неверный или поврежденный peers.dat (%s). Если вы считаете что это ошибка, сообщите о ней %s. В качестве временной меры вы можете переместить, переименовать или удалить файл (%s). Новый файл будет создан при следующем запуске программы.</translation>
-    </message>
-    <message>
-        <source>More than one onion bind address is provided. Using %s for the automatically created Tor onion service.</source>
-        <translation type="unfinished">Предоставлен более чем один onion-адрес для привязки. Для автоматически созданного onion-сервиса Tor будет использован %s.</translation>
-    </message>
-    <message>
-        <source>No dump file provided. To use createfromdump, -dumpfile=&lt;filename&gt; must be provided.</source>
-        <translation type="unfinished">Не указан дамп-файл. Чтобы использовать createfromdump, необходимо указать -dumpfile=&lt;filename&gt;.</translation>
-    </message>
-    <message>
-        <source>No dump file provided. To use dump, -dumpfile=&lt;filename&gt; must be provided.</source>
-        <translation type="unfinished">Не указан дамп-файл. Чтобы использовать dump, необходимо указать -dumpfile=&lt;filename&gt;.</translation>
-    </message>
     <message>
         <source>Please contribute if you find %s useful. Visit %s for further information about the software.</source>
         <translation type="unfinished">Пожалуйста, внесите свой вклад, если вы считаете %s полезным. Посетите %s для получения дополнительной информации о программном обеспечении.</translation>
@@ -2637,10 +2300,6 @@ Go to File &gt; Open Wallet to load a wallet.
         <source>Warning: Private keys detected in wallet {%s} with disabled private keys</source>
         <translation type="unfinished">Предупреждение: приватные ключи обнаружены в кошельке {%s} с отключенными приватными ключами</translation>
     </message>
-    <message>
-        <source>Warning: We do not appear to fully agree with our peers! You may need to upgrade, or other nodes may need to upgrade.</source>
-        <translation type="unfinished">Внимание: мы не полностью согласны с другими узлами! Вам или другим участникам, возможно, следует обновиться.</translation>
-    </message>
     <message>
         <source>Witness data for blocks after height %d requires validation. Please restart with -reindex.</source>
         <translation type="unfinished">Для свидетельских данных в блоках после %d необходима проверка. Пожалуйста, перезапустите клиент с параметром -reindex.</translation>
@@ -2735,14 +2394,6 @@ Go to File &gt; Open Wallet to load a wallet.
         <source>Option '-checkpoints' is set but checkpoints were removed. This option has no effect.</source>
         <translation type="unfinished">Параметр '-checkpoints' установлен, но контрольные точки были удалены. Этот параметр не оказывает никакого эффекта.</translation>
     </message>
-    <message>
-        <source>Option '-maxorphantx' is set but no longer has any effect (see release notes). Please remove it from your configuration.</source>
-        <translation type="unfinished">Параметр '-maxorphantx' установлен, но больше не действует (см. примечания к выпуску). Удалите его из конфигурации.</translation>
-    </message>
-    <message>
-        <source>Options '-datacarrier' or '-datacarriersize' are set but are marked as deprecated. They will be removed in a future version.</source>
-        <translation type="unfinished">Параметры '-datacarrier' и '-datacarriersize' установлены, но помечены как устаревшие. Они будут удалены в будущей версии.</translation>
-    </message>
     <message>
         <source>Outbound connections restricted to CJDNS (-onlynet=cjdns) but -cjdnsreachable is not provided</source>
         <translation type="unfinished">Исходящие соединения ограничены сетью CJDNS (-onlynet=cjdns), но -cjdnsreachable не задан</translation>
@@ -2779,40 +2430,10 @@ Go to File &gt; Open Wallet to load a wallet.
         <source>The preselected coins total amount does not cover the transaction target. Please allow other inputs to be automatically selected or include more coins manually</source>
         <translation type="unfinished">Общая сумма предварительно выбранных монет не покрывает цель транзакции. Пожалуйста, разрешите автоматический выбор других входов или включите больше монет вручную</translation>
     </message>
-    <message>
-        <source>UTXO snapshot failed to validate. Restart to resume normal initial block download, or try loading a different snapshot.</source>
-        <translation type="unfinished">Снимок UTXO не прошел проверку. Перезапустите, чтобы возобновить нормальную загрузку начального блока, или попробуйте загрузить другой снимок.</translation>
-    </message>
-    <message>
-        <source>Unconfirmed UTXOs are available, but spending them creates a chain of transactions that will be rejected by the mempool</source>
-        <translation type="unfinished">Неподтвержденные UTXO доступны, но их расходование создает цепочку транзакций, которые будут отклонены мемпулом</translation>
-    </message>
-    <message>
-        <source>Unexpected legacy entry in descriptor wallet found. Loading wallet %s
-
-The wallet might have been tampered with or created with malicious intent.
-</source>
-        <translation type="unfinished">В дескрипторном кошельке %s обнаружено поле устаревшего формата.
-
-Этот кошелёк мог быть подменён или создан со злым умыслом.
-</translation>
-    </message>
     <message>
         <source>Your computer's date and time appear to be more than %d minutes out of sync with the network, this may lead to consensus failure. After you've confirmed your computer's clock, this message should no longer appear when you restart your node. Without a restart, it should stop showing automatically after you've connected to a sufficient number of new outbound peers, which may take some time. You can inspect the `timeoffset` field of the `getpeerinfo` and `getnetworkinfo` RPC methods to get more info.</source>
         <translation type="unfinished">Дата и время вашего компьютера отстают от сети более чем на %dминут, что может привести к сбою консенсуса. После того, как вы подтвердите правильность времени на вашем компьютере, это сообщение не должно больше появляться при перезапуске вашего узла. Без перезапуска оно должно автоматически перестать отображаться после того, как вы подключитесь к достаточному количеству новых исходящих пиров, что может занять некоторое время. Вы можете проверить поле timeoffset в методах RPC getpeerinfo и getnetworkinfo, чтобы получить больше информации.</translation>
     </message>
-    <message>
-        <source>
-Unable to cleanup failed migration</source>
-        <translation type="unfinished">
-Не удалось очистить следы после неуспешной миграции</translation>
-    </message>
-    <message>
-        <source>
-Unable to restore backup of wallet.</source>
-        <translation type="unfinished">
-Не удалось восстановить кошелёк из резервной копии.</translation>
-    </message>
     <message>
         <source>default wallet</source>
         <translation type="unfinished">кошелёк по умолчанию</translation>
@@ -2821,10 +2442,6 @@ Unable to restore backup of wallet.</source>
         <source>whitebind may only be used for incoming connections ("out" was passed)</source>
         <translation type="unfinished">Параметр "whitebind" может использоваться только для входящих соединений (был передан параметр "out").</translation>
     </message>
-    <message>
-        <source>-paytxfee is deprecated and will be fully removed in v31.0.</source>
-        <translation type="unfinished">-paytxfee устарел и будет полностью удален в версии 31.0.</translation>
-    </message>
     <message>
         <source>A fatal internal error occurred, see debug.log for details: </source>
         <translation type="unfinished">A fatal internal error occurred, see debug.log for details:</translation>
@@ -2838,8 +2455,12 @@ Unable to restore backup of wallet.</source>
         <translation type="unfinished">Проверка блоков прервана</translation>
     </message>
     <message>
-        <source>Cannot add WalletDescriptor to a non-descriptor wallet</source>
-        <translation type="unfinished">Невозможно добавить WalletDescriptor к кошельку без дескриптора.</translation>
+        <source>Can't spend unconfirmed version %d pre-selected input with a version 3 tx</source>
+        <translation type="unfinished">Нельзя потратить неподтвержденную версию 1%d предварительно выбранного входа с транзакцией версии 3</translation>
+    </message>
+    <message>
+        <source>Can't spend unconfirmed version 3 pre-selected input with a version %d tx</source>
+        <translation type="unfinished">Нельзя потратить неподтвержденную версию 3 предварительно выбранного входа с транзакцией версии 1%d</translation>
     </message>
     <message>
         <source>Config setting for %s only applied on %s network when in [%s] section.</source>
@@ -2881,10 +2502,6 @@ Unable to restore backup of wallet.</source>
         <source>Elliptic curve cryptography sanity check failure. %s is shutting down.</source>
         <translation type="unfinished">Сбой проверки работоспособности эллиптической кривой криптографии. %s завершает работу.</translation>
     </message>
-    <message>
-        <source>Error creating %s</source>
-        <translation type="unfinished">Ошибка при создании %s</translation>
-    </message>
     <message>
         <source>Error initializing block database</source>
         <translation type="unfinished">Ошибка при инициализации базы данных блоков</translation>
@@ -2893,10 +2510,6 @@ Unable to restore backup of wallet.</source>
         <source>Error loading %s</source>
         <translation type="unfinished">Ошибка при загрузке %s</translation>
     </message>
-    <message>
-        <source>Error loading %s: Private keys can only be disabled during creation</source>
-        <translation type="unfinished">Ошибка загрузки %s: приватные ключи можно отключить только при создании</translation>
-    </message>
     <message>
         <source>Error loading %s: Wallet corrupted</source>
         <translation type="unfinished">Ошибка загрузки %s: кошелёк поврежден</translation>
@@ -3021,10 +2634,6 @@ Unable to restore backup of wallet.</source>
         <source>Failed to close file when writing block.</source>
         <translation type="unfinished">Не удалось закрыть файл при записи блока.</translation>
     </message>
-    <message>
-        <source>Failed to connect best block (%s).</source>
-        <translation type="unfinished">Не удалось подключиться к лучшему блоку (%s).</translation>
-    </message>
     <message>
         <source>Failed to disconnect block.</source>
         <translation type="unfinished">Не удалось отключить блок</translation>
@@ -3037,14 +2646,6 @@ Unable to restore backup of wallet.</source>
         <source>Failed to write block.</source>
         <translation type="unfinished">Не удалось записать блок</translation>
     </message>
-    <message>
-        <source>Failed to write to block index database.</source>
-        <translation type="unfinished">Не удалось записать в базу данных индекса блоков.</translation>
-    </message>
-    <message>
-        <source>Failed to write to coin database.</source>
-        <translation type="unfinished">Не удалось записать в базу данных монет.</translation>
-    </message>
     <message>
         <source>Failed to write undo data.</source>
         <translation type="unfinished">Не удалось записать данные отмены.</translation>
@@ -3053,6 +2654,22 @@ Unable to restore backup of wallet.</source>
         <source>Failure removing transaction: %s</source>
         <translation type="unfinished">Ошибка удаления транзакции: %s</translation>
     </message>
+    <message>
+        <source>A %zu MiB dbcache may be too large for a system memory of only %zu MiB.</source>
+        <translation type="unfinished">%zu MiB dbcache может быть слишком большим для систем с всего %zu MiB памяти.</translation>
+    </message>
+    <message>
+        <source>Creating wallet…</source>
+        <translation type="unfinished">Создание кошелька…</translation>
+    </message>
+    <message>
+        <source>Duplicate binding configuration for address %s. Please check your -bind, -bind=...=onion and -whitebind settings.</source>
+        <translation type="unfinished">Двойное связывание с адресом %s. Пожалуйста проверьте ваши настройки: -bind, -bind=...=onion and -whitebind.</translation>
+    </message>
+    <message>
+        <source>Error creating %s: Could not write version metadata.</source>
+        <translation type="unfinished">Ошибка создания %s: Не могу записать версию метаданных.</translation>
+    </message>
     <message>
         <source>Maximum transaction weight must be between %d and %d</source>
         <translation type="unfinished">Максимальный вес транзакции должен быть между %d и %d</translation>
@@ -3061,6 +2678,22 @@ Unable to restore backup of wallet.</source>
         <source>Only direction was set, no permissions: '%s'</source>
         <translation type="unfinished">Было задано только направление, без разрешений: '%s'</translation>
     </message>
+    <message>
+        <source>Option '-limitancestorsize' is given but ancestor size limits have been replaced with cluster size limits (see -limitclustersize). This option has no effect.</source>
+        <translation type="unfinished">Option '-limitancestorsize' is given but ancestor size limits have been replaced with cluster size limits (see -limitclustersize). Эта настройка не имеет эффекта.</translation>
+    </message>
+    <message>
+        <source>Private broadcast of own transactions requested (-privatebroadcast) and -proxyrandomize is disabled. Tor circuits for private broadcast connections may be correlated to other connections over Tor. For maximum privacy set -proxyrandomize=1.</source>
+        <translation type="unfinished">Приватное вещание своих транзакций требует (-privatebroadcast) ,а -proxyrandomize отключен. Цепочка сети Tor для приватного вещания может коррелировать с другими соединениями через Tor. Для большей приватности установите -proxyrandomize=1.</translation>
+    </message>
+    <message>
+        <source>Private broadcast of own transactions requested (-privatebroadcast), but -connect is also configured. They are incompatible because the private broadcast needs to open new connections to randomly chosen Tor or I2P peers. Consider using -maxconnections=0 -addnode=... instead</source>
+        <translation type="unfinished">Приватное вещание своих транзакций запрошено (-privatebroadcast), но также настроено -connect. Вместе они не совместимы потому что при приватной рассылке необходимо открывать новые соединения к случайно выбираемым узлам Tor или I2P. Предлагается исползовать -maxconnections=0 -addnode=... взамен</translation>
+    </message>
+    <message>
+        <source>Private broadcast of own transactions requested (-privatebroadcast), but none of Tor or I2P networks is reachable</source>
+        <translation type="unfinished">Приватное вещание своих транзакций запрошено (-privatebroadcast) , но отсутствуют доступные сети Tor or I2P</translation>
+    </message>
     <message>
         <source>Signer did not echo address</source>
         <translation type="unfinished">Подписант не отразил адрес</translation>
@@ -3085,6 +2718,10 @@ Unable to restore backup of wallet.</source>
         <source>System error while saving block to disk: %s</source>
         <translation type="unfinished">Системная ошибка при сохранении блока на диск: %s</translation>
     </message>
+    <message>
+        <source>The %s path uses exFAT, which is known to have intermittent corruption problems on macOS. Move this directory to a different filesystem to avoid data loss.</source>
+        <translation type="unfinished">Путь %s использует exFAT, которая, как известно, имеет периодические проблемы с повреждением на macOS. Переместите эту директорию в другую файловую систему, чтобы избежать потери данных.</translation>
+    </message>
     <message>
         <source>There is no ScriptPubKeyManager for this address</source>
         <translation type="unfinished">ScriptPubKeyManager для этого адреса отсутствует</translation>
diff --git a/src/qt/locale/bitcoin_si.ts b/src/qt/locale/bitcoin_si.ts
index db753a3638e3..347690264e11 100644
--- a/src/qt/locale/bitcoin_si.ts
+++ b/src/qt/locale/bitcoin_si.ts
@@ -628,6 +628,14 @@
         <translation type="unfinished">පසුම්බිය සාදන්න</translation>
     </message>
     </context>
+<context>
+    <name>MigrateWalletActivity</name>
+    <message>
+        <source>Restore Wallet</source>
+        <extracomment>Title of progress window which is displayed when wallets are being restored.</extracomment>
+        <translation type="unfinished">පසුම්බිය ප්‍රතිස්ථාපනය කිරීම</translation>
+    </message>
+    </context>
 <context>
     <name>OpenWalletActivity</name>
     <message>
@@ -900,10 +908,24 @@
     </context>
 <context>
     <name>PSBTOperationsDialog</name>
+    <message numerus="yes">
+        <source>Signed %n input(s), but more signatures are still required.</source>
+        <translation type="unfinished">
+            <numerusform />
+            <numerusform />
+        </translation>
+    </message>
     <message>
         <source>or</source>
         <translation type="unfinished">හෝ</translation>
     </message>
+    <message numerus="yes">
+        <source>Transaction has %n unsigned input(s).</source>
+        <translation type="unfinished">
+            <numerusform />
+            <numerusform />
+        </translation>
+    </message>
     </context>
 <context>
     <name>PeerTableModel</name>
@@ -1270,10 +1292,6 @@
         <source>default wallet</source>
         <translation type="unfinished">පෙරනිමි පසුම්බිය</translation>
     </message>
-    <message>
-        <source>Error creating %s</source>
-        <translation type="unfinished">%s සෑදීමේ දෝෂයකි</translation>
-    </message>
     <message>
         <source>Error loading %s</source>
         <translation type="unfinished">%s පූරණය වීමේ දෝෂයකි</translation>
diff --git a/src/qt/locale/bitcoin_sk.ts b/src/qt/locale/bitcoin_sk.ts
index 46e82681f4b5..fb81da335ac8 100644
--- a/src/qt/locale/bitcoin_sk.ts
+++ b/src/qt/locale/bitcoin_sk.ts
@@ -228,7 +228,7 @@ Signing is only possible with addresses of the type 'legacy'.</source>
     </message>
     <message>
         <source>The passphrase entered for the wallet decryption is incorrect. It contains a null character (ie - a zero byte). If the passphrase was set with a version of this software prior to 25.0, please try again with only the characters up to — but not including — the first null character. If this is successful, please set a new passphrase to avoid this issue in the future.</source>
-        <translation type="unfinished">Zadaná prístupová fráza na dešifrovanie peňaženky je nesprávna. Obsahuje nulový znak (tj - bajt s hodnotou nula). Ak bola prístupová fráza nastavená verziou tohto softvéru pred verziou 25.0, skúste to znova s použitím iba znakov až po — ale nezahrňujúc — prvý nulový znak. Ak sa vám to podarí, prosím nastavte novú prístupovú frázu, aby ste tomuto problému predišli v budúcnosti.</translation>
+        <translation type="unfinished">Zadaná prístupová fráza na dešifrovanie peňaženky je nesprávna. Obsahuje nulový znak (t.j. - bajt s hodnotou nula). Ak bola prístupová fráza nastavená verziou tohto softvéru pred verziou 25.0, skúste to znova s použitím iba znakov až po — ale nezahrňujúc — prvý nulový znak. Ak sa vám to podarí, prosím nastavte novú prístupovú frázu, aby ste tomuto problému predišli v budúcnosti.</translation>
     </message>
     <message>
         <source>Wallet passphrase was successfully changed.</source>
@@ -1121,6 +1121,16 @@ Proces migrácie vytvorí zálohu peňaženky pred samotnou migráciou. Tento z
         <source>Solvable but not watched scripts have been migrated to a new wallet named '%1'.</source>
         <translation type="unfinished">Vyriešiteľné, ale nesledované skripty boli presunuté do novej peňaženky s názvom '%1'.</translation>
     </message>
+    <message>
+        <source>Restore Wallet</source>
+        <extracomment>Title of progress window which is displayed when wallets are being restored.</extracomment>
+        <translation type="unfinished">Obnoviť peňaženku</translation>
+    </message>
+    <message>
+        <source>Restoring Wallet &lt;b&gt;%1&lt;/b&gt;…</source>
+        <extracomment>Descriptive text of the restore wallets progress window which indicates to the user that wallets are currently being restored.</extracomment>
+        <translation type="unfinished">Obnovovanie peňaženky &lt;b&gt;%1&lt;/b&gt;…</translation>
+    </message>
     <message>
         <source>Migration failed</source>
         <translation type="unfinished">Migrácia zlyhala</translation>
@@ -1244,10 +1254,6 @@ Proces migrácie vytvorí zálohu peňaženky pred samotnou migráciou. Tento z
         <source>Disable Private Keys</source>
         <translation type="unfinished">Vypnúť súkromné kľúče</translation>
     </message>
-    <message>
-        <source>Make a blank wallet. Blank wallets do not initially have private keys or scripts. Private keys and addresses can be imported, or an HD seed can be set, at a later time.</source>
-        <translation type="unfinished">Vytvoriť prázdnu peňaženku. Prázdne peňaženky na začiatku nemajú žiadne súkromné kľúče ani skripty. Neskôr môžu byť importované súkromné kľúče a adresy alebo nastavená HD inicializácia.</translation>
-    </message>
     <message>
         <source>Make Blank Wallet</source>
         <translation type="unfinished">Vytvoriť prázdnu peňaženku</translation>
@@ -1975,9 +1981,13 @@ Proces migrácie vytvorí zálohu peňaženky pred samotnou migráciou. Tento z
         <source>Could not sign any more inputs.</source>
         <translation type="unfinished">Nie je možné podpísať žiadne ďalšie vstupy.</translation>
     </message>
-    <message>
-        <source>Signed %1 inputs, but more signatures are still required.</source>
-        <translation type="unfinished">Podpísaných %1 vstupov, no ešte sú požadované ďalšie podpisy.</translation>
+    <message numerus="yes">
+        <source>Signed %n input(s), but more signatures are still required.</source>
+        <translation type="unfinished">
+            <numerusform />
+            <numerusform />
+            <numerusform />
+        </translation>
     </message>
     <message>
         <source>Signed transaction successfully. Transaction is ready to broadcast.</source>
@@ -2036,9 +2046,13 @@ Proces migrácie vytvorí zálohu peňaženky pred samotnou migráciou. Tento z
         <source>or</source>
         <translation type="unfinished">alebo</translation>
     </message>
-    <message>
-        <source>Transaction has %1 unsigned inputs.</source>
-        <translation type="unfinished">Transakcia má %1 nepodpísaných vstupov.</translation>
+    <message numerus="yes">
+        <source>Transaction has %n unsigned input(s).</source>
+        <translation type="unfinished">
+            <numerusform />
+            <numerusform />
+            <numerusform />
+        </translation>
     </message>
     <message>
         <source>Transaction is missing some information about inputs.</source>
@@ -2329,10 +2343,6 @@ Ak ste dostali túto chybu mali by ste požiadať obchodníka o URI kompatibiln
         <source>Transaction Relay</source>
         <translation type="unfinished">Prenos transakcií</translation>
     </message>
-    <message>
-        <source>Starting Block</source>
-        <translation type="unfinished">Počiatočný blok</translation>
-    </message>
     <message>
         <source>Synced Headers</source>
         <translation type="unfinished">Zosynchronizované hlavičky</translation>
@@ -2951,7 +2961,7 @@ Pre viac informácií o používaní tejto konzoly napíšte %6.
     </message>
     <message>
         <source>Using the fallbackfee can result in sending a transaction that will take several hours or days (or never) to confirm. Consider choosing your fee manually or wait until you have validated the complete chain.</source>
-        <translation type="unfinished">Použitie núdzového poplatku („fallbackfee“) môže vyústiť v transakciu, ktoré bude trvat hodiny nebo dny (prípadne večnosť), kým bude potvrdená. Zvážte preto ručné nastaveníe poplatku, prípadne počkajte, až sa Vám kompletne zvaliduje reťazec blokov.</translation>
+        <translation type="unfinished">Použitie núdzového poplatku („fallbackfee“) môže vyústiť v transakciu, ktoré bude trvať hodiny alebo dni (prípadne večnosť), kým bude potvrdená. Zvážte preto ručné nastavenie poplatku, prípadne počkajte, až sa Vám kompletne skontroluje reťazec blokov.</translation>
     </message>
     <message>
         <source>Warning: Fee estimation is currently not possible.</source>
@@ -3027,7 +3037,7 @@ Poznámka: Keďže poplatok je počítaný za bajt, poplatok pri sadzbe "100 sat
     </message>
     <message>
         <source>With Replace-By-Fee (BIP-125) you can increase a transaction's fee after it is sent. Without this, a higher fee may be recommended to compensate for increased transaction delay risk.</source>
-        <translation type="unfinished">S dodatočným navýšením poplatku (BIP-125, tzv. „Replace-By-Fee“), môžete zvýšiť poplatok aj po odoslaní. Bez toho, by mohol byť navrhnutý väčší transakčný poplatok, aby kompenzoval zvýšené riziko omeškania transakcie.</translation>
+        <translation type="unfinished">S dodatočným navýšením poplatku (BIP-125, tzv. „Replace-By-Fee“) môžete zvýšiť poplatok aj po odoslaní. Bez toho by mohol byť navrhnutý väčší transakčný poplatok, aby kompenzoval zvýšené riziko omeškania transakcie.</translation>
     </message>
     <message>
         <source>Clear &amp;All</source>
@@ -3213,10 +3223,6 @@ Poznámka: Keďže poplatok je počítaný za bajt, poplatok pri sadzbe "100 sat
         <source>The amount exceeds your balance.</source>
         <translation type="unfinished">Suma je vyššia ako váš zostatok.</translation>
     </message>
-    <message>
-        <source>The total exceeds your balance when the %1 transaction fee is included.</source>
-        <translation type="unfinished">Celková suma prevyšuje váš zostatok ak sú započítané aj transakčné poplatky %1.</translation>
-    </message>
     <message>
         <source>Duplicate address found: addresses should only be used once each.</source>
         <translation type="unfinished">Našla sa duplicitná adresa: každá adresa by sa mala použiť len raz.</translation>
@@ -3986,7 +3992,7 @@ Choďte do Súbor &gt; Otvoriť Peňaženku, pre načítanie peňaženky.
     </message>
     <message>
         <source>Can't sign transaction.</source>
-        <translation type="unfinished">Nemôžeme podpísať transakciu.</translation>
+        <translation type="unfinished">Nemôzeme podpíaať transakciu.</translation>
     </message>
     <message>
         <source>Could not commit transaction</source>
@@ -4179,10 +4185,6 @@ Choďte do Súbor &gt; Otvoriť Peňaženku, pre načítanie peňaženky.
         <source>Warning: Private keys detected in wallet {%s} with disabled private keys</source>
         <translation type="unfinished">Upozornenie: Boli zistené súkromné kľúče v peňaženke {%s} so zakázanými súkromnými kľúčmi.</translation>
     </message>
-    <message>
-        <source>Warning: We do not appear to fully agree with our peers! You may need to upgrade, or other nodes may need to upgrade.</source>
-        <translation type="unfinished">Varovanie: Zjavne sa úplne nezhodujeme s našimi peer-mi! Možno potrebujete prejsť na novšiu verziu alebo ostatné uzly potrebujú vyššiu verziu.</translation>
-    </message>
     <message>
         <source>Witness data for blocks after height %d requires validation. Please restart with -reindex.</source>
         <translation type="unfinished">Svedecké údaje pre bloky za výškou %d vyžadujú overenie. Prosím reštartujte s parametrom -reindex.</translation>
@@ -4285,14 +4287,6 @@ Choďte do Súbor &gt; Otvoriť Peňaženku, pre načítanie peňaženky.
         <source>Option '-checkpoints' is set but checkpoints were removed. This option has no effect.</source>
         <translation type="unfinished">Možnosť „-checkpoints“ je nastavená, ale kontrolné body boli odstránené. Táto možnosť nemá žiadny účinok.</translation>
     </message>
-    <message>
-        <source>Option '-maxorphantx' is set but no longer has any effect (see release notes). Please remove it from your configuration.</source>
-        <translation type="unfinished">Možnosť „-maxorphantx“ je nastavená, ale už nemá žiadny účinok (pozri poznámky k vydaniu). Odstráňte ju z konfigurácie.</translation>
-    </message>
-    <message>
-        <source>Options '-datacarrier' or '-datacarriersize' are set but are marked as deprecated. They will be removed in a future version.</source>
-        <translation type="unfinished">Možnosti „-datacarrier“ alebo „-datacarriersize“ sú nastavené, ale označené ako zastarané. V budúcej verzii budú odstránené.</translation>
-    </message>
     <message>
         <source>Outbound connections restricted to CJDNS (-onlynet=cjdns) but -cjdnsreachable is not provided</source>
         <translation type="unfinished">Odchádzajúce spojenia sú obmedzené na CJDNS (-onlynet=cjdns) ale neoblo zadané "-cjdnsreachable"</translation>
@@ -4383,10 +4377,6 @@ Nepodarilo sa obnoviť zálohu peňaženky.</translation>
         <source>whitebind may only be used for incoming connections ("out" was passed)</source>
         <translation type="unfinished">"whitebind" môže byť použité len pre prichádzajúce spojenia (bolo zadané "out")</translation>
     </message>
-    <message>
-        <source>-paytxfee is deprecated and will be fully removed in v31.0.</source>
-        <translation type="unfinished">-paytxfee je zastaraný a bude úplne odstránený vo verzii v31.0.</translation>
-    </message>
     <message>
         <source>A fatal internal error occurred, see debug.log for details: </source>
         <translation type="unfinished">Nastala kritická interná chyba, pozrite súbor debug.log pre detaily: </translation>
@@ -4407,10 +4397,6 @@ Nepodarilo sa obnoviť zálohu peňaženky.</translation>
         <source>Can't spend unconfirmed version 3 pre-selected input with a version %d tx</source>
         <translation type="unfinished">Nemožno minúť nepotvrdený predvolený vstup verzie 3 s verziou %d tx</translation>
     </message>
-    <message>
-        <source>Cannot add WalletDescriptor to a non-descriptor wallet</source>
-        <translation type="unfinished">Nie je možné pridať deskriptor peňaženky do peňaženky bez deskriptora</translation>
-    </message>
     <message>
         <source>Cannot write to directory '%s'; check permissions.</source>
         <translation type="unfinished">Nemôžem zapisovať do priečinka '%s'; skontrolujte oprávnenia.</translation>
@@ -4459,10 +4445,6 @@ Nepodarilo sa obnoviť zálohu peňaženky.</translation>
         <source>Elliptic curve cryptography sanity check failure. %s is shutting down.</source>
         <translation type="unfinished">Šifrovanie eliptickými krivkami neprešlo internou kontrolou správnosti. %s sa ukončí.</translation>
     </message>
-    <message>
-        <source>Error creating %s</source>
-        <translation type="unfinished">Chyba pri vytváraní %s</translation>
-    </message>
     <message>
         <source>Error initializing block database</source>
         <translation type="unfinished">Chyba inicializácie databázy blokov</translation>
@@ -4471,10 +4453,6 @@ Nepodarilo sa obnoviť zálohu peňaženky.</translation>
         <source>Error loading %s</source>
         <translation type="unfinished">Chyba načítania %s</translation>
     </message>
-    <message>
-        <source>Error loading %s: Private keys can only be disabled during creation</source>
-        <translation type="unfinished">Chyba pri načítaní %s: Súkromné kľúče môžu byť zakázané len počas vytvárania</translation>
-    </message>
     <message>
         <source>Error loading %s: Wallet corrupted</source>
         <translation type="unfinished">Chyba načítania %s: Peňaženka je poškodená</translation>
@@ -4623,10 +4601,6 @@ Nepodarilo sa obnoviť zálohu peňaženky.</translation>
         <source>Failed to close file when writing block.</source>
         <translation type="unfinished">Pri zápise bloku sa nepodarilo zatvoriť súbor.</translation>
     </message>
-    <message>
-        <source>Failed to connect best block (%s).</source>
-        <translation type="unfinished">Nepodarilo sa pripojiť najlepší blok (%s).</translation>
-    </message>
     <message>
         <source>Failed to disconnect block.</source>
         <translation type="unfinished">Nepodarilo sa odpojiť blok.</translation>
@@ -4651,14 +4625,6 @@ Nepodarilo sa obnoviť zálohu peňaženky.</translation>
         <source>Failed to write block.</source>
         <translation type="unfinished">Nepodarilo sa zapísať blok.</translation>
     </message>
-    <message>
-        <source>Failed to write to block index database.</source>
-        <translation type="unfinished">Nepodarilo sa zapísať do databázy indexov blokov.</translation>
-    </message>
-    <message>
-        <source>Failed to write to coin database.</source>
-        <translation type="unfinished">Nepodarilo sa zapísať do databázy mincí.</translation>
-    </message>
     <message>
         <source>Failed to write undo data.</source>
         <translation type="unfinished">Nepodarilo sa zapísať údaje pre krok späť.</translation>
@@ -4711,10 +4677,6 @@ Nepodarilo sa obnoviť zálohu peňaženky.</translation>
         <source>Invalid P2P permission: '%s'</source>
         <translation type="unfinished">Neplatné oprávnenie P2P: '%s'</translation>
     </message>
-    <message>
-        <source>Invalid amount for %s=&lt;amount&gt;: '%s' (must be at least %s)</source>
-        <translation type="unfinished">Neplatné množstvo pre %s=&lt;amount&gt;: '%s' (musí byť aspoň %s)</translation>
-    </message>
     <message>
         <source>Invalid amount for %s=&lt;amount&gt;: '%s'</source>
         <translation type="unfinished">Neplatné množstvo pre %s=&lt;amount&gt;: '%s'</translation>
@@ -4915,10 +4877,6 @@ Nepodarilo sa obnoviť zálohu peňaženky.</translation>
         <source>This is the minimum transaction fee you pay on every transaction.</source>
         <translation type="unfinished">Toto je minimálny poplatok za transakciu pri každej transakcii.</translation>
     </message>
-    <message>
-        <source>This is the transaction fee you will pay if you send a transaction.</source>
-        <translation type="unfinished">Toto je poplatok za transakciu pri odoslaní transakcie.</translation>
-    </message>
     <message>
         <source>Transaction %s does not belong to this wallet</source>
         <translation type="unfinished">Transakcia %s nepatrí do tejto peňaženky</translation>
diff --git a/src/qt/locale/bitcoin_sl.ts b/src/qt/locale/bitcoin_sl.ts
index 65aef3023eda..cbae7e8fc9f4 100644
--- a/src/qt/locale/bitcoin_sl.ts
+++ b/src/qt/locale/bitcoin_sl.ts
@@ -597,11 +597,23 @@ Podpisovanje je možno le s podedovanimi ("legacy") naslovi.</translation>
     </message>
     <message>
         <source>Connecting to peers…</source>
-        <translation type="unfinished">Povezujem se s soležniki…</translation>
+        <translation type="unfinished">Povezujem se s soležniki...</translation>
+    </message>
+    <message>
+        <source>Request payments (generates QR codes and bitcoin: URIs)</source>
+        <translation type="unfinished">Zahtevajte plačilo (ustvarite zahtevek s kodo QR in URI tipa bitcoin)</translation>
+    </message>
+    <message>
+        <source>Show the list of used sending addresses and labels</source>
+        <translation type="unfinished">Preglejte in uredite seznam naslovov, na katere ste kdaj poslali plačila</translation>
+    </message>
+    <message>
+        <source>Show the list of used receiving addresses and labels</source>
+        <translation type="unfinished">Preglejte in uredite seznam naslovov, na katere ste kdaj prejeli plačila</translation>
     </message>
     <message>
         <source>&amp;Command-line options</source>
-        <translation type="unfinished">&amp;Možnosti iz ukazne vrstice</translation>
+        <translation type="unfinished">Možnosti &amp;ukazne vrstice</translation>
     </message>
     <message numerus="yes">
         <source>Processed %n block(s) of transaction history.</source>
@@ -612,6 +624,38 @@ Podpisovanje je možno le s podedovanimi ("legacy") naslovi.</translation>
             <numerusform>Obdelanih %n blokov zgodovine transakcij.</numerusform>
         </translation>
     </message>
+    <message>
+        <source>%1 behind</source>
+        <translation type="unfinished">%1 zaostanka</translation>
+    </message>
+    <message>
+        <source>Catching up…</source>
+        <translation type="unfinished">Dohitevam...</translation>
+    </message>
+    <message>
+        <source>Last received block was generated %1 ago.</source>
+        <translation type="unfinished">Zadnji prejeti blok je star %1.</translation>
+    </message>
+    <message>
+        <source>Transactions after this will not yet be visible.</source>
+        <translation type="unfinished">Novejše transakcije še ne bodo vidne.</translation>
+    </message>
+    <message>
+        <source>Error</source>
+        <translation type="unfinished">Napaka</translation>
+    </message>
+    <message>
+        <source>Warning</source>
+        <translation type="unfinished">Opozorilo</translation>
+    </message>
+    <message>
+        <source>Information</source>
+        <translation type="unfinished">Informacije</translation>
+    </message>
+    <message>
+        <source>Up to date</source>
+        <translation type="unfinished">Ažurno</translation>
+    </message>
     <message>
         <source>Load Partially Signed Bitcoin Transaction</source>
         <translation type="unfinished">Naloži delno podpisano bitcoin-transakcijo</translation>
@@ -1047,6 +1091,16 @@ Podpisovanje je možno le s podedovanimi ("legacy") naslovi.</translation>
         <source>The wallet '%1' was migrated successfully.</source>
         <translation type="unfinished">Denarnica '%1' migrirana uspešno.</translation>
     </message>
+    <message>
+        <source>Restore Wallet</source>
+        <extracomment>Title of progress window which is displayed when wallets are being restored.</extracomment>
+        <translation type="unfinished">Obnovi denarnico</translation>
+    </message>
+    <message>
+        <source>Restoring Wallet &lt;b&gt;%1&lt;/b&gt;…</source>
+        <extracomment>Descriptive text of the restore wallets progress window which indicates to the user that wallets are currently being restored.</extracomment>
+        <translation type="unfinished">Obnavljanje denarnice &lt;b&gt;%1&lt;/b&gt;...</translation>
+    </message>
     <message>
         <source>Migration failed</source>
         <translation type="unfinished">Migracija neuspešna</translation>
@@ -1170,10 +1224,6 @@ Podpisovanje je možno le s podedovanimi ("legacy") naslovi.</translation>
         <source>Disable Private Keys</source>
         <translation type="unfinished">Onemogoči zasebne ključe</translation>
     </message>
-    <message>
-        <source>Make a blank wallet. Blank wallets do not initially have private keys or scripts. Private keys and addresses can be imported, or an HD seed can be set, at a later time.</source>
-        <translation type="unfinished">Ustvari prazno denarnico. Prazne denarnice ne vključujejo zasebnih ključev ali skript. Pozneje lahko uvozite zasebne ključe ali vnesete HD-seme.</translation>
-    </message>
     <message>
         <source>Make Blank Wallet</source>
         <translation type="unfinished">Ustvari prazno denarnico</translation>
@@ -1913,9 +1963,14 @@ Podpisovanje je možno le s podedovanimi ("legacy") naslovi.</translation>
         <source>Could not sign any more inputs.</source>
         <translation type="unfinished">Ne morem podpisati več kot toliko vhodov.</translation>
     </message>
-    <message>
-        <source>Signed %1 inputs, but more signatures are still required.</source>
-        <translation type="unfinished">%1 vhodov podpisanih, a potrebnih je več podpisov.</translation>
+    <message numerus="yes">
+        <source>Signed %n input(s), but more signatures are still required.</source>
+        <translation type="unfinished">
+            <numerusform />
+            <numerusform />
+            <numerusform />
+            <numerusform />
+        </translation>
     </message>
     <message>
         <source>Signed transaction successfully. Transaction is ready to broadcast.</source>
@@ -1970,9 +2025,14 @@ Podpisovanje je možno le s podedovanimi ("legacy") naslovi.</translation>
         <source>or</source>
         <translation type="unfinished">ali</translation>
     </message>
-    <message>
-        <source>Transaction has %1 unsigned inputs.</source>
-        <translation type="unfinished">Transakcija ima toliko nepodpisanih vhodov: %1.</translation>
+    <message numerus="yes">
+        <source>Transaction has %n unsigned input(s).</source>
+        <translation type="unfinished">
+            <numerusform />
+            <numerusform />
+            <numerusform />
+            <numerusform />
+        </translation>
     </message>
     <message>
         <source>Transaction is missing some information about inputs.</source>
@@ -2263,10 +2323,6 @@ Svetujemo, da prodajalca prosite, naj vam priskrbi URI na podlagi BIP21.</transl
         <source>Transaction Relay</source>
         <translation type="unfinished">Posredovanje transakcij</translation>
     </message>
-    <message>
-        <source>Starting Block</source>
-        <translation type="unfinished">Začetni blok</translation>
-    </message>
     <message>
         <source>Synced Headers</source>
         <translation type="unfinished">Sinhronizirana zaglavja</translation>
@@ -2964,10 +3020,6 @@ Opomba: Ker se provizija izračuna na bajt, bi provizija "100 satoshijev na kvB"
         <source>Copy quantity</source>
         <translation type="unfinished">Kopiraj količino</translation>
     </message>
-    <message>
-        <source>Copy amount</source>
-        <translation type="unfinished">Kopiraj znesek</translation>
-    </message>
     <message>
         <source>Copy fee</source>
         <translation type="unfinished">Kopiraj provizijo</translation>
@@ -3124,10 +3176,6 @@ Opomba: Ker se provizija izračuna na bajt, bi provizija "100 satoshijev na kvB"
         <source>The amount exceeds your balance.</source>
         <translation type="unfinished">Znesek presega vaše dobroimetje.</translation>
     </message>
-    <message>
-        <source>The total exceeds your balance when the %1 transaction fee is included.</source>
-        <translation type="unfinished">Celotni znesek z vključeno provizijo %1 je višji od vašega dobroimetja.</translation>
-    </message>
     <message>
         <source>Duplicate address found: addresses should only be used once each.</source>
         <translation type="unfinished">Naslov je že bil uporabljen. Vsak naslov naj bi se uporabil samo enkrat.</translation>
@@ -4048,10 +4096,6 @@ Za odpiranje denarnice kliknite Datoteka &gt; Odpri denarnico
         <source>Warning: Private keys detected in wallet {%s} with disabled private keys</source>
         <translation type="unfinished">Opozorilo: v denarnici {%s} z onemogočenimi zasebnimi ključi so prisotni zasebni ključi.</translation>
     </message>
-    <message>
-        <source>Warning: We do not appear to fully agree with our peers! You may need to upgrade, or other nodes may need to upgrade.</source>
-        <translation type="unfinished">Opozorilo: Trenutno se s soležniki ne strinjamo v popolnosti! Morda morate posodobiti programsko opremo ali pa morajo to storiti vaši soležniki.</translation>
-    </message>
     <message>
         <source>Witness data for blocks after height %d requires validation. Please restart with -reindex.</source>
         <translation type="unfinished">Podatke o priči (witness) za bloke nad višino %d je potrebno preveriti. Ponovno zaženite program z možnostjo -reindex.</translation>
@@ -4156,10 +4200,6 @@ Obnovitev varnostne kopije denarnice ni bila mogoča.</translation>
         <source>Dump file %s does not exist.</source>
         <translation type="unfinished">Izvozna (dump) datoteka %s ne obstaja.</translation>
     </message>
-    <message>
-        <source>Error creating %s</source>
-        <translation type="unfinished">Napaka pri tvorbi %s</translation>
-    </message>
     <message>
         <source>Error initializing block database</source>
         <translation type="unfinished">Napaka pri inicializaciji podatkovne baze blokov</translation>
@@ -4168,10 +4208,6 @@ Obnovitev varnostne kopije denarnice ni bila mogoča.</translation>
         <source>Error loading %s</source>
         <translation type="unfinished">Napaka pri nalaganju %s</translation>
     </message>
-    <message>
-        <source>Error loading %s: Private keys can only be disabled during creation</source>
-        <translation type="unfinished">Napaka pri nalaganju %s: Zasebni ključi se lahko onemogočijo samo ob tvorbi.</translation>
-    </message>
     <message>
         <source>Error loading %s: Wallet corrupted</source>
         <translation type="unfinished">Napaka pri nalaganju %s: Denarnica ovkarjena</translation>
@@ -4456,10 +4492,6 @@ Obnovitev varnostne kopije denarnice ni bila mogoča.</translation>
         <source>This is the minimum transaction fee you pay on every transaction.</source>
         <translation type="unfinished">To je minimalna transakcijska provizija, ki jo plačate za vsako transakcijo.</translation>
     </message>
-    <message>
-        <source>This is the transaction fee you will pay if you send a transaction.</source>
-        <translation type="unfinished">To je provizija, ki jo boste plačali, ko pošljete transakcijo.</translation>
-    </message>
     <message>
         <source>Transaction amount too small</source>
         <translation type="unfinished">Znesek transakcije je prenizek</translation>
diff --git a/src/qt/locale/bitcoin_sm.ts b/src/qt/locale/bitcoin_sm.ts
index 9ac95010a619..a24d67c17e99 100644
--- a/src/qt/locale/bitcoin_sm.ts
+++ b/src/qt/locale/bitcoin_sm.ts
@@ -1057,6 +1057,16 @@ O le fa'amaoniga o le malaga o le a fai se kopi o le 'aofa'i a'o le'i fa'aauau l
         <source>Solvable but not watched scripts have been migrated to a new wallet named '%1'.</source>
         <translation type="unfinished">O tusitusiga e mafai ona foʻia ae leʻi mataʻituina ua siitia atu i se atotupe fou ua faaigoaina '%1'.</translation>
     </message>
+    <message>
+        <source>Restore Wallet</source>
+        <extracomment>Title of progress window which is displayed when wallets are being restored.</extracomment>
+        <translation type="unfinished">Toe fa'aleleia le Pusa O le 'Aumauga</translation>
+    </message>
+    <message>
+        <source>Restoring Wallet &lt;b&gt;%1&lt;/b&gt;…</source>
+        <extracomment>Descriptive text of the restore wallets progress window which indicates to the user that wallets are currently being restored.</extracomment>
+        <translation type="unfinished">Toe Faʻaleleia le ʻApefaʻamau &lt;b&gt;%1&lt;/b&gt;…</translation>
+    </message>
     <message>
         <source>Migration failed</source>
         <translation type="unfinished">Ua le manuia le siʻitia.</translation>
@@ -1180,10 +1190,6 @@ O le fa'amaoniga o le malaga o le a fai se kopi o le 'aofa'i a'o le'i fa'aauau l
         <source>Disable Private Keys</source>
         <translation type="unfinished">Faʻamaonia o Ki Faʻamaonia</translation>
     </message>
-    <message>
-        <source>Make a blank wallet. Blank wallets do not initially have private keys or scripts. Private keys and addresses can be imported, or an HD seed can be set, at a later time.</source>
-        <translation type="unfinished">Fai se 'uati leai se mea i totonu. O 'uati leai se mea i totonu e le'o i ai i le amataga ki patino po'o tusitusiga. E mafai ona fa'amae'a ki patino ma tu'ufua, po'o le fa'amaonia o se HD seed i se taimi mulimuli.</translation>
-    </message>
     <message>
         <source>Make Blank Wallet</source>
         <translation type="unfinished">Fai se 'Apera Tetele</translation>
@@ -1864,6 +1870,25 @@ O le fa'amaoniga o le malaga o le a fai se kopi o le 'aofa'i a'o le'i fa'aauau l
         <translation type="unfinished">Fa'amaoniga talu ai</translation>
     </message>
     </context>
+<context>
+    <name>PSBTOperationsDialog</name>
+    <message numerus="yes">
+        <source>Signed %n input(s), but more signatures are still required.</source>
+        <translation type="unfinished">
+            <numerusform />
+            <numerusform />
+            <numerusform />
+        </translation>
+    </message>
+    <message numerus="yes">
+        <source>Transaction has %n unsigned input(s).</source>
+        <translation type="unfinished">
+            <numerusform />
+            <numerusform />
+            <numerusform />
+        </translation>
+    </message>
+    </context>
 <context>
     <name>PeerTableModel</name>
     <message>
diff --git a/src/qt/locale/bitcoin_sq.ts b/src/qt/locale/bitcoin_sq.ts
index fa0def743d75..3e0e575eec5d 100644
--- a/src/qt/locale/bitcoin_sq.ts
+++ b/src/qt/locale/bitcoin_sq.ts
@@ -524,6 +524,23 @@ Signing is only possible with addresses of the type 'legacy'.</source>
         <translation type="unfinished">Formilarë</translation>
     </message>
     </context>
+<context>
+    <name>PSBTOperationsDialog</name>
+    <message numerus="yes">
+        <source>Signed %n input(s), but more signatures are still required.</source>
+        <translation type="unfinished">
+            <numerusform />
+            <numerusform />
+        </translation>
+    </message>
+    <message numerus="yes">
+        <source>Transaction has %n unsigned input(s).</source>
+        <translation type="unfinished">
+            <numerusform />
+            <numerusform />
+        </translation>
+    </message>
+    </context>
 <context>
     <name>PeerTableModel</name>
     <message>
diff --git a/src/qt/locale/bitcoin_sr.ts b/src/qt/locale/bitcoin_sr.ts
index 9f805d906073..28ab8471c572 100644
--- a/src/qt/locale/bitcoin_sr.ts
+++ b/src/qt/locale/bitcoin_sr.ts
@@ -1091,6 +1091,11 @@ Signing is only possible with addresses of the type 'legacy'.</source>
         <source>The wallet '%1' was migrated successfully.</source>
         <translation type="unfinished">Novčanik '%1' je uspešno prenešen. </translation>
     </message>
+    <message>
+        <source>Restore Wallet</source>
+        <extracomment>Title of progress window which is displayed when wallets are being restored.</extracomment>
+        <translation type="unfinished">Поврати Новчаник</translation>
+    </message>
     <message>
         <source>Migration failed</source>
         <translation type="unfinished">Prenošenje novčanika je neuspešno</translation>
@@ -1186,10 +1191,6 @@ Signing is only possible with addresses of the type 'legacy'.</source>
         <source>Disable Private Keys</source>
         <translation type="unfinished">Онемогући Приватне Кључеве</translation>
     </message>
-    <message>
-        <source>Make a blank wallet. Blank wallets do not initially have private keys or scripts. Private keys and addresses can be imported, or an HD seed can be set, at a later time.</source>
-        <translation type="unfinished">Направи празан новчаник. Празни новчанци немају приватане кључеве или скрипте. Приватни кључеви могу се увести, или HD семе може бити постављено касније.</translation>
-    </message>
     <message>
         <source>Make Blank Wallet</source>
         <translation type="unfinished">Направи Празан Новчаник</translation>
@@ -1851,9 +1852,13 @@ Signing is only possible with addresses of the type 'legacy'.</source>
         <source>Could not sign any more inputs.</source>
         <translation type="unfinished">Није могуће потписати више уноса.</translation>
     </message>
-    <message>
-        <source>Signed %1 inputs, but more signatures are still required.</source>
-        <translation type="unfinished">Потписано %1 поље, али је потребно још потписа.</translation>
+    <message numerus="yes">
+        <source>Signed %n input(s), but more signatures are still required.</source>
+        <translation type="unfinished">
+            <numerusform />
+            <numerusform />
+            <numerusform />
+        </translation>
     </message>
     <message>
         <source>Signed transaction successfully. Transaction is ready to broadcast.</source>
@@ -1908,9 +1913,13 @@ Signing is only possible with addresses of the type 'legacy'.</source>
         <source>or</source>
         <translation type="unfinished">или</translation>
     </message>
-    <message>
-        <source>Transaction has %1 unsigned inputs.</source>
-        <translation type="unfinished">Трансакција има %1 непотписана поља.</translation>
+    <message numerus="yes">
+        <source>Transaction has %n unsigned input(s).</source>
+        <translation type="unfinished">
+            <numerusform />
+            <numerusform />
+            <numerusform />
+        </translation>
     </message>
     <message>
         <source>Transaction is missing some information about inputs.</source>
@@ -2156,10 +2165,6 @@ If you are receiving this error you should request the merchant provide a BIP21
         <source>Version</source>
         <translation type="unfinished">Верзија</translation>
     </message>
-    <message>
-        <source>Starting Block</source>
-        <translation type="unfinished">Почетни блок</translation>
-    </message>
     <message>
         <source>Synced Headers</source>
         <translation type="unfinished">Синхронизована заглавља</translation>
@@ -2939,10 +2944,6 @@ Note:  Since the fee is calculated on a per-byte basis, a fee rate of "100 satos
         <source>The amount exceeds your balance.</source>
         <translation type="unfinished">Овај износ је већи од вашег салда.</translation>
     </message>
-    <message>
-        <source>The total exceeds your balance when the %1 transaction fee is included.</source>
-        <translation type="unfinished">Укупни износ премашује ваш салдо, када се %1 провизија за трансакцију укључи у износ.</translation>
-    </message>
     <message>
         <source>Duplicate address found: addresses should only be used once each.</source>
         <translation type="unfinished">Пронађена је дуплирана адреса: адресе се требају користити само једном.</translation>
@@ -3761,10 +3762,6 @@ Note:  Since the fee is calculated on a per-byte basis, a fee rate of "100 satos
         <source>Warning: Private keys detected in wallet {%s} with disabled private keys</source>
         <translation type="unfinished">Упозорење: Приватни кључеви су пронађени у новчанику {%s} са онемогућеним приватним кључевима.</translation>
     </message>
-    <message>
-        <source>Warning: We do not appear to fully agree with our peers! You may need to upgrade, or other nodes may need to upgrade.</source>
-        <translation type="unfinished">Упозорење: Изгледа да се ми у потпуности не слажемо са нашим чворовима! Можда постоји потреба да урадите надоградњу, или други чворови морају да ураде надоградњу.</translation>
-    </message>
     <message>
         <source>You need to rebuild the database using -reindex to go back to unpruned mode.  This will redownload the entire blockchain</source>
         <translation type="unfinished">Обновите базу података користећи -reindex да би се вратили у нескраћени мод. Ово ће урадити поновно преузимање комплетног ланца података</translation>
@@ -3821,10 +3818,6 @@ Note:  Since the fee is calculated on a per-byte basis, a fee rate of "100 satos
         <source>Error loading %s</source>
         <translation type="unfinished">Грешка током учитавања %s</translation>
     </message>
-    <message>
-        <source>Error loading %s: Private keys can only be disabled during creation</source>
-        <translation type="unfinished">Грешка током учитавања %s: Приватни кључеви могу бити онемогућени само приликом креирања</translation>
-    </message>
     <message>
         <source>Error loading %s: Wallet corrupted</source>
         <translation type="unfinished">Грешка током учитавања %s: Новчаник је оштећен</translation>
@@ -3949,10 +3942,6 @@ Note:  Since the fee is calculated on a per-byte basis, a fee rate of "100 satos
         <source>This is the minimum transaction fee you pay on every transaction.</source>
         <translation type="unfinished">Ово је минимални износ провизије за трансакцију коју ћете платити на свакој трансакцији.</translation>
     </message>
-    <message>
-        <source>This is the transaction fee you will pay if you send a transaction.</source>
-        <translation type="unfinished">Ово је износ провизије за трансакцију коју ћете платити уколико шаљете трансакцију.</translation>
-    </message>
     <message>
         <source>Transaction amount too small</source>
         <translation type="unfinished">Износ трансакције премали.</translation>
diff --git a/src/qt/locale/bitcoin_sr@ijekavianlatin.ts b/src/qt/locale/bitcoin_sr@ijekavianlatin.ts
index c5951d0a15dc..eb651c36aeeb 100644
--- a/src/qt/locale/bitcoin_sr@ijekavianlatin.ts
+++ b/src/qt/locale/bitcoin_sr@ijekavianlatin.ts
@@ -361,40 +361,30 @@ Signing is only possible with addresses of the type 'legacy'.</source>
         <source>%n second(s)</source>
         <translation type="unfinished">
             <numerusform />
-            <numerusform />
-            <numerusform />
         </translation>
     </message>
     <message numerus="yes">
         <source>%n minute(s)</source>
         <translation type="unfinished">
             <numerusform />
-            <numerusform />
-            <numerusform />
         </translation>
     </message>
     <message numerus="yes">
         <source>%n hour(s)</source>
         <translation type="unfinished">
             <numerusform />
-            <numerusform />
-            <numerusform />
         </translation>
     </message>
     <message numerus="yes">
         <source>%n day(s)</source>
         <translation type="unfinished">
             <numerusform />
-            <numerusform />
-            <numerusform />
         </translation>
     </message>
     <message numerus="yes">
         <source>%n week(s)</source>
         <translation type="unfinished">
             <numerusform />
-            <numerusform />
-            <numerusform />
         </translation>
     </message>
     <message>
@@ -405,8 +395,6 @@ Signing is only possible with addresses of the type 'legacy'.</source>
         <source>%n year(s)</source>
         <translation type="unfinished">
             <numerusform />
-            <numerusform />
-            <numerusform />
         </translation>
     </message>
     <message>
@@ -613,8 +601,6 @@ Signing is only possible with addresses of the type 'legacy'.</source>
         <source>Processed %n block(s) of transaction history.</source>
         <translation type="unfinished">
             <numerusform />
-            <numerusform />
-            <numerusform />
         </translation>
     </message>
     <message>
@@ -784,8 +770,6 @@ Signing is only possible with addresses of the type 'legacy'.</source>
         <extracomment>A substring of the tooltip.</extracomment>
         <translation type="unfinished">
             <numerusform>%n активних конекција са Биткоин мрежом</numerusform>
-            <numerusform>%n активних конекција са Биткоин мрежом</numerusform>
-            <numerusform>%n активних конекција са Биткоин мрежом</numerusform>
         </translation>
     </message>
     <message>
@@ -1087,6 +1071,11 @@ Signing is only possible with addresses of the type 'legacy'.</source>
         <source>The wallet '%1' was migrated successfully.</source>
         <translation type="unfinished">Novčanik '%1' je uspešno prenešen. </translation>
     </message>
+    <message>
+        <source>Restore Wallet</source>
+        <extracomment>Title of progress window which is displayed when wallets are being restored.</extracomment>
+        <translation type="unfinished">Поврати Новчаник</translation>
+    </message>
     <message>
         <source>Migration failed</source>
         <translation type="unfinished">Prenošenje novčanika je neuspešno</translation>
@@ -1182,10 +1171,6 @@ Signing is only possible with addresses of the type 'legacy'.</source>
         <source>Disable Private Keys</source>
         <translation type="unfinished">Онемогући Приватне Кључеве</translation>
     </message>
-    <message>
-        <source>Make a blank wallet. Blank wallets do not initially have private keys or scripts. Private keys and addresses can be imported, or an HD seed can be set, at a later time.</source>
-        <translation type="unfinished">Направи празан новчаник. Празни новчанци немају приватане кључеве или скрипте. Приватни кључеви могу се увести, или HD семе може бити постављено касније.</translation>
-    </message>
     <message>
         <source>Make Blank Wallet</source>
         <translation type="unfinished">Направи Празан Новчаник</translation>
@@ -1363,24 +1348,18 @@ Signing is only possible with addresses of the type 'legacy'.</source>
         <source>%n GB of space available</source>
         <translation type="unfinished">
             <numerusform />
-            <numerusform />
-            <numerusform />
         </translation>
     </message>
     <message numerus="yes">
         <source>(of %n GB needed)</source>
         <translation type="unfinished">
             <numerusform>(од потребних %n GB)</numerusform>
-            <numerusform>(од потребних %n GB)</numerusform>
-            <numerusform>(од  потребних  %n GB)</numerusform>
         </translation>
     </message>
     <message numerus="yes">
         <source>(%n GB needed for full chain)</source>
         <translation type="unfinished">
             <numerusform>(%n GB потребно за цео ланац)</numerusform>
-            <numerusform>(%n GB потребно за цео ланац)</numerusform>
-            <numerusform>(%n GB потребно за цео ланац)</numerusform>
         </translation>
     </message>
     <message>
@@ -1396,8 +1375,6 @@ Signing is only possible with addresses of the type 'legacy'.</source>
         <extracomment>Explanatory text on the capability of the current prune target.</extracomment>
         <translation type="unfinished">
             <numerusform>(довољно за враћање резервних копија старих %n дана)</numerusform>
-            <numerusform>(довољно за враћање резервних копија старих %n дана)</numerusform>
-            <numerusform>(довољно за враћање резервних копија старих %n дана)</numerusform>
         </translation>
     </message>
     <message>
@@ -1847,9 +1824,11 @@ Signing is only possible with addresses of the type 'legacy'.</source>
         <source>Could not sign any more inputs.</source>
         <translation type="unfinished">Није могуће потписати више уноса.</translation>
     </message>
-    <message>
-        <source>Signed %1 inputs, but more signatures are still required.</source>
-        <translation type="unfinished">Потписано %1 поље, али је потребно још потписа.</translation>
+    <message numerus="yes">
+        <source>Signed %n input(s), but more signatures are still required.</source>
+        <translation type="unfinished">
+            <numerusform />
+        </translation>
     </message>
     <message>
         <source>Signed transaction successfully. Transaction is ready to broadcast.</source>
@@ -1904,9 +1883,11 @@ Signing is only possible with addresses of the type 'legacy'.</source>
         <source>or</source>
         <translation type="unfinished">или</translation>
     </message>
-    <message>
-        <source>Transaction has %1 unsigned inputs.</source>
-        <translation type="unfinished">Трансакција има %1 непотписана поља.</translation>
+    <message numerus="yes">
+        <source>Transaction has %n unsigned input(s).</source>
+        <translation type="unfinished">
+            <numerusform />
+        </translation>
     </message>
     <message>
         <source>Transaction is missing some information about inputs.</source>
@@ -2152,10 +2133,6 @@ If you are receiving this error you should request the merchant provide a BIP21
         <source>Version</source>
         <translation type="unfinished">Верзија</translation>
     </message>
-    <message>
-        <source>Starting Block</source>
-        <translation type="unfinished">Почетни блок</translation>
-    </message>
     <message>
         <source>Synced Headers</source>
         <translation type="unfinished">Синхронизована заглавља</translation>
@@ -2935,10 +2912,6 @@ Note:  Since the fee is calculated on a per-byte basis, a fee rate of "100 satos
         <source>The amount exceeds your balance.</source>
         <translation type="unfinished">Овај износ је већи од вашег салда.</translation>
     </message>
-    <message>
-        <source>The total exceeds your balance when the %1 transaction fee is included.</source>
-        <translation type="unfinished">Укупни износ премашује ваш салдо, када се %1 провизија за трансакцију укључи у износ.</translation>
-    </message>
     <message>
         <source>Duplicate address found: addresses should only be used once each.</source>
         <translation type="unfinished">Пронађена је дуплирана адреса: адресе се требају користити само једном.</translation>
@@ -2955,8 +2928,6 @@ Note:  Since the fee is calculated on a per-byte basis, a fee rate of "100 satos
         <source>Estimated to begin confirmation within %n block(s).</source>
         <translation type="unfinished">
             <numerusform />
-            <numerusform />
-            <numerusform />
         </translation>
     </message>
     <message>
@@ -3261,8 +3232,6 @@ Note:  Since the fee is calculated on a per-byte basis, a fee rate of "100 satos
         <source>matures in %n more block(s)</source>
         <translation type="unfinished">
             <numerusform />
-            <numerusform />
-            <numerusform />
         </translation>
     </message>
     <message>
@@ -3757,10 +3726,6 @@ Note:  Since the fee is calculated on a per-byte basis, a fee rate of "100 satos
         <source>Warning: Private keys detected in wallet {%s} with disabled private keys</source>
         <translation type="unfinished">Упозорење: Приватни кључеви су пронађени у новчанику {%s} са онемогућеним приватним кључевима.</translation>
     </message>
-    <message>
-        <source>Warning: We do not appear to fully agree with our peers! You may need to upgrade, or other nodes may need to upgrade.</source>
-        <translation type="unfinished">Упозорење: Изгледа да се ми у потпуности не слажемо са нашим чворовима! Можда постоји потреба да урадите надоградњу, или други чворови морају да ураде надоградњу.</translation>
-    </message>
     <message>
         <source>You need to rebuild the database using -reindex to go back to unpruned mode.  This will redownload the entire blockchain</source>
         <translation type="unfinished">Обновите базу података користећи -reindex да би се вратили у нескраћени мод. Ово ће урадити поновно преузимање комплетног ланца података</translation>
@@ -3817,10 +3782,6 @@ Note:  Since the fee is calculated on a per-byte basis, a fee rate of "100 satos
         <source>Error loading %s</source>
         <translation type="unfinished">Грешка током учитавања %s</translation>
     </message>
-    <message>
-        <source>Error loading %s: Private keys can only be disabled during creation</source>
-        <translation type="unfinished">Грешка током учитавања %s: Приватни кључеви могу бити онемогућени само приликом креирања</translation>
-    </message>
     <message>
         <source>Error loading %s: Wallet corrupted</source>
         <translation type="unfinished">Грешка током учитавања %s: Новчаник је оштећен</translation>
@@ -3945,10 +3906,6 @@ Note:  Since the fee is calculated on a per-byte basis, a fee rate of "100 satos
         <source>This is the minimum transaction fee you pay on every transaction.</source>
         <translation type="unfinished">Ово је минимални износ провизије за трансакцију коју ћете платити на свакој трансакцији.</translation>
     </message>
-    <message>
-        <source>This is the transaction fee you will pay if you send a transaction.</source>
-        <translation type="unfinished">Ово је износ провизије за трансакцију коју ћете платити уколико шаљете трансакцију.</translation>
-    </message>
     <message>
         <source>Transaction amount too small</source>
         <translation type="unfinished">Износ трансакције премали.</translation>
diff --git a/src/qt/locale/bitcoin_sr@latin.ts b/src/qt/locale/bitcoin_sr@latin.ts
index ef778aee0f00..fe35264710c5 100644
--- a/src/qt/locale/bitcoin_sr@latin.ts
+++ b/src/qt/locale/bitcoin_sr@latin.ts
@@ -361,40 +361,30 @@ Signing is only possible with addresses of the type 'legacy'.</source>
         <source>%n second(s)</source>
         <translation type="unfinished">
             <numerusform />
-            <numerusform />
-            <numerusform />
         </translation>
     </message>
     <message numerus="yes">
         <source>%n minute(s)</source>
         <translation type="unfinished">
             <numerusform />
-            <numerusform />
-            <numerusform />
         </translation>
     </message>
     <message numerus="yes">
         <source>%n hour(s)</source>
         <translation type="unfinished">
             <numerusform />
-            <numerusform />
-            <numerusform />
         </translation>
     </message>
     <message numerus="yes">
         <source>%n day(s)</source>
         <translation type="unfinished">
             <numerusform />
-            <numerusform />
-            <numerusform />
         </translation>
     </message>
     <message numerus="yes">
         <source>%n week(s)</source>
         <translation type="unfinished">
             <numerusform />
-            <numerusform />
-            <numerusform />
         </translation>
     </message>
     <message>
@@ -405,8 +395,6 @@ Signing is only possible with addresses of the type 'legacy'.</source>
         <source>%n year(s)</source>
         <translation type="unfinished">
             <numerusform />
-            <numerusform />
-            <numerusform />
         </translation>
     </message>
     <message>
@@ -613,8 +601,6 @@ Signing is only possible with addresses of the type 'legacy'.</source>
         <source>Processed %n block(s) of transaction history.</source>
         <translation type="unfinished">
             <numerusform />
-            <numerusform />
-            <numerusform />
         </translation>
     </message>
     <message>
@@ -784,8 +770,6 @@ Signing is only possible with addresses of the type 'legacy'.</source>
         <extracomment>A substring of the tooltip.</extracomment>
         <translation type="unfinished">
             <numerusform>%n активних конекција са Биткоин мрежом</numerusform>
-            <numerusform>%n активних конекција са Биткоин мрежом</numerusform>
-            <numerusform>%n активних конекција са Биткоин мрежом</numerusform>
         </translation>
     </message>
     <message>
@@ -1087,6 +1071,11 @@ Signing is only possible with addresses of the type 'legacy'.</source>
         <source>The wallet '%1' was migrated successfully.</source>
         <translation type="unfinished">Novčanik '%1' je uspešno prenešen. </translation>
     </message>
+    <message>
+        <source>Restore Wallet</source>
+        <extracomment>Title of progress window which is displayed when wallets are being restored.</extracomment>
+        <translation type="unfinished">Поврати Новчаник</translation>
+    </message>
     <message>
         <source>Migration failed</source>
         <translation type="unfinished">Prenošenje novčanika je neuspešno</translation>
@@ -1182,10 +1171,6 @@ Signing is only possible with addresses of the type 'legacy'.</source>
         <source>Disable Private Keys</source>
         <translation type="unfinished">Онемогући Приватне Кључеве</translation>
     </message>
-    <message>
-        <source>Make a blank wallet. Blank wallets do not initially have private keys or scripts. Private keys and addresses can be imported, or an HD seed can be set, at a later time.</source>
-        <translation type="unfinished">Направи празан новчаник. Празни новчанци немају приватане кључеве или скрипте. Приватни кључеви могу се увести, или HD семе може бити постављено касније.</translation>
-    </message>
     <message>
         <source>Make Blank Wallet</source>
         <translation type="unfinished">Направи Празан Новчаник</translation>
@@ -1359,24 +1344,18 @@ Signing is only possible with addresses of the type 'legacy'.</source>
         <source>%n GB of space available</source>
         <translation type="unfinished">
             <numerusform />
-            <numerusform />
-            <numerusform />
         </translation>
     </message>
     <message numerus="yes">
         <source>(of %n GB needed)</source>
         <translation type="unfinished">
             <numerusform>(од потребних %n GB)</numerusform>
-            <numerusform>(од потребних %n GB)</numerusform>
-            <numerusform>(од  потребних  %n GB)</numerusform>
         </translation>
     </message>
     <message numerus="yes">
         <source>(%n GB needed for full chain)</source>
         <translation type="unfinished">
             <numerusform>(%n GB потребно за цео ланац)</numerusform>
-            <numerusform>(%n GB потребно за цео ланац)</numerusform>
-            <numerusform>(%n GB потребно за цео ланац)</numerusform>
         </translation>
     </message>
     <message>
@@ -1392,8 +1371,6 @@ Signing is only possible with addresses of the type 'legacy'.</source>
         <extracomment>Explanatory text on the capability of the current prune target.</extracomment>
         <translation type="unfinished">
             <numerusform>(довољно за враћање резервних копија старих %n дана)</numerusform>
-            <numerusform>(довољно за враћање резервних копија старих %n дана)</numerusform>
-            <numerusform>(довољно за враћање резервних копија старих %n дана)</numerusform>
         </translation>
     </message>
     <message>
@@ -1843,9 +1820,11 @@ Signing is only possible with addresses of the type 'legacy'.</source>
         <source>Could not sign any more inputs.</source>
         <translation type="unfinished">Није могуће потписати више уноса.</translation>
     </message>
-    <message>
-        <source>Signed %1 inputs, but more signatures are still required.</source>
-        <translation type="unfinished">Потписано %1 поље, али је потребно још потписа.</translation>
+    <message numerus="yes">
+        <source>Signed %n input(s), but more signatures are still required.</source>
+        <translation type="unfinished">
+            <numerusform />
+        </translation>
     </message>
     <message>
         <source>Signed transaction successfully. Transaction is ready to broadcast.</source>
@@ -1900,9 +1879,11 @@ Signing is only possible with addresses of the type 'legacy'.</source>
         <source>or</source>
         <translation type="unfinished">или</translation>
     </message>
-    <message>
-        <source>Transaction has %1 unsigned inputs.</source>
-        <translation type="unfinished">Трансакција има %1 непотписана поља.</translation>
+    <message numerus="yes">
+        <source>Transaction has %n unsigned input(s).</source>
+        <translation type="unfinished">
+            <numerusform />
+        </translation>
     </message>
     <message>
         <source>Transaction is missing some information about inputs.</source>
@@ -2148,10 +2129,6 @@ If you are receiving this error you should request the merchant provide a BIP21
         <source>Version</source>
         <translation type="unfinished">Верзија</translation>
     </message>
-    <message>
-        <source>Starting Block</source>
-        <translation type="unfinished">Почетни блок</translation>
-    </message>
     <message>
         <source>Synced Headers</source>
         <translation type="unfinished">Синхронизована заглавља</translation>
@@ -2931,10 +2908,6 @@ Note:  Since the fee is calculated on a per-byte basis, a fee rate of "100 satos
         <source>The amount exceeds your balance.</source>
         <translation type="unfinished">Овај износ је већи од вашег салда.</translation>
     </message>
-    <message>
-        <source>The total exceeds your balance when the %1 transaction fee is included.</source>
-        <translation type="unfinished">Укупни износ премашује ваш салдо, када се %1 провизија за трансакцију укључи у износ.</translation>
-    </message>
     <message>
         <source>Duplicate address found: addresses should only be used once each.</source>
         <translation type="unfinished">Пронађена је дуплирана адреса: адресе се требају користити само једном.</translation>
@@ -2951,8 +2924,6 @@ Note:  Since the fee is calculated on a per-byte basis, a fee rate of "100 satos
         <source>Estimated to begin confirmation within %n block(s).</source>
         <translation type="unfinished">
             <numerusform />
-            <numerusform />
-            <numerusform />
         </translation>
     </message>
     <message>
@@ -3257,8 +3228,6 @@ Note:  Since the fee is calculated on a per-byte basis, a fee rate of "100 satos
         <source>matures in %n more block(s)</source>
         <translation type="unfinished">
             <numerusform />
-            <numerusform />
-            <numerusform />
         </translation>
     </message>
     <message>
@@ -3753,10 +3722,6 @@ Note:  Since the fee is calculated on a per-byte basis, a fee rate of "100 satos
         <source>Warning: Private keys detected in wallet {%s} with disabled private keys</source>
         <translation type="unfinished">Упозорење: Приватни кључеви су пронађени у новчанику {%s} са онемогућеним приватним кључевима.</translation>
     </message>
-    <message>
-        <source>Warning: We do not appear to fully agree with our peers! You may need to upgrade, or other nodes may need to upgrade.</source>
-        <translation type="unfinished">Упозорење: Изгледа да се ми у потпуности не слажемо са нашим чворовима! Можда постоји потреба да урадите надоградњу, или други чворови морају да ураде надоградњу.</translation>
-    </message>
     <message>
         <source>You need to rebuild the database using -reindex to go back to unpruned mode.  This will redownload the entire blockchain</source>
         <translation type="unfinished">Обновите базу података користећи -reindex да би се вратили у нескраћени мод. Ово ће урадити поновно преузимање комплетног ланца података</translation>
@@ -3813,10 +3778,6 @@ Note:  Since the fee is calculated on a per-byte basis, a fee rate of "100 satos
         <source>Error loading %s</source>
         <translation type="unfinished">Грешка током учитавања %s</translation>
     </message>
-    <message>
-        <source>Error loading %s: Private keys can only be disabled during creation</source>
-        <translation type="unfinished">Грешка током учитавања %s: Приватни кључеви могу бити онемогућени само приликом креирања</translation>
-    </message>
     <message>
         <source>Error loading %s: Wallet corrupted</source>
         <translation type="unfinished">Грешка током учитавања %s: Новчаник је оштећен</translation>
@@ -3941,10 +3902,6 @@ Note:  Since the fee is calculated on a per-byte basis, a fee rate of "100 satos
         <source>This is the minimum transaction fee you pay on every transaction.</source>
         <translation type="unfinished">Ово је минимални износ провизије за трансакцију коју ћете платити на свакој трансакцији.</translation>
     </message>
-    <message>
-        <source>This is the transaction fee you will pay if you send a transaction.</source>
-        <translation type="unfinished">Ово је износ провизије за трансакцију коју ћете платити уколико шаљете трансакцију.</translation>
-    </message>
     <message>
         <source>Transaction amount too small</source>
         <translation type="unfinished">Износ трансакције премали.</translation>
diff --git a/src/qt/locale/bitcoin_sv.ts b/src/qt/locale/bitcoin_sv.ts
index 0fe7fb0fa496..ef5fc8521bee 100644
--- a/src/qt/locale/bitcoin_sv.ts
+++ b/src/qt/locale/bitcoin_sv.ts
@@ -21,6 +21,14 @@
         <source>C&amp;lose</source>
         <translation type="unfinished">S&amp;täng</translation>
     </message>
+    <message>
+        <source>Delete the currently selected address from the list</source>
+        <translation type="unfinished">Radera den markerade adressen från listan</translation>
+    </message>
+    <message>
+        <source>Enter address or label to search</source>
+        <translation type="unfinished">Ange en adress eller etikett att söka efter</translation>
+    </message>
     <message>
         <source>Export the data in the current tab to a file</source>
         <translation type="unfinished">Exportera informationen i aktuell flik till en fil</translation>
@@ -49,6 +57,11 @@
         <source>These are your Bitcoin addresses for sending payments. Always check the amount and the receiving address before sending coins.</source>
         <translation type="unfinished">Detta är dina Bitcoin-adresser för att skicka betalningar. Kontrollera alltid belopp och mottagaradress innan du skickar bitcoin.</translation>
     </message>
+    <message>
+        <source>These are your Bitcoin addresses for receiving payments. Use the 'Create new receiving address' button in the receive tab to create new addresses.
+Signing is only possible with addresses of the type 'legacy'.</source>
+        <translation type="unfinished">Detta är dina Bitcoinadresser för att ta emot betalningar. Använd knappen 'Skapa ny mottagaradress' i mottagsfliken för att skapa nya adresser. Signering är bara tillgänglig för adresser av typen 'legacy'</translation>
+    </message>
     <message>
         <source>&amp;Copy Address</source>
         <translation type="unfinished">&amp;Kopiera adress</translation>
@@ -1065,6 +1078,16 @@ Om den här plånboken innehåller lösbara</translation>
         <source>The wallet '%1' was migrated successfully.</source>
         <translation type="unfinished">Migrering av plånboken ' %1 ' genomförd.</translation>
     </message>
+    <message>
+        <source>Restore Wallet</source>
+        <extracomment>Title of progress window which is displayed when wallets are being restored.</extracomment>
+        <translation type="unfinished">Återställ Plånbok</translation>
+    </message>
+    <message>
+        <source>Restoring Wallet &lt;b&gt;%1&lt;/b&gt;…</source>
+        <extracomment>Descriptive text of the restore wallets progress window which indicates to the user that wallets are currently being restored.</extracomment>
+        <translation type="unfinished">Återskapar Plånboken &lt;b&gt;%1&lt;/b&gt;…</translation>
+    </message>
     <message>
         <source>Migration failed</source>
         <translation type="unfinished">Migrering misslyckades</translation>
@@ -1188,10 +1211,6 @@ Om den här plånboken innehåller lösbara</translation>
         <source>Disable Private Keys</source>
         <translation type="unfinished">Stäng av privata nycklar</translation>
     </message>
-    <message>
-        <source>Make a blank wallet. Blank wallets do not initially have private keys or scripts. Private keys and addresses can be imported, or an HD seed can be set, at a later time.</source>
-        <translation type="unfinished">Skapa en tom plånbok. Tomma plånböcker har från början inga privata nycklar eller skript. Privata nycklar och adresser kan importeras, eller en HD-seed kan väljas, vid ett senare tillfälle.</translation>
-    </message>
     <message>
         <source>Make Blank Wallet</source>
         <translation type="unfinished">Skapa tom plånbok</translation>
@@ -1860,6 +1879,13 @@ Om den här plånboken innehåller lösbara</translation>
         <source>Could not sign any more inputs.</source>
         <translation type="unfinished">Kunde inte signera några fler inmatningar.</translation>
     </message>
+    <message numerus="yes">
+        <source>Signed %n input(s), but more signatures are still required.</source>
+        <translation type="unfinished">
+            <numerusform />
+            <numerusform />
+        </translation>
+    </message>
     <message>
         <source>Unknown error processing transaction.</source>
         <translation type="unfinished">Ett fel uppstod när transaktionen behandlades.</translation>
@@ -1900,9 +1926,12 @@ Om den här plånboken innehåller lösbara</translation>
         <source>or</source>
         <translation type="unfinished">eller</translation>
     </message>
-    <message>
-        <source>Transaction has %1 unsigned inputs.</source>
-        <translation type="unfinished">Transaktion %1 har osignerad indata.</translation>
+    <message numerus="yes">
+        <source>Transaction has %n unsigned input(s).</source>
+        <translation type="unfinished">
+            <numerusform />
+            <numerusform />
+        </translation>
     </message>
     <message>
         <source>Transaction is missing some information about inputs.</source>
@@ -2143,10 +2172,6 @@ Om den här plånboken innehåller lösbara</translation>
         <source>Transaction Relay</source>
         <translation type="unfinished">Transaktionsrelä</translation>
     </message>
-    <message>
-        <source>Starting Block</source>
-        <translation type="unfinished">Startblock</translation>
-    </message>
     <message>
         <source>Synced Headers</source>
         <translation type="unfinished">Synkade huvuden</translation>
@@ -2783,10 +2808,6 @@ Om den här plånboken innehåller lösbara</translation>
         <source>The amount exceeds your balance.</source>
         <translation type="unfinished">Beloppet överstiger ditt saldo.</translation>
     </message>
-    <message>
-        <source>The total exceeds your balance when the %1 transaction fee is included.</source>
-        <translation type="unfinished">Totalbeloppet överstiger ditt saldo när transaktionsavgiften %1 är pålagd.</translation>
-    </message>
     <message>
         <source>Duplicate address found: addresses should only be used once each.</source>
         <translation type="unfinished">Dubblettadress hittades: adresser skall endast användas en gång var.</translation>
@@ -3604,10 +3625,6 @@ Gå till Fil &gt; Öppna plånbok för att läsa in en plånbok.
         <source>Warning: Private keys detected in wallet {%s} with disabled private keys</source>
         <translation type="unfinished">Varning: Privata nycklar upptäcktes i plånbok (%s) vilken har dessa inaktiverade</translation>
     </message>
-    <message>
-        <source>Warning: We do not appear to fully agree with our peers! You may need to upgrade, or other nodes may need to upgrade.</source>
-        <translation type="unfinished">Varning: Vi verkar inte helt överens med våra peers! Du kan behöva uppgradera, eller andra noder kan behöva uppgradera.</translation>
-    </message>
     <message>
         <source>You need to rebuild the database using -reindex to go back to unpruned mode.  This will redownload the entire blockchain</source>
         <translation type="unfinished">Du måste bygga om databasen genom att använda -reindex för att återgå till ogallrat läge. Detta kommer att ladda ner hela blockkedjan på nytt.</translation>
@@ -3676,10 +3693,6 @@ Gå till Fil &gt; Öppna plånbok för att läsa in en plånbok.
         <source>Error loading %s</source>
         <translation type="unfinished">Fel vid inläsning av %s</translation>
     </message>
-    <message>
-        <source>Error loading %s: Private keys can only be disabled during creation</source>
-        <translation type="unfinished">Fel vid inläsning av %s: Privata nycklar kan enbart inaktiveras när de skapas</translation>
-    </message>
     <message>
         <source>Error loading %s: Wallet corrupted</source>
         <translation type="unfinished">Fel vid inläsning av %s: Plånboken är korrupt</translation>
@@ -3872,10 +3885,6 @@ Gå till Fil &gt; Öppna plånbok för att läsa in en plånbok.
         <source>This is the minimum transaction fee you pay on every transaction.</source>
         <translation type="unfinished">Det här är minimiavgiften du kommer betala för varje transaktion.</translation>
     </message>
-    <message>
-        <source>This is the transaction fee you will pay if you send a transaction.</source>
-        <translation type="unfinished">Det här är transaktionsavgiften du kommer betala om du skickar en transaktion.</translation>
-    </message>
     <message>
         <source>Transaction amount too small</source>
         <translation type="unfinished">Transaktionsbeloppet är för litet</translation>
diff --git a/src/qt/locale/bitcoin_sw.ts b/src/qt/locale/bitcoin_sw.ts
index 60f9c371ff41..b6b93ff51524 100644
--- a/src/qt/locale/bitcoin_sw.ts
+++ b/src/qt/locale/bitcoin_sw.ts
@@ -553,6 +553,10 @@ Kutia sahihi kunawezekana tu kwa anwani za aina ya 'urithi'.</translation>
         <source>Catching up…</source>
         <translation type="unfinished">Inakamata...</translation>
     </message>
+    <message>
+        <source>Last received block was generated %1 ago.</source>
+        <translation type="unfinished">Kizuizi cha mwisho kilichopokelewa kilitolewa %1awali.</translation>
+    </message>
     <message>
         <source>Transactions after this will not yet be visible.</source>
         <translation type="unfinished">Shughuli baada ya hii bado hazitaonekana.</translation>
@@ -929,7 +933,7 @@ Kutia sahihi kunawezekana tu kwa anwani za aina ya 'urithi'.</translation>
     </message>
     <message>
         <source>(no label)</source>
-        <translation type="unfinished">(hamna chapa)</translation>
+        <translation type="unfinished">(hakuna lebo)</translation>
     </message>
     <message>
         <source>(change)</source>
@@ -999,6 +1003,11 @@ Mchakato wa uhamiaji utaunda nakala rudufu ya pochi kabla ya kuhama. Faili hii y
         <source>Migrate Wallet</source>
         <translation type="unfinished">Hamisha Pochi</translation>
     </message>
+    <message>
+        <source>Restore Wallet</source>
+        <extracomment>Title of progress window which is displayed when wallets are being restored.</extracomment>
+        <translation type="unfinished">Rejesha Pochi</translation>
+    </message>
     <message>
         <source>Migration failed</source>
         <translation type="unfinished">Uhamiaji haukufaulu</translation>
@@ -1100,10 +1109,6 @@ Mchakato wa uhamiaji utaunda nakala rudufu ya pochi kabla ya kuhama. Faili hii y
         <source>Disable private keys for this wallet. Wallets with private keys disabled will have no private keys and cannot have an HD seed or imported private keys. This is ideal for watch-only wallets.</source>
         <translation type="unfinished">Zima funguo za siri kwa ajili ya pochi hii. Pochi zenye funguo za siri zilizozimwa hazitakua na funguo za siri na hazitakuwa na mbegu ya HD au funguo za siri zilizoingizwa. Hii inafaa kwa pochi za uangalizi tu.</translation>
     </message>
-    <message>
-        <source>Make a blank wallet. Blank wallets do not initially have private keys or scripts. Private keys and addresses can be imported, or an HD seed can be set, at a later time.</source>
-        <translation type="unfinished">Tengeneza pochi tupu. Pochi tupu kwa kuanza hazina funguo za siri au hati. Funguo za siri zinaweza kuingizwa, au mbegu ya HD inaweza kuwekwa baadae.</translation>
-    </message>
     <message>
         <source>Use an external signing device such as a hardware wallet. Configure the external signer script in wallet preferences first.</source>
         <translation type="unfinished">Tumia kifaa cha kutia sahihi cha nje kama vile pochi ya maunzi. Sanidi hati ya kutia sahihi ya nje katika mapendeleo ya pochi kwanza.</translation>
@@ -1200,7 +1205,7 @@ Mchakato wa uhamiaji utaunda nakala rudufu ya pochi kabla ya kuhama. Faili hii y
     </message>
     <message>
         <source>Error</source>
-        <translation type="unfinished">Onyo</translation>
+        <translation type="unfinished">Kosa</translation>
     </message>
 </context>
 <context>
@@ -1218,6 +1223,23 @@ Mchakato wa uhamiaji utaunda nakala rudufu ya pochi kabla ya kuhama. Faili hii y
         <translation type="unfinished">Onyo</translation>
     </message>
     </context>
+<context>
+    <name>PSBTOperationsDialog</name>
+    <message numerus="yes">
+        <source>Signed %n input(s), but more signatures are still required.</source>
+        <translation type="unfinished">
+            <numerusform />
+            <numerusform />
+        </translation>
+    </message>
+    <message numerus="yes">
+        <source>Transaction has %n unsigned input(s).</source>
+        <translation type="unfinished">
+            <numerusform />
+            <numerusform />
+        </translation>
+    </message>
+    </context>
 <context>
     <name>PeerTableModel</name>
     <message>
@@ -1299,7 +1321,7 @@ Mchakato wa uhamiaji utaunda nakala rudufu ya pochi kabla ya kuhama. Faili hii y
     </message>
     <message>
         <source>Label</source>
-        <translation type="unfinished">Chapa</translation>
+        <translation type="unfinished">Lebo</translation>
     </message>
     <message>
         <source>(no label)</source>
@@ -1413,7 +1435,7 @@ Mchakato wa uhamiaji utaunda nakala rudufu ya pochi kabla ya kuhama. Faili hii y
     </message>
     <message>
         <source>(no label)</source>
-        <translation type="unfinished">(hakuna lebo)</translation>
+        <translation type="unfinished">(hamna chapa)</translation>
     </message>
     </context>
 <context>
@@ -1457,15 +1479,15 @@ Mchakato wa uhamiaji utaunda nakala rudufu ya pochi kabla ya kuhama. Faili hii y
     </message>
     <message>
         <source>Label</source>
-        <translation type="unfinished">Chapa</translation>
+        <translation type="unfinished">Lebo</translation>
     </message>
     <message>
         <source>Address</source>
-        <translation type="unfinished">Anwani</translation>
+        <translation type="unfinished">Anuani</translation>
     </message>
     <message>
         <source>Exporting Failed</source>
-        <translation type="unfinished">Kuuza Nje Kushindwa</translation>
+        <translation type="unfinished">Utoaji Haujafanikiwa</translation>
     </message>
     <message>
         <source>Exporting Successful</source>
@@ -1480,7 +1502,7 @@ Mchakato wa uhamiaji utaunda nakala rudufu ya pochi kabla ya kuhama. Faili hii y
     </message>
     <message>
         <source>Error</source>
-        <translation type="unfinished">Onyo</translation>
+        <translation type="unfinished">Kosa</translation>
     </message>
     </context>
 <context>
@@ -1511,7 +1533,7 @@ Mchakato wa uhamiaji utaunda nakala rudufu ya pochi kabla ya kuhama. Faili hii y
     </message>
     <message>
         <source>Error: Address book data in wallet cannot be identified to belong to migrated wallets</source>
-        <translation type="unfinished">Hitilafu: Data za kitabu cha anunai katika pochi haziwezi kutambulika kuwa ni ya pochi zilizohamia.</translation>
+        <translation type="unfinished">HITILAFU: Data za kitabu cha anunai katika pochi haziwezi kutambulika kuwa ni ya pochi zilizohamia.</translation>
     </message>
     <message>
         <source>default wallet</source>
diff --git a/src/qt/locale/bitcoin_szl.ts b/src/qt/locale/bitcoin_szl.ts
index a99920f282ac..b241ad99ca7f 100644
--- a/src/qt/locale/bitcoin_szl.ts
+++ b/src/qt/locale/bitcoin_szl.ts
@@ -1012,10 +1012,22 @@ once_cell = "1.18"</translation>
     </context>
 <context>
     <name>PSBTOperationsDialog</name>
+    <message numerus="yes">
+        <source>Signed %n input(s), but more signatures are still required.</source>
+        <translation type="unfinished">
+            <numerusform />
+        </translation>
+    </message>
     <message>
         <source>or</source>
         <translation type="unfinished">abo</translation>
     </message>
+    <message numerus="yes">
+        <source>Transaction has %n unsigned input(s).</source>
+        <translation type="unfinished">
+            <numerusform />
+        </translation>
+    </message>
     </context>
 <context>
     <name>PaymentServer</name>
@@ -1623,10 +1635,6 @@ once_cell = "1.18"</translation>
         <source>Error loading %s</source>
         <translation type="unfinished">Feler wgrŏwaniŏ %s</translation>
     </message>
-    <message>
-        <source>Error loading %s: Private keys can only be disabled during creation</source>
-        <translation type="unfinished">Feler wgrŏwaniŏ %s: Klucze prywatne mogōm być zastawiōne ino w czasie tworzyniŏ</translation>
-    </message>
     <message>
         <source>Error loading %s: Wallet corrupted</source>
         <translation type="unfinished">Feler wgrŏwaniŏ %s: Portmanyj poprzniōny</translation>
diff --git a/src/qt/locale/bitcoin_ta.ts b/src/qt/locale/bitcoin_ta.ts
index 119eaef62b3c..3c37d161d6dd 100644
--- a/src/qt/locale/bitcoin_ta.ts
+++ b/src/qt/locale/bitcoin_ta.ts
@@ -864,6 +864,14 @@ Signing is only possible with addresses of the type 'legacy'.</source>
         <translation type="unfinished">வாலட் உருவாக்கம் எச்சரிக்கை</translation>
     </message>
     </context>
+<context>
+    <name>MigrateWalletActivity</name>
+    <message>
+        <source>Restore Wallet</source>
+        <extracomment>Title of progress window which is displayed when wallets are being restored.</extracomment>
+        <translation type="unfinished">பணப்பையை மீட்டெடுக்க</translation>
+    </message>
+    </context>
 <context>
     <name>OpenWalletActivity</name>
     <message>
@@ -941,10 +949,6 @@ Signing is only possible with addresses of the type 'legacy'.</source>
         <source>Disable Private Keys</source>
         <translation type="unfinished">ப்ரைவேட் கீஸ் ஐ முடக்கு</translation>
     </message>
-    <message>
-        <source>Make a blank wallet. Blank wallets do not initially have private keys or scripts. Private keys and addresses can be imported, or an HD seed can be set, at a later time.</source>
-        <translation type="unfinished">காலியான வாலட்டை உருவாக்கு. காலியான வாலட்டிற்கு ஆரம்பத்தில் ப்ரைவேட் கீஸ் மற்றும் ஸ்கிரிப்ட் இருக்காது. ப்ரைவேட் கீஸ் மற்றும் முகவரிகளை இம்போர்ட் செய்து கொள்ளலாம், அல்லது எச்டி ஸீடை பின்னர், அமைத்து கொள்ளலாம்.</translation>
-    </message>
     <message>
         <source>Make Blank Wallet</source>
         <translation type="unfinished">காலியான வாலட்டை உருவாக்கு</translation>
@@ -1106,13 +1110,6 @@ Signing is only possible with addresses of the type 'legacy'.</source>
             <numerusform>(%n ஜிபி தேவை)</numerusform>
         </translation>
     </message>
-    <message numerus="yes">
-        <source>(%n GB needed for full chain)</source>
-        <translation type="unfinished">
-            <numerusform />
-            <numerusform />
-        </translation>
-    </message>
     <message>
         <source>At least %1 GB of data will be stored in this directory, and it will grow over time.</source>
         <translation type="unfinished">குறைந்தது %1 ஜிபி தரவு இந்த அடைவில் சேமிக்கப்படும், மேலும் காலப்போக்கில் அது வளரும்.</translation>
@@ -1494,6 +1491,13 @@ Signing is only possible with addresses of the type 'legacy'.</source>
         <source>Close</source>
         <translation type="unfinished">நெருக்கமான</translation>
     </message>
+    <message numerus="yes">
+        <source>Signed %n input(s), but more signatures are still required.</source>
+        <translation type="unfinished">
+            <numerusform />
+            <numerusform />
+        </translation>
+    </message>
     <message>
         <source>own address</source>
         <translation type="unfinished">சொந்த முகவரி</translation>
@@ -1506,6 +1510,13 @@ Signing is only possible with addresses of the type 'legacy'.</source>
         <source>or</source>
         <translation type="unfinished">அல்லது</translation>
     </message>
+    <message numerus="yes">
+        <source>Transaction has %n unsigned input(s).</source>
+        <translation type="unfinished">
+            <numerusform />
+            <numerusform />
+        </translation>
+    </message>
     </context>
 <context>
     <name>PaymentServer</name>
@@ -1700,10 +1711,6 @@ Signing is only possible with addresses of the type 'legacy'.</source>
         <source>Version</source>
         <translation type="unfinished">பதிப்பு</translation>
     </message>
-    <message>
-        <source>Starting Block</source>
-        <translation type="unfinished">பிளாக் தொடங்குகிறது</translation>
-    </message>
     <message>
         <source>Synced Headers</source>
         <translation type="unfinished">ஒத்திசைக்கப்பட்ட தலைப்புகள்</translation>
@@ -2209,10 +2216,6 @@ Signing is only possible with addresses of the type 'legacy'.</source>
         <source>The amount exceeds your balance.</source>
         <translation type="unfinished">தொகை உங்கள் இருப்பையைவிட அதிகமாக உள்ளது.</translation>
     </message>
-    <message>
-        <source>The total exceeds your balance when the %1 transaction fee is included.</source>
-        <translation type="unfinished">%1 பரிவர்த்தனைக் கட்டணம் சேர்க்கப்படும்போது மொத்த தொகை உங்கள் மீதம் உள்ள தொகையை மீறுகிறது.</translation>
-    </message>
     <message>
         <source>Duplicate address found: addresses should only be used once each.</source>
         <translation type="unfinished">நகல் முகவரி காணப்பட்டது: முகவரிகள் ஒவ்வொன்றும் ஒரு முறை மட்டுமே பயன்படுத்தப்பட வேண்டும்.</translation>
@@ -2933,10 +2936,6 @@ Signing is only possible with addresses of the type 'legacy'.</source>
         <source>Unable to replay blocks. You will need to rebuild the database using -reindex-chainstate.</source>
         <translation type="unfinished">பிளாக்களை இயக்க முடியவில்லை. -reindex-chainstate ஐப் பயன்படுத்தி டேட்டாபேசை மீண்டும் உருவாக்க வேண்டும்.</translation>
     </message>
-    <message>
-        <source>Warning: We do not appear to fully agree with our peers! You may need to upgrade, or other nodes may need to upgrade.</source>
-        <translation type="unfinished">எச்சரிக்கை: நாங்கள் எங்கள் பீர்களுடன் முழுமையாக உடன்படுவதாகத் தெரியவில்லை! நீங்கள் அப்க்ரேட் செய்ய வேண்டியிருக்கலாம், அல்லது மற்ற நோடுகள் அப்க்ரேட் செய்ய வேண்டியிருக்கலாம்.</translation>
-    </message>
     <message>
         <source>%s is set very high!</source>
         <translation type="unfinished">%s மிக அதிகமாக அமைக்கப்பட்டுள்ளது!</translation>
@@ -2977,10 +2976,6 @@ Signing is only possible with addresses of the type 'legacy'.</source>
         <source>Error loading %s</source>
         <translation type="unfinished">%s லோட் செய்வதில் பிழை</translation>
     </message>
-    <message>
-        <source>Error loading %s: Private keys can only be disabled during creation</source>
-        <translation type="unfinished">லோட் செய்வதில் பிழை %s: ப்ரைவேட் கீஸ் உருவாக்கத்தின் போது மட்டுமே முடக்கப்படும்</translation>
-    </message>
     <message>
         <source>Error loading %s: Wallet corrupted</source>
         <translation type="unfinished">லோட் செய்வதில் பிழை %s: வாலட் சிதைந்தது</translation>
@@ -3085,10 +3080,6 @@ Signing is only possible with addresses of the type 'legacy'.</source>
         <source>This is the minimum transaction fee you pay on every transaction.</source>
         <translation type="unfinished">ஒவ்வொரு பரிவர்த்தனைக்கும் நீங்கள் செலுத்த வேண்டிய குறைந்தபட்ச பரிவர்த்தனைக் கட்டணம் இதுவாகும்.</translation>
     </message>
-    <message>
-        <source>This is the transaction fee you will pay if you send a transaction.</source>
-        <translation type="unfinished">நீங்கள் ஒரு பரிவர்த்தனையை அனுப்பும்பொழுது நீங்கள் செலுத்த வேண்டிய பரிவர்த்தனைக் கட்டணம் இதுவாகும்.</translation>
-    </message>
     <message>
         <source>Transaction amount too small</source>
         <translation type="unfinished">பரிவர்த்தனை தொகை மிகக் குறைவு</translation>
diff --git a/src/qt/locale/bitcoin_te.ts b/src/qt/locale/bitcoin_te.ts
index ac8332210f68..2771631f4be4 100644
--- a/src/qt/locale/bitcoin_te.ts
+++ b/src/qt/locale/bitcoin_te.ts
@@ -1029,6 +1029,19 @@ Signing is only possible with addresses of the type 'legacy'.</source>
         <translation type="unfinished">వాలెట్లను లోడ్ చేస్తోంది…</translation>
     </message>
 </context>
+<context>
+    <name>MigrateWalletActivity</name>
+    <message>
+        <source>Restore Wallet</source>
+        <extracomment>Title of progress window which is displayed when wallets are being restored.</extracomment>
+        <translation type="unfinished">వాలెట్‌ని పునరుద్ధరించండి</translation>
+    </message>
+    <message>
+        <source>Restoring Wallet &lt;b&gt;%1&lt;/b&gt;…</source>
+        <extracomment>Descriptive text of the restore wallets progress window which indicates to the user that wallets are currently being restored.</extracomment>
+        <translation type="unfinished">వాలెట్‌ని పునరుద్ధరిస్తోంది &lt;b&gt;%1&lt;/b&gt;...</translation>
+    </message>
+    </context>
 <context>
     <name>OpenWalletActivity</name>
     <message>
@@ -1776,9 +1789,12 @@ Signing is only possible with addresses of the type 'legacy'.</source>
         <source>Could not sign any more inputs.</source>
         <translation type="unfinished">మరిన్ని ఇన్‌పుట్‌లపై సంతకం చేయడం సాధ్యపడలేదు.</translation>
     </message>
-    <message>
-        <source>Signed %1 inputs, but more signatures are still required.</source>
-        <translation type="unfinished">సంతకం చేయబడిన %1 ఇన్‌పుట్‌లు, కానీ మరిన్ని సంతకాలు ఇంకా అవసరం.</translation>
+    <message numerus="yes">
+        <source>Signed %n input(s), but more signatures are still required.</source>
+        <translation type="unfinished">
+            <numerusform />
+            <numerusform />
+        </translation>
     </message>
     <message>
         <source>Signed transaction successfully. Transaction is ready to broadcast.</source>
@@ -1829,9 +1845,12 @@ Signing is only possible with addresses of the type 'legacy'.</source>
         <source>or</source>
         <translation type="unfinished">లేదా</translation>
     </message>
-    <message>
-        <source>Transaction has %1 unsigned inputs.</source>
-        <translation type="unfinished">లావాదేవీ %1 సంతకం చేయని ఇన్‌పుట్‌లను కలిగి ఉంది.</translation>
+    <message numerus="yes">
+        <source>Transaction has %n unsigned input(s).</source>
+        <translation type="unfinished">
+            <numerusform />
+            <numerusform />
+        </translation>
     </message>
     <message>
         <source>Transaction is missing some information about inputs.</source>
@@ -2543,10 +2562,6 @@ Signing is only possible with addresses of the type 'legacy'.</source>
         <source>This is the minimum transaction fee you pay on every transaction.</source>
         <translation type="unfinished">ఇది ప్రతి లావాదేవీకి మీరు చెల్లించే కనీస లావాదేవీ రుసుము.</translation>
     </message>
-    <message>
-        <source>This is the transaction fee you will pay if you send a transaction.</source>
-        <translation type="unfinished">మీరు లావాదేవీని పంపితే మీరు చెల్లించే లావాదేవీ రుసుము ఇది.</translation>
-    </message>
     <message>
         <source>Transaction amount too small</source>
         <translation type="unfinished">లావాదేవీ మొత్తం చాలా చిన్నది</translation>
diff --git a/src/qt/locale/bitcoin_th.ts b/src/qt/locale/bitcoin_th.ts
index c45391125ecc..bc8c9dc14bbb 100644
--- a/src/qt/locale/bitcoin_th.ts
+++ b/src/qt/locale/bitcoin_th.ts
@@ -13,6 +13,22 @@
         <source>&amp;New</source>
         <translation type="unfinished">&amp;ใหม่</translation>
     </message>
+    <message>
+        <source>&amp;Copy</source>
+        <translation type="unfinished">&amp;คัดลอก</translation>
+    </message>
+    <message>
+        <source>C&amp;lose</source>
+        <translation type="unfinished">&amp;ปิด</translation>
+    </message>
+    <message>
+        <source>Delete the currently selected address from the list</source>
+        <translation type="unfinished">ลบที่อยู่ที่เลือกไว้ในปัจจุบันออกจากรายการ</translation>
+    </message>
+    <message>
+        <source>Enter address or label to search</source>
+        <translation type="unfinished">ป้อนที่อยู่หรือป้ายกำกับเพื่อค้นหา</translation>
+    </message>
     <message>
         <source>Export the data in the current tab to a file</source>
         <translation type="unfinished">ส่งออกข้อมูลในแท็บปัจจุบันไปยังไฟล์</translation>
@@ -309,15 +325,31 @@ Signing is only possible with addresses of the type 'legacy'.</source>
         <source>Enter a Bitcoin address (e.g. %1)</source>
         <translation type="unfinished">กรอกที่อยู่ Bitcoin (เช่น %1)</translation>
     </message>
+    <message>
+        <source>Ctrl+W</source>
+        <translation type="unfinished">คีย์ลัด Ctrl+W (pronounced "kee lat Ctrl+W")</translation>
+    </message>
     <message>
         <source>Unroutable</source>
-        <translation type="unfinished">ไม่สามารถกำหนดเส้นทางได้</translation>
+        <translation type="unfinished">ไม่สามารถกำหนดเส้นทางได้ (Mai Samart Kamnot Sen Thang Dai)</translation>
+    </message>
+    <message>
+        <source>IPv4</source>
+        <comment>network name</comment>
+        <extracomment>Name of IPv4 network in peer info</extracomment>
+        <translation type="unfinished">ไอพีวี4</translation>
+    </message>
+    <message>
+        <source>IPv6</source>
+        <comment>network name</comment>
+        <extracomment>Name of IPv6 network in peer info</extracomment>
+        <translation type="unfinished">ไอพีวี6</translation>
     </message>
     <message>
         <source>Onion</source>
         <comment>network name</comment>
         <extracomment>Name of Tor network in peer info</extracomment>
-        <translation type="unfinished">หัวหอม</translation>
+        <translation type="unfinished">หัวหอม (Hua Khom)</translation>
     </message>
     <message>
         <source>CJDNS</source>
@@ -328,12 +360,13 @@ Signing is only possible with addresses of the type 'legacy'.</source>
     <message>
         <source>Inbound</source>
         <extracomment>An inbound connection from a peer. An inbound connection is a connection initiated by a peer.</extracomment>
-        <translation type="unfinished">ขาเข้า</translation>
+        <translation type="unfinished">ขาเข้า
+(Pronunciation: kǎa-kâo)</translation>
     </message>
     <message>
         <source>Outbound</source>
         <extracomment>An outbound connection to a peer. An outbound connection is a connection initiated by us.</extracomment>
-        <translation type="unfinished">ขาออก</translation>
+        <translation type="unfinished">ออกเดินทาง (òk dern thāng)</translation>
     </message>
     <message>
         <source>Full Relay</source>
@@ -353,7 +386,7 @@ Signing is only possible with addresses of the type 'legacy'.</source>
     <message>
         <source>Feeler</source>
         <extracomment>Short-lived peer connection type that tests the aliveness of known addresses.</extracomment>
-        <translation type="unfinished">ตัวตรวจจับ</translation>
+        <translation type="unfinished">ตัวตรวจจับ (tua dtruat jap)</translation>
     </message>
     <message>
         <source>Address Fetch</source>
@@ -620,25 +653,21 @@ Signing is only possible with addresses of the type 'legacy'.</source>
         <source>Processing blocks on disk…</source>
         <translation type="unfinished">กำลังประมวลผลบล็อกบนดิสก์...</translation>
     </message>
-    <message>
-        <source>Connecting to peers…</source>
-        <translation type="unfinished">กำลังเชื่อมต่อกับเพื่อนร่วมงาน...</translation>
-    </message>
     <message>
         <source>Request payments (generates QR codes and bitcoin: URIs)</source>
-        <translation type="unfinished">ขอการชำระเงิน (สร้างรหัส QR และ URI ของบิตคอยน์)</translation>
+        <translation type="unfinished">เรียกเก็บ การชำระเงิน (สร้าง QR codes และ bitcoin: URIs)</translation>
     </message>
     <message>
         <source>Show the list of used sending addresses and labels</source>
-        <translation type="unfinished">แสดงรายการที่อยู่ที่ใช้ส่งและป้ายกำกับ</translation>
+        <translation type="unfinished">แสดงรายการ ที่เก็บเงินที่จะส่ง bitcoin ออก และป้ายชื่อ ที่ใช้ไปแล้ว</translation>
     </message>
     <message>
         <source>Show the list of used receiving addresses and labels</source>
-        <translation type="unfinished">แสดงรายการที่อยู่รับและป้ายที่ใช้แล้ว</translation>
+        <translation type="unfinished">แสดงรายการ ที่เก็บเงินที่จะรับ bitcoin เข้า และป้ายชื่อ ที่ใช้ไปแล้ว</translation>
     </message>
     <message>
         <source>&amp;Command-line options</source>
-        <translation type="unfinished">&amp;ตัวเลือกคำสั่งในบรรทัดคำสั่ง</translation>
+        <translation type="unfinished">&amp;ตัวเลือก Command-line</translation>
     </message>
     <message numerus="yes">
         <source>Processed %n block(s) of transaction history.</source>
@@ -650,17 +679,13 @@ Signing is only possible with addresses of the type 'legacy'.</source>
         <source>%1 behind</source>
         <translation type="unfinished">%1 ตามหลัง</translation>
     </message>
-    <message>
-        <source>Catching up…</source>
-        <translation type="unfinished">ตามทัน...</translation>
-    </message>
     <message>
         <source>Last received block was generated %1 ago.</source>
-        <translation type="unfinished">บล็อกที่ได้รับล่าสุดถูกสร้างขึ้นเมื่อ %1 ที่แล้ว.</translation>
+        <translation type="unfinished">บล็อกสุดท้ายที่ได้รับ สร้างขึ้นเมื่อ %1 มาแล้ว</translation>
     </message>
     <message>
         <source>Transactions after this will not yet be visible.</source>
-        <translation type="unfinished">ธุรกรรมหลังจากนี้จะยังไม่สามารถมองเห็นได้.</translation>
+        <translation type="unfinished">ธุรกรรมหลังจากนี้จะยังไม่สามารถมองเห็น</translation>
     </message>
     <message>
         <source>Error</source>
@@ -756,29 +781,15 @@ Signing is only possible with addresses of the type 'legacy'.</source>
         <source>Mask the values in the Overview tab</source>
         <translation type="unfinished">ปิดบังค่าในแท็บภาพรวม</translation>
     </message>
-    <message>
-        <source>No wallets available</source>
-        <translation type="unfinished">ไม่มีกระเป๋าสตางค์วางจำหน่าย</translation>
-    </message>
-    <message>
-        <source>Wallet Data</source>
-        <extracomment>Name of the wallet data file format.</extracomment>
-        <translation type="unfinished">ข้อมูลกระเป๋าเงิน</translation>
-    </message>
     <message>
         <source>Load Wallet Backup</source>
         <extracomment>The title for Restore Wallet File Windows</extracomment>
-        <translation type="unfinished">โหลดสำรองกระเป๋าเงิน</translation>
+        <translation type="unfinished">โหลดสำรองข้อมูลวอลเล็ต</translation>
     </message>
     <message>
         <source>Restore Wallet</source>
         <extracomment>Title of pop-up window shown when the user is attempting to restore a wallet.</extracomment>
-        <translation type="unfinished">กู้กระเป๋าเงิน</translation>
-    </message>
-    <message>
-        <source>Wallet Name</source>
-        <extracomment>Label of the input field where the name of the wallet is entered.</extracomment>
-        <translation type="unfinished">ชื่อกระเป๋าเงิน</translation>
+        <translation type="unfinished">กู้คืนวอลเล็ต</translation>
     </message>
     <message>
         <source>&amp;Window</source>
@@ -847,38 +858,10 @@ Signing is only possible with addresses of the type 'legacy'.</source>
         <source>Warning: %1</source>
         <translation type="unfinished">คำเตือน: %1</translation>
     </message>
-    <message>
-        <source>Label: %1
-</source>
-        <translation type="unfinished">ป้ายกำกับ: %1
-</translation>
-    </message>
-    <message>
-        <source>Address: %1
-</source>
-        <translation type="unfinished">ที่อยู่: %1
-</translation>
-    </message>
-    <message>
-        <source>Sent transaction</source>
-        <translation type="unfinished">การทำธุรกรรมที่ส่งออก</translation>
-    </message>
-    <message>
-        <source>Incoming transaction</source>
-        <translation type="unfinished">การทำธุรกรรมที่เข้ามา</translation>
-    </message>
     <message>
         <source>Private key &lt;b&gt;disabled&lt;/b&gt;</source>
         <translation type="unfinished">กุญแจส่วนตัว &lt;b&gt;พิการ&lt;/b&gt;</translation>
     </message>
-    <message>
-        <source>Wallet is &lt;b&gt;encrypted&lt;/b&gt; and currently &lt;b&gt;unlocked&lt;/b&gt;</source>
-        <translation type="unfinished">กระเป๋าเงินคือ &lt;b&gt;เข้ารหัส&lt;/b&gt; และปัจจุบัน &lt;b&gt;ปลดล็อก&lt;/b&gt;</translation>
-    </message>
-    <message>
-        <source>Wallet is &lt;b&gt;encrypted&lt;/b&gt; and currently &lt;b&gt;locked&lt;/b&gt;</source>
-        <translation type="unfinished">กระเป๋าสตางค์คือ &lt;b&gt;เข้ารหัส&lt;/b&gt; และปัจจุบัน &lt;b&gt;ล็อค&lt;/b&gt;</translation>
-    </message>
     <message>
         <source>Original message:</source>
         <translation type="unfinished">ข้อความต้นฉบับ </translation>
@@ -961,41 +944,13 @@ Signing is only possible with addresses of the type 'legacy'.</source>
         <source>Copy amount</source>
         <translation type="unfinished">คัดลอก จำนวน</translation>
     </message>
-    <message>
-        <source>&amp;Copy address</source>
-        <translation type="unfinished">&amp;คัดลอก แอดเดรส</translation>
-    </message>
-    <message>
-        <source>Copy &amp;label</source>
-        <translation type="unfinished">คัดลอก &amp;เลเบล</translation>
-    </message>
-    <message>
-        <source>Copy &amp;amount</source>
-        <translation type="unfinished">คัดลอก &amp;จำนวน</translation>
-    </message>
-    <message>
-        <source>Copy transaction &amp;ID and output index</source>
-        <translation type="unfinished">คัดล็อก &amp;ID ธุรกรรม และ ส่งออก เป็นดัชนี</translation>
-    </message>
-    <message>
-        <source>L&amp;ock unspent</source>
-        <translation type="unfinished">L&amp;ock ที่ไม่ได้ใข้</translation>
-    </message>
-    <message>
-        <source>&amp;Unlock unspent</source>
-        <translation type="unfinished">&amp;ปลดล็อค ที่ไม่ไดใช้</translation>
-    </message>
-    <message>
-        <source>Copy quantity</source>
-        <translation type="unfinished">คัดลอก ปริมาณ</translation>
-    </message>
     <message>
         <source>Copy fee</source>
         <translation type="unfinished">คัดลอก ค่าธรรมเนียม</translation>
     </message>
     <message>
         <source>Copy after fee</source>
-        <translation type="unfinished">คัดลอก หลัง ค่าธรรมเนียม</translation>
+        <translation type="unfinished">คัดลอกหลังค่าธรรมเนียม</translation>
     </message>
     <message>
         <source>Copy bytes</source>
@@ -1094,6 +1049,11 @@ Signing is only possible with addresses of the type 'legacy'.</source>
         <source>Solvable but not watched scripts have been migrated to a new wallet named '%1'.</source>
         <translation type="unfinished">สคริปต์ที่สามารถแก้ไขได้แต่ไม่ได้ติดตามได้ถูกย้ายไปยังกระเป๋าใหม่ที่ชื่อว่า '%1'</translation>
     </message>
+    <message>
+        <source>Restore Wallet</source>
+        <extracomment>Title of progress window which is displayed when wallets are being restored.</extracomment>
+        <translation type="unfinished">กู้กระเป๋าเงิน</translation>
+    </message>
     <message>
         <source>Migration failed</source>
         <translation type="unfinished">การย้ายล้มเหลว</translation>
@@ -1203,10 +1163,6 @@ Signing is only possible with addresses of the type 'legacy'.</source>
         <source>Disable Private Keys</source>
         <translation type="unfinished">ปิดกุญแจส่วนตัว</translation>
     </message>
-    <message>
-        <source>Make a blank wallet. Blank wallets do not initially have private keys or scripts. Private keys and addresses can be imported, or an HD seed can be set, at a later time.</source>
-        <translation type="unfinished">สร้างกระเป๋าเปล่า กระเป๋าเปล่าเริ่มต้นจะไม่มีคีย์ส่วนตัวหรือสคริปต์ คีย์ส่วนตัวและที่อยู่สามารถนำเข้าได้ หรือสามารถตั้งค่า HD seed ในภายหลัง</translation>
-    </message>
     <message>
         <source>Make Blank Wallet</source>
         <translation type="unfinished">ทำกระเป๋าว่าง</translation>
@@ -1223,67 +1179,7 @@ Signing is only possible with addresses of the type 'legacy'.</source>
         <source>Create</source>
         <translation type="unfinished">สร้าง</translation>
     </message>
-    <message>
-        <source>Compiled without external signing support (required for external signing)</source>
-        <extracomment>"External signing" means using devices such as hardware wallets.</extracomment>
-        <translation type="unfinished">คอมไพล์โดยไม่มีการสนับสนุนการลงชื่อภายนอก (ซึ่งจำเป็นสำหรับการลงชื่อภายนอก)</translation>
-    </message>
-</context>
-<context>
-    <name>EditAddressDialog</name>
-    <message>
-        <source>Edit Address</source>
-        <translation type="unfinished">แก้ไขที่อยู่</translation>
-    </message>
-    <message>
-        <source>&amp;Label</source>
-        <translation type="unfinished">ป้าย</translation>
-    </message>
-    <message>
-        <source>The label associated with this address list entry</source>
-        <translation type="unfinished">ป้ายกำกับที่เกี่ยวข้องกับรายการที่อยู่ในรายการนี้</translation>
-    </message>
-    <message>
-        <source>The address associated with this address list entry. This can only be modified for sending addresses.</source>
-        <translation type="unfinished">ที่อยู่ที่เชื่อมโยงกับรายการที่อยู่ในลิสต์นี้ นี้สามารถแก้ไขได้เฉพาะสำหรับที่อยู่ในการส่ง</translation>
-    </message>
-    <message>
-        <source>&amp;Address</source>
-        <translation type="unfinished">ที่อยู่</translation>
-    </message>
-    <message>
-        <source>New sending address</source>
-        <translation type="unfinished">ที่อยู่สำหรับการส่งใหม่</translation>
-    </message>
-    <message>
-        <source>Edit receiving address</source>
-        <translation type="unfinished">แก้ไขที่อยู่สำหรับการรับ</translation>
-    </message>
-    <message>
-        <source>Edit sending address</source>
-        <translation type="unfinished">แก้ไขที่อยู่การส่ง</translation>
-    </message>
-    <message>
-        <source>The entered address "%1" is not a valid Bitcoin address.</source>
-        <translation type="unfinished">อยู่ที่ป้อน "%1" ไม่ใช่ที่อยู่ Bitcoin ที่ถูกต้อง</translation>
-    </message>
-    <message>
-        <source>Address "%1" already exists as a receiving address with label "%2" and so cannot be added as a sending address.</source>
-        <translation type="unfinished">ที่อยู่ "%1" มีอยู่แล้วในฐานะที่อยู่รับที่มีป้ายชื่อ "%2" และดังนั้นจึงไม่สามารถเพิ่มเป็นที่อยู่ส่งได้</translation>
-    </message>
-    <message>
-        <source>The entered address "%1" is already in the address book with label "%2".</source>
-        <translation type="unfinished">ที่อยู่ "%1" ที่ป้อนเข้าไปมีอยู่ในสมุดที่อยู่แล้วพร้อมป้ายกำกับ "%2"</translation>
-    </message>
-    <message>
-        <source>Could not unlock wallet.</source>
-        <translation type="unfinished">ไม่สามารถปลดล็อกกระเป๋าเงินได้</translation>
-    </message>
-    <message>
-        <source>New key generation failed.</source>
-        <translation type="unfinished">การสร้างคีย์ใหม่ล้มเหลว</translation>
-    </message>
-</context>
+    </context>
 <context>
     <name>FreespaceChecker</name>
     <message>
@@ -1432,11 +1328,7 @@ Signing is only possible with addresses of the type 'legacy'.</source>
         <source>Error: Specified data directory "%1" cannot be created.</source>
         <translation type="unfinished">ข้อผิดพลาด: ไม่สามารถสร้างไดเรกทอรีข้อมูลที่ระบุ "%1" ได้</translation>
     </message>
-    <message>
-        <source>Error</source>
-        <translation type="unfinished">ข้อผิดพลาด</translation>
-    </message>
-</context>
+    </context>
 <context>
     <name>ModalOverlay</name>
     <message>
@@ -1791,11 +1683,6 @@ Signing is only possible with addresses of the type 'legacy'.</source>
         <source>&amp;Cancel</source>
         <translation type="unfinished">ยกเลิก</translation>
     </message>
-    <message>
-        <source>Compiled without external signing support (required for external signing)</source>
-        <extracomment>"External signing" means using devices such as hardware wallets.</extracomment>
-        <translation type="unfinished">คอมไพล์โดยไม่มีการสนับสนุนการลงชื่อภายนอก (ซึ่งจำเป็นสำหรับการลงชื่อภายนอก)</translation>
-    </message>
     <message>
         <source>default</source>
         <translation type="unfinished"> ค่าเริ่มต้น</translation>
@@ -1916,29 +1803,92 @@ Signing is only possible with addresses of the type 'legacy'.</source>
         <source>Recent transactions</source>
         <translation type="unfinished">การทำธุรกรรมล่าสุด</translation>
     </message>
-    </context>
+    <message>
+        <source>Privacy mode activated for the Overview tab. To unmask the values, uncheck Settings-&gt;Mask values.</source>
+        <translation type="unfinished">โหมดความเป็นส่วนตัวถูกเปิดใช้งานสำหรับแท็บภาพรวม หากต้องการแสดงค่า ให้ยกเลิกการเลือก การตั้งค่า-&gt;ปิดการซ่อนค่า</translation>
+    </message>
+</context>
 <context>
     <name>PSBTOperationsDialog</name>
     <message>
         <source>PSBT Operations</source>
         <translation type="unfinished">การดำเนินงาน</translation>
     </message>
+    <message>
+        <source>Sign Tx</source>
+        <translation type="unfinished">ลงชื่อ Tx</translation>
+    </message>
+    <message>
+        <source>Broadcast Tx</source>
+        <translation type="unfinished">การออกอากาศ Tx</translation>
+    </message>
+    <message>
+        <source>Copy to Clipboard</source>
+        <translation type="unfinished">คัดลอกไปยังคลิปบอร์ด (Khat-lok pai yang klip-bord)</translation>
+    </message>
     <message>
         <source>Save…</source>
-        <translation type="unfinished">บันทึก…</translation>
+        <translation type="unfinished">บันทึก... </translation>
+    </message>
+    <message>
+        <source>Close</source>
+        <translation type="unfinished">ปิด (bpit)</translation>
+    </message>
+    <message>
+        <source>Failed to load transaction: %1</source>
+        <translation type="unfinished">ไม่สามารถโหลดธุรกรรมได้: %1</translation>
+    </message>
+    <message>
+        <source>Failed to sign transaction: %1</source>
+        <translation type="unfinished">ล้มเหลวในการเซ็นต์ธุรกรรม: %1</translation>
     </message>
     <message>
         <source>Cannot sign inputs while wallet is locked.</source>
-        <translation type="unfinished">ไม่สามารถลงนามอินพุตในขณะที่วอลเล็ตถูกล็อค</translation>
+        <translation type="unfinished">ไม่สามารถเซ็นข้อมูลขาเข้าได้เมื่อกระเป๋าสตางค์ถูกล็อก</translation>
+    </message>
+    <message>
+        <source>Could not sign any more inputs.</source>
+        <translation type="unfinished">ไม่สามารถลงนามการป้อนข้อมูลเพิ่มเติมได้ (Mai samart long nam kan phon khomooht permum dai).</translation>
+    </message>
+    <message numerus="yes">
+        <source>Signed %n input(s), but more signatures are still required.</source>
+        <translation type="unfinished">
+            <numerusform />
+        </translation>
+    </message>
+    <message>
+        <source>Signed transaction successfully. Transaction is ready to broadcast.</source>
+        <translation type="unfinished">เซ็นธุรกรรมสำเร็จแล้ว ธุรกรรมพร้อมที่จะถ่ายทอด</translation>
     </message>
     <message>
         <source>Unknown error processing transaction.</source>
-        <translation type="unfinished">ข้อผิดพลาดที่ไม่รู้จักของการประมวลผลธุรกรรม</translation>
+        <translation type="unfinished">เกิดข้อผิดพลาดที่ไม่รู้จักในการประมวลผลธุรกรรม</translation>
+    </message>
+    <message>
+        <source>Transaction broadcast successfully! Transaction ID: %1</source>
+        <translation type="unfinished">การถ่ายทอดธุรกรรมสำเร็จ! รหัสธุรกรรม: %1</translation>
+    </message>
+    <message>
+        <source>Transaction broadcast failed: %1</source>
+        <translation type="unfinished">การส่งธุรกรรมล้มเหลว: %1</translation>
     </message>
     <message>
         <source>PSBT copied to clipboard.</source>
         <translation type="unfinished">PSBT คัดลอกไปยังคลิปบอร์ดแล้ว</translation>
     </message>
+    <message>
+        <source>Save Transaction Data</source>
+        <translation type="unfinished">บันทึกข้อมูลธุรกรรม</translation>
+    </message>
+    <message>
+        <source>Partially Signed Transaction (Binary)</source>
+        <extracomment>Expanded name of the binary PSBT file format. See: BIP 174.</extracomment>
+        <translation type="unfinished">ธุรกรรมที่ลงนามบางส่วน (ไบนารี)</translation>
+    </message>
+    <message>
+        <source>PSBT saved to disk.</source>
+        <translation type="unfinished">PSBT ถูกบันทึกลงดิสก์.</translation>
+    </message>
     <message>
         <source>Sends %1 to %2</source>
         <translation type="unfinished">ส่ง %1 ไปยัง %2</translation>
@@ -1959,9 +1909,11 @@ Signing is only possible with addresses of the type 'legacy'.</source>
         <source>or</source>
         <translation type="unfinished">หรือ</translation>
     </message>
-    <message>
-        <source>Transaction has %1 unsigned inputs.</source>
-        <translation type="unfinished">ธุรกรรมมี %1 อินพุตที่ไม่ได้ลงนาม</translation>
+    <message numerus="yes">
+        <source>Transaction has %n unsigned input(s).</source>
+        <translation type="unfinished">
+            <numerusform />
+        </translation>
     </message>
     <message>
         <source>Transaction is missing some information about inputs.</source>
@@ -2043,7 +1995,7 @@ If you are receiving this error you should request the merchant provide a BIP21
     <message>
         <source>Peer</source>
         <extracomment>Title of Peers Table column which contains a unique number used to identify a connection.</extracomment>
-        <translation type="unfinished">เพียร์</translation>
+        <translation type="unfinished">เพื่อน (Phûuean)</translation>
     </message>
     <message>
         <source>Age</source>
@@ -2075,15 +2027,21 @@ If you are receiving this error you should request the merchant provide a BIP21
         <extracomment>Title of Peers Table column which describes the type of peer connection. The "type" describes why the connection exists.</extracomment>
         <translation type="unfinished">ประเภท</translation>
     </message>
+    <message>
+        <source>Network</source>
+        <extracomment>Title of Peers Table column which states the network the peer connected through.</extracomment>
+        <translation type="unfinished">เครือข่าย (pronounced "kruea-khai")</translation>
+    </message>
     <message>
         <source>Inbound</source>
         <extracomment>An Inbound Connection from a Peer.</extracomment>
-        <translation type="unfinished">ขาเข้า</translation>
+        <translation type="unfinished">ขาเข้า
+(Pronunciation: kǎa-kâo)</translation>
     </message>
     <message>
         <source>Outbound</source>
         <extracomment>An Outbound Connection to a Peer.</extracomment>
-        <translation type="unfinished">ขาออก</translation>
+        <translation type="unfinished">ออกเดินทาง (òk dern thāng)</translation>
     </message>
 </context>
 <context>
@@ -2130,7 +2088,7 @@ If you are receiving this error you should request the merchant provide a BIP21
     </message>
     <message>
         <source>Sent</source>
-        <translation type="unfinished">ส่ง</translation>
+        <translation type="unfinished">ส่ง (sòng)</translation>
     </message>
     <message>
         <source>&amp;Peers</source>
@@ -2176,21 +2134,17 @@ If you are receiving this error you should request the merchant provide a BIP21
         <source>Transaction Relay</source>
         <translation type="unfinished">การส่งต่อธุรกรรม</translation>
     </message>
-    <message>
-        <source>Starting Block</source>
-        <translation type="unfinished">บล็อกเริ่มต้น</translation>
-    </message>
     <message>
         <source>Synced Headers</source>
-        <translation type="unfinished">หัวข้อที่ซิงค์</translation>
+        <translation type="unfinished">หัวข้อที่ซิงค์ (Huākhāo thī sìngk)</translation>
     </message>
     <message>
         <source>Synced Blocks</source>
-        <translation type="unfinished">บล็อกที่ซิงค์</translation>
+        <translation type="unfinished">บล็อกที่ซิงค์ (Blok thi sing)</translation>
     </message>
     <message>
         <source>Last Transaction</source>
-        <translation type="unfinished">ธุรกรรมล่าสุด</translation>
+        <translation type="unfinished">ธุรกรรมล่าสุด (Thurakam lasut)</translation>
     </message>
     <message>
         <source>The mapped Autonomous System used for diversifying peer selection.</source>
@@ -2198,7 +2152,7 @@ If you are receiving this error you should request the merchant provide a BIP21
     </message>
     <message>
         <source>Mapped AS</source>
-        <translation type="unfinished">แมปป์เป็น</translation>
+        <translation type="unfinished">แมปป์เป็น (pronounced: máp bpen)</translation>
     </message>
     <message>
         <source>Whether we relay addresses to this peer.</source>
@@ -2208,7 +2162,7 @@ If you are receiving this error you should request the merchant provide a BIP21
     <message>
         <source>Address Relay</source>
         <extracomment>Text title for the Address Relay field in the peer details area, which displays whether we relay addresses to this peer (Yes/No).</extracomment>
-        <translation type="unfinished">การส่งต่อที่อยู่</translation>
+        <translation type="unfinished">การส่งต่อที่อยู่ (Kān sòng tōr thī̀ yùu)</translation>
     </message>
     <message>
         <source>The total number of addresses received from this peer that were processed (excludes addresses that were dropped due to rate-limiting).</source>
@@ -2232,7 +2186,8 @@ If you are receiving this error you should request the merchant provide a BIP21
     </message>
     <message>
         <source>User Agent</source>
-        <translation type="unfinished">ตัวแทนผู้ใช้</translation>
+        <translation type="unfinished">ตัวแทนผู้ใช้
+(Pronounced: Dtua-Thaen Phu-Chai)</translation>
     </message>
     <message>
         <source>Node window</source>
@@ -2240,7 +2195,7 @@ If you are receiving this error you should request the merchant provide a BIP21
     </message>
     <message>
         <source>Current block height</source>
-        <translation type="unfinished">ความสูงของบล็อกปัจจุบัน</translation>
+        <translation type="unfinished">ความสูงของบล็อกปัจจุบัน (Khwam sung khong blok pachuban)</translation>
     </message>
     <message>
         <source>Open the %1 debug log file from the current data directory. This can take a few seconds for large log files.</source>
@@ -2252,7 +2207,11 @@ If you are receiving this error you should request the merchant provide a BIP21
     </message>
     <message>
         <source>Increase font size</source>
-        <translation type="unfinished">เพิ่มขนาดตัวอักษร</translation>
+        <translation type="unfinished">เพิ่มขนาดตัวอักษร (Pêr̂m khà-nàd tûa-òk-sŏn)</translation>
+    </message>
+    <message>
+        <source>Permissions</source>
+        <translation type="unfinished">สิทธิ์ (Sìt) or การอนุญาต (Kān Anuyāt)</translation>
     </message>
     <message>
         <source>The direction and type of peer connection: %1</source>
@@ -2260,7 +2219,7 @@ If you are receiving this error you should request the merchant provide a BIP21
     </message>
     <message>
         <source>Direction/Type</source>
-        <translation type="unfinished">ทิศทาง/ประเภท</translation>
+        <translation type="unfinished">ทิศทาง/ประเภท (Títhāng / Bpràphêd)</translation>
     </message>
     <message>
         <source>The BIP324 session ID string in hex.</source>
@@ -2272,7 +2231,7 @@ If you are receiving this error you should request the merchant provide a BIP21
     </message>
     <message>
         <source>Services</source>
-        <translation type="unfinished">บริการ</translation>
+        <translation type="unfinished">บริการ (Borisat)</translation>
     </message>
     <message>
         <source>High bandwidth BIP152 compact block relay: %1</source>
@@ -2280,11 +2239,11 @@ If you are receiving this error you should request the merchant provide a BIP21
     </message>
     <message>
         <source>High Bandwidth</source>
-        <translation type="unfinished">แบนด์วิธสูง</translation>
+        <translation type="unfinished">แบนด์วิธสูง (pronounced: baen-wit soong)</translation>
     </message>
     <message>
         <source>Connection Time</source>
-        <translation type="unfinished">เวลาเชื่อมต่อ</translation>
+        <translation type="unfinished">เวลาเชื่อมต่อ (Wela Chueamto)</translation>
     </message>
     <message>
         <source>Elapsed time since a novel block passing initial validity checks was received from this peer.</source>
@@ -2292,7 +2251,7 @@ If you are receiving this error you should request the merchant provide a BIP21
     </message>
     <message>
         <source>Last Block</source>
-        <translation type="unfinished">บล็อกสุดท้าย</translation>
+        <translation type="unfinished">บล็อกสุดท้าย (Blók Sùt Tái)</translation>
     </message>
     <message>
         <source>Elapsed time since a novel transaction accepted into our mempool was received from this peer.</source>
@@ -2301,7 +2260,7 @@ If you are receiving this error you should request the merchant provide a BIP21
     </message>
     <message>
         <source>Last Send</source>
-        <translation type="unfinished">ส่งสุดท้าย</translation>
+        <translation type="unfinished">ส่งสุดท้าย (Song Soot Thai)</translation>
     </message>
     <message>
         <source>Last Receive</source>
@@ -2385,7 +2344,7 @@ If you are receiving this error you should request the merchant provide a BIP21
     </message>
     <message>
         <source>None</source>
-        <translation type="unfinished">ไม่มี (Mai mee)</translation>
+        <translation type="unfinished">ไม่มี</translation>
     </message>
     </context>
 <context>
@@ -2396,7 +2355,7 @@ If you are receiving this error you should request the merchant provide a BIP21
     </message>
     <message>
         <source>Copy &amp;label</source>
-        <translation type="unfinished">คัดลอก &amp; ป้าย</translation>
+        <translation type="unfinished">คัดลอก &amp;เลเบล</translation>
     </message>
     <message>
         <source>Copy &amp;amount</source>
@@ -2469,11 +2428,11 @@ If you are receiving this error you should request the merchant provide a BIP21
     </message>
     <message>
         <source>Copy amount</source>
-        <translation type="unfinished">จำนวนคัดลอก</translation>
+        <translation type="unfinished">คัดลอก จำนวน</translation>
     </message>
     <message>
         <source>Copy fee</source>
-        <translation type="unfinished">ค่าลอกสำเนา</translation>
+        <translation type="unfinished">คัดลอก ค่าธรรมเนียม</translation>
     </message>
     <message>
         <source>Copy after fee</source>
@@ -2481,21 +2440,12 @@ If you are receiving this error you should request the merchant provide a BIP21
     </message>
     <message>
         <source>Copy bytes</source>
-        <translation type="unfinished">คัดลอกไบต์</translation>
+        <translation type="unfinished">คัดลอก bytes</translation>
     </message>
     <message>
         <source>Copy change</source>
         <translation type="unfinished">คัดลอก change</translation>
     </message>
-    <message>
-        <source>Save Transaction Data</source>
-        <translation type="unfinished">บันทึกข้อมูลธุรกรรม</translation>
-    </message>
-    <message>
-        <source>Partially Signed Transaction (Binary)</source>
-        <extracomment>Expanded name of the binary PSBT file format. See: BIP 174.</extracomment>
-        <translation type="unfinished">ธุรกรรมที่ลงนามบางส่วน (ไบนารี)</translation>
-    </message>
     <message>
         <source>or</source>
         <translation type="unfinished">หรือ</translation>
@@ -2527,13 +2477,9 @@ If you are receiving this error you should request the merchant provide a BIP21
     </context>
 <context>
     <name>TransactionDesc</name>
-    <message>
-        <source>Date</source>
-        <translation type="unfinished">วันที่</translation>
-    </message>
     <message>
         <source>unknown</source>
-        <translation type="unfinished">ไม่ทราบ</translation>
+        <translation type="unfinished">ไม่ทราบ (mai saap)</translation>
     </message>
     <message>
         <source>own address</source>
@@ -2547,7 +2493,7 @@ If you are receiving this error you should request the merchant provide a BIP21
     </message>
     <message>
         <source>Amount</source>
-        <translation type="unfinished">จำนวน</translation>
+        <translation type="unfinished">จำนวน:</translation>
     </message>
     </context>
 <context>
@@ -2571,35 +2517,6 @@ If you are receiving this error you should request the merchant provide a BIP21
     </context>
 <context>
     <name>TransactionView</name>
-    <message>
-        <source>&amp;Copy address</source>
-        <translation type="unfinished">ที่อยู่ &amp;Copy</translation>
-    </message>
-    <message>
-        <source>Copy &amp;label</source>
-        <translation type="unfinished">คัดลอก &amp; ป้าย</translation>
-    </message>
-    <message>
-        <source>Copy &amp;amount</source>
-        <translation type="unfinished">คัดลอก &amp;จำนวน</translation>
-    </message>
-    <message>
-        <source>Comma separated file</source>
-        <extracomment>Expanded name of the CSV file format. See: https://en.wikipedia.org/wiki/Comma-separated_values.</extracomment>
-        <translation type="unfinished">ไฟล์ที่แยกด้วยเครื่องหมายจุลภาค</translation>
-    </message>
-    <message>
-        <source>Confirmed</source>
-        <translation type="unfinished">ยืนยันแล้ว</translation>
-    </message>
-    <message>
-        <source>Date</source>
-        <translation type="unfinished">วันที่</translation>
-    </message>
-    <message>
-        <source>Type</source>
-        <translation type="unfinished">ประเภท</translation>
-    </message>
     <message>
         <source>Label</source>
         <translation type="unfinished">การส่งออกล้มเหลว</translation>
@@ -2608,21 +2525,6 @@ If you are receiving this error you should request the merchant provide a BIP21
         <source>Address</source>
         <translation type="unfinished">ที่อยู่</translation>
     </message>
-    <message>
-        <source>Exporting Failed</source>
-        <translation type="unfinished">การส่งออกล้มเหลว</translation>
-    </message>
-    </context>
-<context>
-    <name>WalletFrame</name>
-    <message>
-        <source>Create a new wallet</source>
-        <translation type="unfinished">สร้างกระเป๋าใหม่</translation>
-    </message>
-    <message>
-        <source>Error</source>
-        <translation type="unfinished">ข้อผิดพลาด</translation>
-    </message>
     </context>
 <context>
     <name>WalletView</name>
diff --git a/src/qt/locale/bitcoin_tk.ts b/src/qt/locale/bitcoin_tk.ts
index f4439d129c42..0532374b3bd9 100644
--- a/src/qt/locale/bitcoin_tk.ts
+++ b/src/qt/locale/bitcoin_tk.ts
@@ -1049,6 +1049,19 @@ Diňe "miras" görnüşli salgylar bilen gol çekmek mümkin.</translation>
         <translation type="unfinished">Gapjyklar ýüklenýär...</translation>
     </message>
 </context>
+<context>
+    <name>MigrateWalletActivity</name>
+    <message>
+        <source>Restore Wallet</source>
+        <extracomment>Title of progress window which is displayed when wallets are being restored.</extracomment>
+        <translation type="unfinished">Gapjygy düzeltmek</translation>
+    </message>
+    <message>
+        <source>Restoring Wallet &lt;b&gt;%1&lt;/b&gt;…</source>
+        <extracomment>Descriptive text of the restore wallets progress window which indicates to the user that wallets are currently being restored.</extracomment>
+        <translation type="unfinished">&lt;b&gt;%1&lt;/b&gt; Gapjyk düzeltilýär…</translation>
+    </message>
+    </context>
 <context>
     <name>OpenWalletActivity</name>
     <message>
@@ -1155,10 +1168,6 @@ Diňe "miras" görnüşli salgylar bilen gol çekmek mümkin.</translation>
         <source>Disable Private Keys</source>
         <translation type="unfinished">Hususy açarlary öçür</translation>
     </message>
-    <message>
-        <source>Make a blank wallet. Blank wallets do not initially have private keys or scripts. Private keys and addresses can be imported, or an HD seed can be set, at a later time.</source>
-        <translation type="unfinished">Boş gapjyk emele getir. Boş gapjyklaryň başda hususy açary ýa-da skripti bolmaýar. Soňra hususy açarlar ýa-da salgylar import edilip bilner ýa-da HD esasy açar bellenip bilner.</translation>
-    </message>
     <message>
         <source>Make Blank Wallet</source>
         <translation type="unfinished">Boş gapjyk emele getir</translation>
@@ -1881,9 +1890,12 @@ Diňe "miras" görnüşli salgylar bilen gol çekmek mümkin.</translation>
         <source>Could not sign any more inputs.</source>
         <translation type="unfinished">Başga hiç-hili girizilenlere gol çekip bolanok.</translation>
     </message>
-    <message>
-        <source>Signed %1 inputs, but more signatures are still required.</source>
-        <translation type="unfinished">%1 girizilene gol çekildi, ýöne entegem has köp gol zerur.</translation>
+    <message numerus="yes">
+        <source>Signed %n input(s), but more signatures are still required.</source>
+        <translation type="unfinished">
+            <numerusform />
+            <numerusform />
+        </translation>
     </message>
     <message>
         <source>Signed transaction successfully. Transaction is ready to broadcast.</source>
@@ -1934,9 +1946,12 @@ Diňe "miras" görnüşli salgylar bilen gol çekmek mümkin.</translation>
         <source>or</source>
         <translation type="unfinished">ýa-da</translation>
     </message>
-    <message>
-        <source>Transaction has %1 unsigned inputs.</source>
-        <translation type="unfinished">Amalyň %1 gol çekilmedik girizileni bar.</translation>
+    <message numerus="yes">
+        <source>Transaction has %n unsigned input(s).</source>
+        <translation type="unfinished">
+            <numerusform />
+            <numerusform />
+        </translation>
     </message>
     <message>
         <source>Transaction is missing some information about inputs.</source>
@@ -2202,10 +2217,6 @@ Size bu ýalňyşlyk gelýän bolsa, siz täjirden BIP21-e gabat gelýän URI-ni
         <source>Transaction Relay</source>
         <translation type="unfinished">Amal ýaýlyma beriji</translation>
     </message>
-    <message>
-        <source>Starting Block</source>
-        <translation type="unfinished">Blogy başlamak</translation>
-    </message>
     <message>
         <source>Synced Headers</source>
         <translation type="unfinished">Sinhronlaşdyrylan baş atlar</translation>
diff --git a/src/qt/locale/bitcoin_tl.ts b/src/qt/locale/bitcoin_tl.ts
index f0fcb7333365..3ecfa8007ef1 100644
--- a/src/qt/locale/bitcoin_tl.ts
+++ b/src/qt/locale/bitcoin_tl.ts
@@ -570,6 +570,10 @@ Signing is only possible with addresses of the type 'legacy'.</source>
         <source>&amp;Sending addresses</source>
         <translation type="unfinished">&amp;Pagpapadalhan na mga ♦address♦</translation>
     </message>
+    <message>
+        <source>&amp;Receiving addresses</source>
+        <translation type="unfinished">&amp;Pagtatanggapan na mga ♦address♦</translation>
+    </message>
     <message>
         <source>Open a bitcoin: URI</source>
         <translation type="unfinished">Buksan ang ♦bitcoin: URI♦</translation>
@@ -978,10 +982,6 @@ Signing is only possible with addresses of the type 'legacy'.</source>
         <source>Disable Private Keys</source>
         <translation type="unfinished">I-disable ang Pribadong mga Susi</translation>
     </message>
-    <message>
-        <source>Make a blank wallet. Blank wallets do not initially have private keys or scripts. Private keys and addresses can be imported, or an HD seed can be set, at a later time.</source>
-        <translation type="unfinished">Gumawa ng blankong pitaka. Ang blankong mga pitaka hindi muna nagkakaroon ng pribadong mga susi o mga ♦script♦. Ang pribadong mga susi at mga ♦address♦ ay pwedeng ma-import, o ang ♦HD seed♦ ay pwedeng mai-set, mamaya.</translation>
-    </message>
     <message>
         <source>Make Blank Wallet</source>
         <translation type="unfinished">Gumawa ng Blankong Pitaka</translation>
@@ -1212,6 +1212,23 @@ Signing is only possible with addresses of the type 'legacy'.</source>
         <translation type="unfinished">Nagkamali</translation>
     </message>
     </context>
+<context>
+    <name>PSBTOperationsDialog</name>
+    <message numerus="yes">
+        <source>Signed %n input(s), but more signatures are still required.</source>
+        <translation type="unfinished">
+            <numerusform />
+            <numerusform />
+        </translation>
+    </message>
+    <message numerus="yes">
+        <source>Transaction has %n unsigned input(s).</source>
+        <translation type="unfinished">
+            <numerusform />
+            <numerusform />
+        </translation>
+    </message>
+    </context>
 <context>
     <name>PeerTableModel</name>
     <message>
diff --git a/src/qt/locale/bitcoin_tr.ts b/src/qt/locale/bitcoin_tr.ts
index 86885f20c38e..d408665b7e2c 100644
--- a/src/qt/locale/bitcoin_tr.ts
+++ b/src/qt/locale/bitcoin_tr.ts
@@ -3,7 +3,7 @@
     <name>AddressBookPage</name>
     <message>
         <source>Right-click to edit address or label</source>
-        <translation type="unfinished">Sağ tık ile adres ve etiket düzenle</translation>
+        <translation type="unfinished">Adresi veya etiketi düzenlemek için sağ butona tıklayın</translation>
     </message>
     <message>
         <source>Create a new address</source>
@@ -1073,6 +1073,16 @@ Taşıma işlemi, taşıma işleminden önce cüzdanın bir yedeğini oluşturac
         <source>Solvable but not watched scripts have been migrated to a new wallet named '%1'.</source>
         <translation type="unfinished">Çözülebilir ama izlenmeyen scriptler yeni bir cüzdana taşındı, adı '%1'.</translation>
     </message>
+    <message>
+        <source>Restore Wallet</source>
+        <extracomment>Title of progress window which is displayed when wallets are being restored.</extracomment>
+        <translation type="unfinished">Cüzdanı Geri Yükle</translation>
+    </message>
+    <message>
+        <source>Restoring Wallet &lt;b&gt;%1&lt;/b&gt;…</source>
+        <extracomment>Descriptive text of the restore wallets progress window which indicates to the user that wallets are currently being restored.</extracomment>
+        <translation type="unfinished">Cüzdan Onarılıyor&lt;b&gt;%1&lt;/b&gt;</translation>
+    </message>
     <message>
         <source>Migration failed</source>
         <translation type="unfinished">Taşıma başarısız oldu</translation>
@@ -1196,10 +1206,6 @@ Taşıma işlemi, taşıma işleminden önce cüzdanın bir yedeğini oluşturac
         <source>Disable Private Keys</source>
         <translation type="unfinished">Özel Kilidi (Private Key) kaldır</translation>
     </message>
-    <message>
-        <source>Make a blank wallet. Blank wallets do not initially have private keys or scripts. Private keys and addresses can be imported, or an HD seed can be set, at a later time.</source>
-        <translation type="unfinished">Boş bir cüzdan yapın. Boş cüzdanlar başlangıçta özel anahtarlara veya komut dosyalarına sahip değildir. Özel anahtarlar ve adresler içe aktarılabilir veya daha sonra bir HD tohum ayarlanabilir.</translation>
-    </message>
     <message>
         <source>Make Blank Wallet</source>
         <translation type="unfinished">Boş Cüzdan Oluştur</translation>
@@ -1261,7 +1267,7 @@ Taşıma işlemi, taşıma işleminden önce cüzdanın bir yedeğini oluşturac
     </message>
     <message>
         <source>The entered address "%1" is already in the address book with label "%2".</source>
-        <translation type="unfinished">Girilen "%1" adresi zaten adres defterinde "%2" etiketli olarak bulunuyor.</translation>
+        <translation type="unfinished">Girilen "%1" adresi zaten adres defterinde ''%2" etiketli olarak bulunuyor.</translation>
     </message>
     <message>
         <source>Could not unlock wallet.</source>
@@ -1873,6 +1879,12 @@ Taşıma işlemi, taşıma işleminden önce cüzdanın bir yedeğini oluşturac
         <source>Could not sign any more inputs.</source>
         <translation type="unfinished">Daha fazla girdi imzalanamıyor.</translation>
     </message>
+    <message numerus="yes">
+        <source>Signed %n input(s), but more signatures are still required.</source>
+        <translation type="unfinished">
+            <numerusform />
+        </translation>
+    </message>
     <message>
         <source>Signed transaction successfully. Transaction is ready to broadcast.</source>
         <translation type="unfinished">İşlem imzalandı ve ağa duyurulmaya hazır.</translation>
@@ -1913,14 +1925,16 @@ Taşıma işlemi, taşıma işleminden önce cüzdanın bir yedeğini oluşturac
         <source>Pays transaction fee: </source>
         <translation type="unfinished">İşlem ücreti:&lt;br&gt;</translation>
     </message>
-    <message>
-        <source>Total Amount</source>
-        <translation type="unfinished">Toplam Tutar</translation>
-    </message>
     <message>
         <source>or</source>
         <translation type="unfinished">veya</translation>
     </message>
+    <message numerus="yes">
+        <source>Transaction has %n unsigned input(s).</source>
+        <translation type="unfinished">
+            <numerusform />
+        </translation>
+    </message>
     <message>
         <source>Transaction is missing some information about inputs.</source>
         <translation type="unfinished">İşlem girdileri hakkında bazı bilgiler eksik. </translation>
@@ -2181,10 +2195,6 @@ Taşıma işlemi, taşıma işleminden önce cüzdanın bir yedeğini oluşturac
         <source>Transaction Relay</source>
         <translation type="unfinished">İşlem Aktarımı</translation>
     </message>
-    <message>
-        <source>Starting Block</source>
-        <translation type="unfinished">Başlangıç Bloku</translation>
-    </message>
     <message>
         <source>Synced Headers</source>
         <translation type="unfinished">Eşleşmiş Üstbilgiler</translation>
@@ -2838,10 +2848,6 @@ Taşıma işlemi, taşıma işleminden önce cüzdanın bir yedeğini oluşturac
         <source>The amount exceeds your balance.</source>
         <translation type="unfinished">Tutar bakiyenizden yüksektir.</translation>
     </message>
-    <message>
-        <source>The total exceeds your balance when the %1 transaction fee is included.</source>
-        <translation type="unfinished">Toplam, %1 işlem ücreti eklendiğinde bakiyenizi geçmektedir.</translation>
-    </message>
     <message>
         <source>Duplicate address found: addresses should only be used once each.</source>
         <translation type="unfinished">Tekrarlayan adres bulundu: adresler sadece bir kez kullanılmalıdır.</translation>
@@ -3660,10 +3666,6 @@ Taşıma işlemi, taşıma işleminden önce cüzdanın bir yedeğini oluşturac
         <source>Warning: Private keys detected in wallet {%s} with disabled private keys</source>
         <translation type="unfinished">Uyarı: {%s} cüzdanında özel anahtarlarla devre dışı bırakılmış özel anahtarlar algılandı</translation>
     </message>
-    <message>
-        <source>Warning: We do not appear to fully agree with our peers! You may need to upgrade, or other nodes may need to upgrade.</source>
-        <translation type="unfinished">Uyarı: Ağ eşlerimizle tamamen anlaşamamışız gibi görünüyor! Güncelleme yapmanız gerekebilir ya da diğer düğümlerin güncelleme yapmaları gerekebilir.</translation>
-    </message>
     <message>
         <source>You need to rebuild the database using -reindex to go back to unpruned mode.  This will redownload the entire blockchain</source>
         <translation type="unfinished">Budama olmayan kipe dönmek için veritabanını -reindex ile tekrar derlemeniz gerekir. Bu, tüm blok zincirini tekrar indirecektir</translation>
@@ -3676,6 +3678,10 @@ Taşıma işlemi, taşıma işleminden önce cüzdanın bir yedeğini oluşturac
         <source>-maxmempool must be at least %d MB</source>
         <translation type="unfinished">-maxmempool en az %d MB olmalıdır</translation>
     </message>
+    <message>
+        <source>Cannot obtain a lock on directory %s. %s is probably already running.</source>
+        <translation type="unfinished">%sDizin kilitlenemiyor. %s muhtemelen halihazırda çalışıyor.</translation>
+    </message>
     <message>
         <source>Cannot resolve -%s address: '%s'</source>
         <translation type="unfinished">Çözümlenemedi - %s adres: '%s'</translation>
@@ -3700,18 +3706,6 @@ Taşıma işlemi, taşıma işleminden önce cüzdanın bir yedeğini oluşturac
         <source>Error reading %s! All keys read correctly, but transaction data or address metadata may be missing or incorrect.</source>
         <translation type="unfinished">Okumada Hata %s! Tüm anahtarlar doğru okundu, ancak işlem verileri veya adres metadata verileri eksik veya hatalı olabilir.</translation>
     </message>
-    <message>
-        <source>Error: Address book data in wallet cannot be identified to belong to migrated wallets</source>
-        <translation type="unfinished">Hata: Cüzdandaki adres defteri verilerinin taşınan cüzdanlara ait olduğu tespit edilemiyor</translation>
-    </message>
-    <message>
-        <source>Error: Duplicate descriptors created during migration. Your wallet may be corrupted.</source>
-        <translation type="unfinished">Hata: Geçiş sırasında yinelenen tanımlayıcılar oluşturuldu. Cüzdanınız bozulmuş olabilir.</translation>
-    </message>
-    <message>
-        <source>Error: Transaction %s in wallet cannot be identified to belong to migrated wallets</source>
-        <translation type="unfinished">Hata: Cüzdandaki %s işleminin taşınan cüzdanlara ait olduğu tespit edilemiyor</translation>
-    </message>
     <message>
         <source>Failed to remove snapshot chainstate dir (%s). Manually remove it before restarting.
 </source>
@@ -3742,6 +3736,14 @@ Taşıma işlemi, taşıma işleminden önce cüzdanın bir yedeğini oluşturac
         <source>Rename of '%s' -&gt; '%s' failed. Cannot clean up the background chainstate leveldb directory.</source>
         <translation type="unfinished">'%s' -&gt; '%s' yeniden adlandırması başarısız oldu. Arka plan zincir durumu leveldb dizinini temizleyemiyor.</translation>
     </message>
+    <message>
+        <source>Specified -blockreservedweight (%d) exceeds consensus maximum block weight (%d)</source>
+        <translation type="unfinished">Belirtilen -blockreservedweight değeri (%d), konsensüs maksimum blok ağırlığını (%d) aşıyor.</translation>
+    </message>
+    <message>
+        <source>Specified -blockreservedweight (%d) is lower than minimum safety value of (%d)</source>
+        <translation type="unfinished">Belirtilen -blockreservedweight (%d), minimum güvenlik değeri olan (%d)' dan daha düşük.</translation>
+    </message>
     <message>
         <source>The combination of the pre-selected inputs and the wallet automatic inputs selection exceeds the transaction maximum weight. Please try sending a smaller amount or manually consolidating your wallet's UTXOs</source>
         <translation type="unfinished">Önceden seçilmiş girişlerin ve cüzdanın otomatik giriş seçiminin kombinasyonu, işlemin maksimum ağırlığını aşıyor. Lütfen daha küçük bir miktar göndermeyi deneyin veya cüzdanınızdaki UTXO'ları manuel olarak birleştirin.</translation>
@@ -3828,6 +3830,10 @@ Cüzdan yedeği geri yüklenemiyor.</translation>
         <source>Error opening block database</source>
         <translation type="unfinished">Blok veritabanının açılışı sırasında hata</translation>
     </message>
+    <message>
+        <source>Error opening coins database</source>
+        <translation type="unfinished">Coin veritabanı açılırken hata oluştu.</translation>
+    </message>
     <message>
         <source>Error reading from database, shutting down.</source>
         <translation type="unfinished">Veritabanı okuma hatası, program kapatılıyor.</translation>
@@ -3860,10 +3866,6 @@ Cüzdan yedeği geri yüklenemiyor.</translation>
         <source>Error: database transaction cannot be executed for wallet %s</source>
         <translation type="unfinished">Hata: %sCüzdan için veri tabanında işlem yapılamaz</translation>
     </message>
-    <message>
-        <source>Failed to connect best block (%s).</source>
-        <translation type="unfinished">En iyi (%s) bloğa bağlanmak başarısız oldu.</translation>
-    </message>
     <message>
         <source>Failed to disconnect block.</source>
         <translation type="unfinished">Bloğun bağlantısı kesilemedi.</translation>
@@ -3888,14 +3890,6 @@ Cüzdan yedeği geri yüklenemiyor.</translation>
         <source>Failed to write block.</source>
         <translation type="unfinished">Bloğa yazma başarısız oldu.</translation>
     </message>
-    <message>
-        <source>Failed to write to block index database.</source>
-        <translation type="unfinished">Blok indeks veri tabanına yazma başarısız oldu.</translation>
-    </message>
-    <message>
-        <source>Failed to write to coin database.</source>
-        <translation type="unfinished">Coin veri tabanına yazma başarısız oldu.</translation>
-    </message>
     <message>
         <source>Failed to write undo data.</source>
         <translation type="unfinished">Eski verilere yazma başarısız oldu.</translation>
@@ -4060,10 +4054,6 @@ Cüzdan yedeği geri yüklenemiyor.</translation>
         <source>This is the minimum transaction fee you pay on every transaction.</source>
         <translation type="unfinished">Bu her işlemde ödeceğiniz en düşük işlem ücretidir.</translation>
     </message>
-    <message>
-        <source>This is the transaction fee you will pay if you send a transaction.</source>
-        <translation type="unfinished">-paytxfee çok yüksek bir değere ayarlanmış! Bu, işlemi gönderirseniz ödeyeceğiniz işlem ücretidir.</translation>
-    </message>
     <message>
         <source>Transaction %s does not belong to this wallet</source>
         <translation type="unfinished">%s İşlem bu cüzdana ait değil.</translation>
diff --git a/src/qt/locale/bitcoin_uk.ts b/src/qt/locale/bitcoin_uk.ts
index ec270bbcd4a6..9669f2021751 100644
--- a/src/qt/locale/bitcoin_uk.ts
+++ b/src/qt/locale/bitcoin_uk.ts
@@ -125,19 +125,19 @@ Signing is only possible with addresses of the type 'legacy'.</source>
     <name>AskPassphraseDialog</name>
     <message>
         <source>Passphrase Dialog</source>
-        <translation type="unfinished">Діалог введення паролю</translation>
+        <translation type="unfinished">Діалогове вікно парольної фрази</translation>
     </message>
     <message>
         <source>Enter passphrase</source>
-        <translation type="unfinished">Введіть пароль</translation>
+        <translation type="unfinished">Введіть парольну фразу</translation>
     </message>
     <message>
         <source>New passphrase</source>
-        <translation type="unfinished">Новий пароль</translation>
+        <translation type="unfinished">Нова парольна фраза</translation>
     </message>
     <message>
         <source>Repeat new passphrase</source>
-        <translation type="unfinished">Повторіть пароль</translation>
+        <translation type="unfinished">Повторіть нову парольну фразу</translation>
     </message>
     <message>
         <source>Show passphrase</source>
@@ -149,7 +149,7 @@ Signing is only possible with addresses of the type 'legacy'.</source>
     </message>
     <message>
         <source>This operation needs your wallet passphrase to unlock the wallet.</source>
-        <translation type="unfinished">Ця операція потребує пароль для розблокування гаманця.</translation>
+        <translation type="unfinished">Ця операція потребує вашої парольної фрази для розблокування гаманця.</translation>
     </message>
     <message>
         <source>Unlock wallet</source>
@@ -157,7 +157,7 @@ Signing is only possible with addresses of the type 'legacy'.</source>
     </message>
     <message>
         <source>Change passphrase</source>
-        <translation type="unfinished">Змінити пароль</translation>
+        <translation type="unfinished">Змінити парольну фразу</translation>
     </message>
     <message>
         <source>Confirm wallet encryption</source>
@@ -165,7 +165,7 @@ Signing is only possible with addresses of the type 'legacy'.</source>
     </message>
     <message>
         <source>Warning: If you encrypt your wallet and lose your passphrase, you will &lt;b&gt;LOSE ALL OF YOUR BITCOINS&lt;/b&gt;!</source>
-        <translation type="unfinished">Увага: Якщо ви зашифруєте гаманець і забудете пароль, ви &lt;b&gt;ВТРАТИТЕ ВСІ СВОЇ БІТКОЇНИ&lt;/b&gt;!</translation>
+        <translation type="unfinished">Увага: Якщо ви зашифруєте свій гаманець і втратите парольну фразу, ви &lt;b&gt;ВТРАТИТЕ ВСІ СВОЇ БІТКОЇНИ&lt;/b&gt;!</translation>
     </message>
     <message>
         <source>Are you sure you wish to encrypt your wallet?</source>
@@ -177,11 +177,11 @@ Signing is only possible with addresses of the type 'legacy'.</source>
     </message>
     <message>
         <source>Enter the new passphrase for the wallet.&lt;br/&gt;Please use a passphrase of &lt;b&gt;ten or more random characters&lt;/b&gt;, or &lt;b&gt;eight or more words&lt;/b&gt;.</source>
-        <translation type="unfinished">Введіть новий пароль для гаманця.&lt;br/&gt;Використовуйте пароль з &lt;b&gt;десяти або більше випадкових символів&lt;/b&gt;, або &lt;b&gt;вісім або більше слів&lt;/b&gt;.</translation>
+        <translation type="unfinished">Введіть нову парольну фразу для гаманця.&lt;br/&gt;Використовуйте парольну фразу з &lt;b&gt;десяти або більше випадкових символів&lt;/b&gt;, або &lt;b&gt;з восьми або більше слів&lt;/b&gt;.</translation>
     </message>
     <message>
         <source>Enter the old passphrase and new passphrase for the wallet.</source>
-        <translation type="unfinished">Введіть стару та нову парольну фразу для гаманця.</translation>
+        <translation type="unfinished">Введіть стару парольну фразу та нову парольну фразу для гаманця.</translation>
     </message>
     <message>
         <source>Continue</source>
@@ -221,7 +221,7 @@ Signing is only possible with addresses of the type 'legacy'.</source>
     </message>
     <message>
         <source>The supplied passphrases do not match.</source>
-        <translation type="unfinished">Введені паролі не співпадають.</translation>
+        <translation type="unfinished">Введені парольні фрази не збігаються.</translation>
     </message>
     <message>
         <source>Wallet unlock failed</source>
@@ -229,23 +229,23 @@ Signing is only possible with addresses of the type 'legacy'.</source>
     </message>
     <message>
         <source>The passphrase entered for the wallet decryption was incorrect.</source>
-        <translation type="unfinished">Введено невірний пароль.</translation>
+        <translation type="unfinished">Парольна фраза, введена для розшифрування гаманця, була неправильною.</translation>
     </message>
     <message>
         <source>The passphrase entered for the wallet decryption is incorrect. It contains a null character (ie - a zero byte). If the passphrase was set with a version of this software prior to 25.0, please try again with only the characters up to — but not including — the first null character. If this is successful, please set a new passphrase to avoid this issue in the future.</source>
-        <translation type="unfinished">Парольна фраза, введена для розшифровки гаманця, неправильна. Він містить null-символ (тобто - нульовий байт). Якщо парольна фраза була налаштована з версією цього програмного забезпечення до версії 25.0, спробуйте ще раз, використовуючи лише символи до першого нульового символу, але не включаючи його. Якщо це вдасться, будь ласка, встановіть нову парольну фразу, щоб уникнути цієї проблеми в майбутньому.</translation>
+        <translation type="unfinished">Парольна фраза, введена для розшифрування гаманця, неправильна. Вона містить null-символ (тобто нульовий байт). Якщо парольну фразу було встановлено у версії цієї програми, старішій за 25.0, спробуйте ще раз, ввівши лише символи до, але не включаючи, першого нульового символу. У разі успіху встановіть нову парольну фразу, щоб уникнути цієї проблеми в майбутньому.</translation>
     </message>
     <message>
         <source>Wallet passphrase was successfully changed.</source>
-        <translation type="unfinished">Пароль було успішно змінено.</translation>
+        <translation type="unfinished">Парольну фразу гаманця успішно змінено.</translation>
     </message>
     <message>
         <source>Passphrase change failed</source>
-        <translation type="unfinished">Помилка зміни парольної фрази</translation>
+        <translation type="unfinished">Не вдалося змінити парольну фразу</translation>
     </message>
     <message>
         <source>The old passphrase entered for the wallet decryption is incorrect. It contains a null character (ie - a zero byte). If the passphrase was set with a version of this software prior to 25.0, please try again with only the characters up to — but not including — the first null character.</source>
-        <translation type="unfinished">Стара парольна фраза, введена для розшифровки гаманця, неправильна. Він містить null-символ (тобто - нульовий байт). Якщо парольна фраза була налаштована з версією цього програмного забезпечення до версії 25.0, спробуйте ще раз, використовуючи лише символи до першого нульового символу, але не включаючи його.</translation>
+        <translation type="unfinished">Стара парольна фраза, введена для розшифрування гаманця, неправильна. Вона містить null-символ (тобто нульовий байт). Якщо парольну фразу було встановлено у версії цієї програми, старішій за 25.0, спробуйте ще раз, ввівши лише символи до, але не включаючи, першого нульового символу.</translation>
     </message>
     <message>
         <source>Warning: The Caps Lock key is on!</source>
@@ -369,6 +369,11 @@ Signing is only possible with addresses of the type 'legacy'.</source>
         <extracomment>Short-lived peer connection type that solicits known addresses from a peer.</extracomment>
         <translation type="unfinished">Отримування адрес</translation>
     </message>
+    <message>
+        <source>Private Broadcast</source>
+        <extracomment>Short-lived peer connection type that is used for broadcasting privacy-sensitive data.</extracomment>
+        <translation type="unfinished">Приватне розповсюдження</translation>
+    </message>
     <message>
         <source>%1 d</source>
         <translation type="unfinished">%1 д</translation>
@@ -547,7 +552,7 @@ Signing is only possible with addresses of the type 'legacy'.</source>
     </message>
     <message>
         <source>Change the passphrase used for wallet encryption</source>
-        <translation type="unfinished">Змінити пароль, який використовується для шифрування гаманця</translation>
+        <translation type="unfinished">Змінити парольну фразу, що використовується для шифрування гаманця</translation>
     </message>
     <message>
         <source>&amp;Send</source>
@@ -575,7 +580,7 @@ Signing is only possible with addresses of the type 'legacy'.</source>
     </message>
     <message>
         <source>&amp;Change Passphrase…</source>
-        <translation type="unfinished">Змінити парол&amp;ь…</translation>
+        <translation type="unfinished">Змінити парольну &amp;фразу…</translation>
     </message>
     <message>
         <source>Sign &amp;message…</source>
@@ -613,6 +618,10 @@ Signing is only possible with addresses of the type 'legacy'.</source>
         <source>Close All Wallets…</source>
         <translation type="unfinished">Закрити Всі Гаманці…</translation>
     </message>
+    <message>
+        <source>Restore and Migrate Wallet File…</source>
+        <translation type="unfinished">Відновити та перенести файл гаманця…</translation>
+    </message>
     <message>
         <source>&amp;File</source>
         <translation type="unfinished">&amp;Файл</translation>
@@ -647,7 +656,7 @@ Signing is only possible with addresses of the type 'legacy'.</source>
     </message>
     <message>
         <source>Connecting to peers…</source>
-        <translation type="unfinished">Встановлення з'єднань…</translation>
+        <translation type="unfinished">Підключення до учасників…</translation>
     </message>
     <message>
         <source>Request payments (generates QR codes and bitcoin: URIs)</source>
@@ -807,6 +816,23 @@ Signing is only possible with addresses of the type 'legacy'.</source>
         <extracomment>Label of the input field where the name of the wallet is entered.</extracomment>
         <translation type="unfinished">Назва гаманця</translation>
     </message>
+    <message>
+        <source>Invalid Wallet Name</source>
+        <translation type="unfinished">Неприпустима назва гаманця</translation>
+    </message>
+    <message>
+        <source>Wallet name cannot be empty</source>
+        <translation type="unfinished">Назва гаманця не може бути порожньою</translation>
+    </message>
+    <message>
+        <source>Restore and Migrate Wallet Backup</source>
+        <translation type="unfinished">Відновити та перенести резервну копію гаманця</translation>
+    </message>
+    <message>
+        <source>Restore and Migrate Wallet</source>
+        <extracomment>Title of pop-up window shown when the user is attempting to restore a wallet.</extracomment>
+        <translation type="unfinished">Відновити та перенести гаманець</translation>
+    </message>
     <message>
         <source>&amp;Window</source>
         <translation type="unfinished">&amp;Вікно</translation>
@@ -1040,7 +1066,7 @@ Signing is only possible with addresses of the type 'legacy'.</source>
     </message>
     <message>
         <source>&amp;Unlock unspent</source>
-        <translation type="unfinished">&amp;Розблокувати невитрачені</translation>
+        <translation type="unfinished">&amp;Розблокувати монети</translation>
     </message>
     <message>
         <source>Copy quantity</source>
@@ -1166,6 +1192,40 @@ The migration process will create a backup of the wallet before migrating. This
         <source>Solvable but not watched scripts have been migrated to a new wallet named '%1'.</source>
         <translation type="unfinished">Спроможні скрипти, але не "тільки для перегляду", були перенесені в новий гаманець під назвою '%1'.</translation>
     </message>
+    <message>
+        <source>Restore and Migrate wallet</source>
+        <translation type="unfinished">Відновити та перенести гаманець</translation>
+    </message>
+    <message>
+        <source>Are you sure you wish to restore the wallet file &lt;i&gt;%1&lt;/i&gt; to &lt;i&gt;%2&lt;/i&gt; and migrate it?</source>
+        <translation type="unfinished">Ви впевнені, що бажаєте відновити файл гаманця &lt;i&gt;%1&lt;/i&gt; в &lt;i&gt;%2&lt;/i&gt; та перенести його?</translation>
+    </message>
+    <message>
+        <source>Restoring the wallet will copy the backup file to the wallets directory and place it in the standard wallet directory layout. The original file will not be modified.
+
+Migrating the wallet will convert the restored wallet to one or more descriptor wallets. A new wallet backup will need to be made.
+If this wallet contains any watchonly scripts, a new wallet will be created which contains those watchonly scripts.
+If this wallet contains any solvable but not watched scripts, a different and new wallet will be created which contains those scripts.
+
+The migration process will create a backup of the wallet before migrating. This backup file will be named &lt;wallet name&gt;-&lt;timestamp&gt;.legacy.bak and can be found in the directory for this wallet. In the event of an incorrect migration, the backup can be restored with the "Restore Wallet" functionality.</source>
+        <translation type="unfinished">Відновлення гаманця скопіює файл резервної копії до каталогу гаманців та розмістить його відповідно до стандартної структури каталогів гаманця. Оригінальний файл не буде змінено.
+
+Під час перенесення гаманця він буде перетворено на один або кілька дескрипторних гаманців. Необхідно буде створити нову резервну копію гаманця.
+Якщо цей гаманець містить будь-які скрипти "тільки для перегляду", буде створено новий гаманець, що містить такі скрипти.
+Якщо цей гаманець містить будь-які спроможні скрипти, але не "тільки для перегляду", буде створено інший новий гаманець, що містить такі скрипти.
+
+Процес перенесення створить резервну копію гаманця перед початком. Цей файл резервної копії буде названий &lt;wallet name&gt;-&lt;timestamp&gt;.legacy.bak і знаходитиметься в каталозі для цього гаманця. У випадку неправильного перенесення резервну копію можна відновити за допомогою функціоналу "Відновити гаманець".</translation>
+    </message>
+    <message>
+        <source>Restore Wallet</source>
+        <extracomment>Title of progress window which is displayed when wallets are being restored.</extracomment>
+        <translation type="unfinished">Відновити гаманець</translation>
+    </message>
+    <message>
+        <source>Restoring Wallet &lt;b&gt;%1&lt;/b&gt;…</source>
+        <extracomment>Descriptive text of the restore wallets progress window which indicates to the user that wallets are currently being restored.</extracomment>
+        <translation type="unfinished">Відновлення гаманця &lt;b&gt;%1&lt;/b&gt;…</translation>
+    </message>
     <message>
         <source>Migration failed</source>
         <translation type="unfinished">Перенесення не вдалося</translation>
@@ -1271,7 +1331,7 @@ The migration process will create a backup of the wallet before migrating. This
     </message>
     <message>
         <source>Encrypt the wallet. The wallet will be encrypted with a passphrase of your choice.</source>
-        <translation type="unfinished">Зашифруйте гаманець. Гаманець буде зашифрований за допомогою пароля на ваш вибір.</translation>
+        <translation type="unfinished">Зашифрувати гаманець. Гаманець буде зашифровано за допомогою обраної вами парольної фрази.</translation>
     </message>
     <message>
         <source>Encrypt Wallet</source>
@@ -1290,12 +1350,12 @@ The migration process will create a backup of the wallet before migrating. This
         <translation type="unfinished">Вимкнути приватні ключі</translation>
     </message>
     <message>
-        <source>Make a blank wallet. Blank wallets do not initially have private keys or scripts. Private keys and addresses can be imported, or an HD seed can be set, at a later time.</source>
-        <translation type="unfinished">Зробіть порожній гаманець. Порожні гаманці спочатку не мають приватних ключів або сценаріїв. Пізніше можна імпортувати приватні ключі та адреси або встановити HD-насіння.</translation>
+        <source>Make a blank wallet. Blank wallets do not initially have private keys or scripts. Private keys and addresses can be imported using descriptors at a later time.</source>
+        <translation type="unfinished">Створити порожній гаманець. Порожні гаманці від початку не містять приватних ключів або скриптів. Приватні ключі та адреси можна імпортувати пізніше за допомогою дескрипторів.</translation>
     </message>
     <message>
         <source>Make Blank Wallet</source>
-        <translation type="unfinished">Створити пустий гаманець</translation>
+        <translation type="unfinished">Створити порожній гаманець</translation>
     </message>
     <message>
         <source>Use an external signing device such as a hardware wallet. Configure the external signer script in wallet preferences first.</source>
@@ -1363,7 +1423,7 @@ The migration process will create a backup of the wallet before migrating. This
     </message>
     <message>
         <source>Could not unlock wallet.</source>
-        <translation type="unfinished">Не вдалося розблокувати гаманець.</translation>
+        <translation type="unfinished">Неможливо розблокувати гаманець.</translation>
     </message>
     <message>
         <source>New key generation failed.</source>
@@ -2034,15 +2094,19 @@ The migration process will create a backup of the wallet before migrating. This
     </message>
     <message>
         <source>Cannot sign inputs while wallet is locked.</source>
-        <translation type="unfinished">Не вдалося підписати входи, поки гаманець заблокований.</translation>
+        <translation type="unfinished">Неможливо підписати входи, поки гаманець заблокований.</translation>
     </message>
     <message>
         <source>Could not sign any more inputs.</source>
         <translation type="unfinished">Не вдалося підписати більше входів.</translation>
     </message>
-    <message>
-        <source>Signed %1 inputs, but more signatures are still required.</source>
-        <translation type="unfinished">Підписано %1 входів, але все одно потрібно більше підписів.</translation>
+    <message numerus="yes">
+        <source>Signed %n input(s), but more signatures are still required.</source>
+        <translation type="unfinished">
+            <numerusform>Підписано %n вхід, але все ще потрібні додаткові підписи.</numerusform>
+            <numerusform>Підписано %n входи, але все ще потрібні додаткові підписи.</numerusform>
+            <numerusform>Підписано %n входів, але все ще потрібні додаткові підписи.</numerusform>
+        </translation>
     </message>
     <message>
         <source>Signed transaction successfully. Transaction is ready to broadcast.</source>
@@ -2101,9 +2165,13 @@ The migration process will create a backup of the wallet before migrating. This
         <source>or</source>
         <translation type="unfinished">або</translation>
     </message>
-    <message>
-        <source>Transaction has %1 unsigned inputs.</source>
-        <translation type="unfinished">Транзакція містить %1 непідписаних входів.</translation>
+    <message numerus="yes">
+        <source>Transaction has %n unsigned input(s).</source>
+        <translation type="unfinished">
+            <numerusform>Транзакція містить %n непідписаний вхід.</numerusform>
+            <numerusform>Транзакція містить %n непідписані входи.</numerusform>
+            <numerusform>Транзакція містить %n непідписаних входів.</numerusform>
+        </translation>
     </message>
     <message>
         <source>Transaction is missing some information about inputs.</source>
@@ -2156,8 +2224,8 @@ The migration process will create a backup of the wallet before migrating. This
         <source>Cannot process payment request because BIP70 is not supported.
 Due to widespread security flaws in BIP70 it's strongly recommended that any merchant instructions to switch wallets be ignored.
 If you are receiving this error you should request the merchant provide a BIP21 compatible URI.</source>
-        <translation type="unfinished">Не вдалося обробити запит на оплату, оскільки BIP70 не підтримується.
-Через поширені недоліки безпеки в BIP70 рекомендується ігнорувати будь-які вказівки продавця щодо перемикання гаманців.
+        <translation type="unfinished">Неможливо обробити запит на оплату, оскільки BIP70 не підтримується.
+Через поширені недоліки безпеки в BIP70 рекомендується ігнорувати будь -які вказівки продавців щодо перемикання гаманців.
 Якщо ви отримуєте цю помилку, вам слід вимагати у продавця надати URI, який сумісний з BIP21.</translation>
     </message>
     <message>
@@ -2392,16 +2460,12 @@ If you are receiving this error you should request the merchant provide a BIP21
     </message>
     <message>
         <source>Whether we relay transactions to this peer.</source>
-        <translation type="unfinished">Чи передаємо ми транзакції цьому аналогу.</translation>
+        <translation type="unfinished">Чи ретранслювати транзакції цьому учаснику.</translation>
     </message>
     <message>
         <source>Transaction Relay</source>
         <translation type="unfinished">Ретрансляція транзакцій</translation>
     </message>
-    <message>
-        <source>Starting Block</source>
-        <translation type="unfinished">Початковий Блок</translation>
-    </message>
     <message>
         <source>Synced Headers</source>
         <translation type="unfinished">Синхронізовані Заголовки</translation>
@@ -2450,7 +2514,7 @@ If you are receiving this error you should request the merchant provide a BIP21
     <message>
         <source>Addresses Rate-Limited</source>
         <extracomment>Text title for the Addresses Rate-Limited field in the peer details area, which displays the total number of addresses received from this peer that were dropped (not processed) due to rate-limiting.</extracomment>
-        <translation type="unfinished">Лімітовані адреси</translation>
+        <translation type="unfinished">Обмежені за частотою адреси</translation>
     </message>
     <message>
         <source>User Agent</source>
@@ -2619,6 +2683,11 @@ If you are receiving this error you should request the merchant provide a BIP21
         <extracomment>Explanatory text for a short-lived outbound peer connection that is used to request addresses from a peer.</extracomment>
         <translation type="unfinished">Вихідний для отримання адрес: короткотривалий, для витребування адрес</translation>
     </message>
+    <message>
+        <source>Private broadcast: short-lived, for broadcasting privacy-sensitive transactions</source>
+        <extracomment>Explanatory text for a short-lived outbound peer connection that is used to broadcast privacy-sensitive data (like our transactions).</extracomment>
+        <translation type="unfinished">Приватне розповсюдження: короткочасне, для розповсюдження транзакцій, чутливих до конфіденційності</translation>
+    </message>
     <message>
         <source>detecting: peer could be v1 or v2</source>
         <extracomment>Explanatory text for "detecting" transport type.</extracomment>
@@ -3288,10 +3357,6 @@ Note:  Since the fee is calculated on a per-byte basis, a fee rate of "100 satos
         <source>The amount exceeds your balance.</source>
         <translation type="unfinished">Сума перевищує ваш баланс.</translation>
     </message>
-    <message>
-        <source>The total exceeds your balance when the %1 transaction fee is included.</source>
-        <translation type="unfinished">Після додавання комісії %1, сума перевищить ваш баланс.</translation>
-    </message>
     <message>
         <source>Duplicate address found: addresses should only be used once each.</source>
         <translation type="unfinished">Знайдено адресу, що дублюється: кожна адреса має бути вказана тільки один раз.</translation>
@@ -3345,7 +3410,7 @@ Note:  Since the fee is calculated on a per-byte basis, a fee rate of "100 satos
     </message>
     <message>
         <source>Pay &amp;To:</source>
-        <translation type="unfinished">&amp;Кому сплатити:</translation>
+        <translation type="unfinished">&amp;Отримувач:</translation>
     </message>
     <message>
         <source>&amp;Label:</source>
@@ -3499,7 +3564,7 @@ Note:  Since the fee is calculated on a per-byte basis, a fee rate of "100 satos
     </message>
     <message>
         <source>The entered address is invalid.</source>
-        <translation type="unfinished">Вказана адреса є недійсною.</translation>
+        <translation type="unfinished">Введена адреса є недійсною.</translation>
     </message>
     <message>
         <source>Please check the address and try again.</source>
@@ -3507,7 +3572,7 @@ Note:  Since the fee is calculated on a per-byte basis, a fee rate of "100 satos
     </message>
     <message>
         <source>The entered address does not refer to a legacy (P2PKH) key. Message signing for SegWit and other non-P2PKH address types is not supported in this version of %1. Please check the address and try again.</source>
-        <translation type="unfinished">Введена адреса не відповідає застарілому (P2PKH) ключу. Підписування повідомлень для SegWit та інших типів адрес, відмінних від P2PKH, не підтримується в цій версії %1. Будь ласка, перевірте адресу та спробуйте ще раз.</translation>
+        <translation type="unfinished">Введена адреса не належить до застарілого типу (P2PKH). Підписування повідомлень для SegWit та інших типів адрес, відмінних від P2PKH, не підтримується у цій версії %1. Перевірте адресу та спробуйте ще раз.</translation>
     </message>
     <message>
         <source>Wallet unlock was cancelled.</source>
@@ -3531,7 +3596,7 @@ Note:  Since the fee is calculated on a per-byte basis, a fee rate of "100 satos
     </message>
     <message>
         <source>The signature could not be decoded.</source>
-        <translation type="unfinished">Не вдалося декодувати підпис.</translation>
+        <translation type="unfinished">Підпис не можливо декодувати.</translation>
     </message>
     <message>
         <source>Please check the signature and try again.</source>
@@ -3903,7 +3968,7 @@ Note:  Since the fee is calculated on a per-byte basis, a fee rate of "100 satos
     </message>
     <message>
         <source>Copy &amp;raw transaction</source>
-        <translation type="unfinished">Копіювати &amp;всю транзакцію</translation>
+        <translation type="unfinished">Копіювати &amp;необроблену транзакцію</translation>
     </message>
     <message>
         <source>Copy full transaction &amp;details</source>
@@ -4080,7 +4145,7 @@ Go to File &gt; Open Wallet to load a wallet.
     </message>
     <message>
         <source>Can't sign transaction.</source>
-        <translation type="unfinished">Неможливо підписати транзакцію.</translation>
+        <translation type="unfinished">Не можливо підписати транзакцію.</translation>
     </message>
     <message>
         <source>Could not commit transaction</source>
@@ -4147,7 +4212,7 @@ Go to File &gt; Open Wallet to load a wallet.
     </message>
     <message>
         <source>%s request to listen on port %u. This port is considered "bad" and thus it is unlikely that any peer will connect to it. See doc/p2p-bad-ports.md for details and a full list.</source>
-        <translation type="unfinished">Запит %s на прослуховування порту %u. Цей порт вважається «поганим» і тому навряд чи до нього підключиться який-небудь учасник. Перегляньте doc/p2p-bad-ports.md для отримання подробиць та повного списку.</translation>
+        <translation type="unfinished">Запит %s на прослуховування порту %u. Цей порт вважається «поганим», тому малоймовірно, що будь-який учасник під’єднається до нього. Дивіться doc/p2p-bad-ports.md для детальної інформації та повного списку.</translation>
     </message>
     <message>
         <source>Disk space for %s may not accommodate the block files. Approximately %u GB of data will be stored in this directory.</source>
@@ -4159,7 +4224,7 @@ Go to File &gt; Open Wallet to load a wallet.
     </message>
     <message>
         <source>Error loading wallet. Wallet requires blocks to be downloaded, and software does not currently support loading wallets while blocks are being downloaded out of order when using assumeutxo snapshots. Wallet should be able to load successfully after node sync reaches height %s</source>
-        <translation type="unfinished">Помилка завантаження гаманця. Гаманець вимагає завантаження блоків, і програмне забезпечення в даний час не підтримує завантаження гаманців, тоді як блоки завантажуються з ладу при використанні знімків assumeutxo. Гаманець повинен мати можливість успішно завантажуватися після того, як синхронізація вузлів досягне висоти %s</translation>
+        <translation type="unfinished">Помилка завантаження гаманця. Гаманець потребує завантаження блоків, а програмне забезпечення наразі не підтримує завантаження гаманців під час завантаження блоків у довільному порядку при використанні знімків assumeutxo. Гаманець має успішно завантажитися після того, як синхронізація вузла досягне висоти %s</translation>
     </message>
     <message>
         <source>Error reading %s! Transaction data may be missing or incorrect. Rescanning wallet.</source>
@@ -4183,7 +4248,7 @@ Go to File &gt; Open Wallet to load a wallet.
     </message>
     <message>
         <source>Error: Unable to produce descriptors for this legacy wallet. Make sure to provide the wallet's passphrase if it is encrypted.</source>
-        <translation type="unfinished">Помилка: не вдається створити дескриптори для цього застарілого гаманця. Обов'язково вкажіть парольну фразу гаманця, якщо вона зашифрована.</translation>
+        <translation type="unfinished">Помилка: Не вдалося створити дескриптори для цього застарілого гаманця. Якщо гаманець зашифровано, обов'язково введіть його парольну фразу.</translation>
     </message>
     <message>
         <source>File %s already exists. If you are sure this is what you want, move it out of the way first.</source>
@@ -4215,11 +4280,11 @@ Go to File &gt; Open Wallet to load a wallet.
     </message>
     <message>
         <source>Prune configured below the minimum of %d MiB.  Please use a higher number.</source>
-        <translation type="unfinished">Встановлений розмір скороченого блокчейна є замалим (меншим за %d МіБ). Використовуйте більший розмір.</translation>
+        <translation type="unfinished">Встановлений розмір скороченого блокчейну є замалим (меншим за %d МіБ). Використовуйте більший розмір.</translation>
     </message>
     <message>
         <source>Prune mode is incompatible with -reindex-chainstate. Use full -reindex instead.</source>
-        <translation type="unfinished">Режим скороченого блокчейна несумісний з -reindex-chainstate. Використовуйте натомість повний -reindex.</translation>
+        <translation type="unfinished">Режим скороченого блокчейну несумісний з -reindex-chainstate. Натомість використовуйте повний -reindex.</translation>
     </message>
     <message>
         <source>Rename of '%s' -&gt; '%s' failed. You should resolve this by manually moving or deleting the invalid snapshot directory %s, otherwise you will encounter the same error again on the next startup.</source>
@@ -4273,17 +4338,13 @@ Go to File &gt; Open Wallet to load a wallet.
         <source>Warning: Private keys detected in wallet {%s} with disabled private keys</source>
         <translation type="unfinished">Попередження: Приватні ключі виявлено в гаманці {%s} з відключеними приватними ключами</translation>
     </message>
-    <message>
-        <source>Warning: We do not appear to fully agree with our peers! You may need to upgrade, or other nodes may need to upgrade.</source>
-        <translation type="unfinished">Попередження: Неможливо досягти консенсусу з підключеними учасниками! Вам, або іншим вузлам необхідно оновити програмне забезпечення.</translation>
-    </message>
     <message>
         <source>Witness data for blocks after height %d requires validation. Please restart with -reindex.</source>
         <translation type="unfinished">Дані witness для блоків з висотою більше %d потребують перевірки. Перезапустіть з -reindex.</translation>
     </message>
     <message>
         <source>You need to rebuild the database using -reindex to go back to unpruned mode.  This will redownload the entire blockchain</source>
-        <translation type="unfinished">Вам необхідно перебудувати базу даних за допомогою -reindex, щоб повернутися до режиму нескороченого блокчейна. Це призведе до повторного завантаження всього блокчейна</translation>
+        <translation type="unfinished">Вам необхідно перебудувати базу даних за допомогою -reindex, щоб повернутися до режиму нескороченого блокчейну. Це призведе до повторного завантаження всього блокчейну</translation>
     </message>
     <message>
         <source>%s is set very high!</source>
@@ -4315,7 +4376,7 @@ Go to File &gt; Open Wallet to load a wallet.
     </message>
     <message>
         <source>Cannot provide specific connections and have addrman find outgoing connections at the same time.</source>
-        <translation type="unfinished">Неможливо встановити визначені з'єднання та одночасно використовувати addrman для встановлення вихідних з'єднань.</translation>
+        <translation type="unfinished">Не вдалося встановити визначені з'єднання і одночасно використовувати addrman для встановлення вихідних з'єднань.</translation>
     </message>
     <message>
         <source>Error loading %s: External signer wallet being loaded without external signer support compiled</source>
@@ -4373,23 +4434,15 @@ Go to File &gt; Open Wallet to load a wallet.
     </message>
     <message>
         <source>Maximum transaction weight is too low, can not accommodate change output</source>
-        <translation type="unfinished">Максимальна вага транзакції занадто мала, не може вмістити виведення змін</translation>
+        <translation type="unfinished">Максимальна вага транзакції занадто мала, неможливо вмістити вихід для решти</translation>
     </message>
     <message>
         <source>Option '-checkpoints' is set but checkpoints were removed. This option has no effect.</source>
         <translation type="unfinished">Опцію '-checkpoints' встановлено, але контрольні точки було вилучено. Ця опція не має жодного ефекту.</translation>
     </message>
-    <message>
-        <source>Option '-maxorphantx' is set but no longer has any effect (see release notes). Please remove it from your configuration.</source>
-        <translation type="unfinished">Опцію '-maxorphantx' встановлено, але вона більше не має жодного ефекту (дивись примітки до випуску). Будь ласка, приберіть її з вашої конфігурації.</translation>
-    </message>
-    <message>
-        <source>Options '-datacarrier' or '-datacarriersize' are set but are marked as deprecated. They will be removed in a future version.</source>
-        <translation type="unfinished">Опції '-datacarrier' або '-datacarriersize' встановлено, але їх позначено як застарілі. Вони будуть вилучені у майбутній версії.</translation>
-    </message>
     <message>
         <source>Outbound connections restricted to CJDNS (-onlynet=cjdns) but -cjdnsreachable is not provided</source>
-        <translation type="unfinished">Вихідні з'єднання, обмежені CJDNS (-onlynet=cjdns), але -cjdnsreachable не надаються</translation>
+        <translation type="unfinished">Вихідні з'єднання обмежені CJDNS (-onlynet=cjdns), але параметр -cjdnsreachable не вказано</translation>
     </message>
     <message>
         <source>Outbound connections restricted to Tor (-onlynet=onion) but the proxy for reaching the Tor network is explicitly forbidden: -onion=0</source>
@@ -4401,7 +4454,7 @@ Go to File &gt; Open Wallet to load a wallet.
     </message>
     <message>
         <source>Outbound connections restricted to i2p (-onlynet=i2p) but -i2psam is not provided</source>
-        <translation type="unfinished">Вихідні з'єднання, обмежені i2p (-onlynet=i2p), але -i2psam не надаються</translation>
+        <translation type="unfinished">Вихідні з'єднання обмежені i2p (-onlynet=i2p), але параметр -i2psam не вказано</translation>
     </message>
     <message>
         <source>Prune: last wallet synchronisation goes beyond pruned data. You need to -reindex (download the whole blockchain again in case of a pruned node)</source>
@@ -4429,11 +4482,11 @@ Go to File &gt; Open Wallet to load a wallet.
     </message>
     <message>
         <source>The inputs size exceeds the maximum weight. Please try sending a smaller amount or manually consolidating your wallet's UTXOs</source>
-        <translation type="unfinished">Розмір входів перевищує максимальну вагу. Будь ласка, спробуйте надіслати меншу суму або вручну консолідувати UTXO вашого гаманця</translation>
+        <translation type="unfinished">Розмір входів перевищує максимальну вагу. Спробуйте надіслати меншу суму або вручну консолідувати UTXO вашого гаманця</translation>
     </message>
     <message>
         <source>The preselected coins total amount does not cover the transaction target. Please allow other inputs to be automatically selected or include more coins manually</source>
-        <translation type="unfinished">Загальна сума попередньо обраних монет не покриває цільовий показник транзакції. Будь ласка, дозвольте автоматично вибирати інші вхідні дані або включати більше монет вручну</translation>
+        <translation type="unfinished">Загальна сума попередньо обраних монет не покриває цільову суму транзакції. Дозвольте автоматичний вибір інших входів або додайте більше монет вручну</translation>
     </message>
     <message>
         <source>UTXO snapshot failed to validate. Restart to resume normal initial block download, or try loading a different snapshot.</source>
@@ -4477,10 +4530,6 @@ Unable to restore backup of wallet.</source>
         <source>whitebind may only be used for incoming connections ("out" was passed)</source>
         <translation type="unfinished">whitebind можна використовувати лише для вхідних з'єднань (передано «out»)</translation>
     </message>
-    <message>
-        <source>-paytxfee is deprecated and will be fully removed in v31.0.</source>
-        <translation type="unfinished">Опцію -paytxfee визнано застарілою, і її буде остаточно вилучено у версії v31.0.</translation>
-    </message>
     <message>
         <source>A fatal internal error occurred, see debug.log for details: </source>
         <translation type="unfinished">Виникла фатальна внутрішня помилка, докладніше див. debug.log: </translation>
@@ -4501,10 +4550,6 @@ Unable to restore backup of wallet.</source>
         <source>Can't spend unconfirmed version 3 pre-selected input with a version %d tx</source>
         <translation type="unfinished">Неможливо витратити непідтверджений попередньо вибраний вхід версії 3 у транзакції версії %d</translation>
     </message>
-    <message>
-        <source>Cannot add WalletDescriptor to a non-descriptor wallet</source>
-        <translation type="unfinished">Неможливо додати WalletDescriptor до гаманця, який не є дескрипторним</translation>
-    </message>
     <message>
         <source>Cannot write to directory '%s'; check permissions.</source>
         <translation type="unfinished">Неможливо записати до каталогу '%s'; перевірте дозволи.</translation>
@@ -4537,6 +4582,10 @@ Unable to restore backup of wallet.</source>
         <source>Could not parse asmap file %s</source>
         <translation type="unfinished">Не вдалося розібрати файл asmap %s</translation>
     </message>
+    <message>
+        <source>Could not read embedded asmap data</source>
+        <translation type="unfinished">Не вдалося прочитати вбудовані дані asmap</translation>
+    </message>
     <message>
         <source>Could not top up scriptPubKeys</source>
         <translation type="unfinished">Не вдалося поповнити scriptPubKeys</translation>
@@ -4558,8 +4607,8 @@ Unable to restore backup of wallet.</source>
         <translation type="unfinished">Збій перевірки коректності еліптичної криптографії. %s завершує роботу.</translation>
     </message>
     <message>
-        <source>Error creating %s</source>
-        <translation type="unfinished">Помилка створення %s</translation>
+        <source>Embedded asmap data not available</source>
+        <translation type="unfinished">Вбудовані дані asmap недоступні</translation>
     </message>
     <message>
         <source>Error initializing block database</source>
@@ -4569,10 +4618,6 @@ Unable to restore backup of wallet.</source>
         <source>Error loading %s</source>
         <translation type="unfinished">Помилка завантаження %s</translation>
     </message>
-    <message>
-        <source>Error loading %s: Private keys can only be disabled during creation</source>
-        <translation type="unfinished">Помилка завантаження %s: Приватні ключі можуть бути тільки вимкнені при створенні</translation>
-    </message>
     <message>
         <source>Error loading %s: Wallet corrupted</source>
         <translation type="unfinished">Помилка завантаження %s: Гаманець пошкоджено</translation>
@@ -4721,10 +4766,6 @@ Unable to restore backup of wallet.</source>
         <source>Failed to close file when writing block.</source>
         <translation type="unfinished">Не вдалося закрити файл під час запису блока.</translation>
     </message>
-    <message>
-        <source>Failed to connect best block (%s).</source>
-        <translation type="unfinished">Не вдалося підключити найкращий блок (%s).</translation>
-    </message>
     <message>
         <source>Failed to disconnect block.</source>
         <translation type="unfinished">Не вдалося відключити блок.</translation>
@@ -4749,14 +4790,6 @@ Unable to restore backup of wallet.</source>
         <source>Failed to write block.</source>
         <translation type="unfinished">Не вдалося написати блок.</translation>
     </message>
-    <message>
-        <source>Failed to write to block index database.</source>
-        <translation type="unfinished">Не вдалося записати в базу даних блочного індексу.</translation>
-    </message>
-    <message>
-        <source>Failed to write to coin database.</source>
-        <translation type="unfinished">Не вдалося записати в базу даних монет.</translation>
-    </message>
     <message>
         <source>Failed to write undo data.</source>
         <translation type="unfinished">Не вдалося записати дані відкату.</translation>
@@ -4787,7 +4820,7 @@ Unable to restore backup of wallet.</source>
     </message>
     <message>
         <source>Insufficient dbcache for block verification</source>
-        <translation type="unfinished">Недостатня кількість dbcache для перевірки блоку</translation>
+        <translation type="unfinished">Недостатньо dbcache для перевірки блоків</translation>
     </message>
     <message>
         <source>Insufficient funds</source>
@@ -4809,14 +4842,26 @@ Unable to restore backup of wallet.</source>
         <source>Invalid P2P permission: '%s'</source>
         <translation type="unfinished">Неприпустимий P2P дозвіл: '%s'</translation>
     </message>
-    <message>
-        <source>Invalid amount for %s=&lt;amount&gt;: '%s' (must be at least %s)</source>
-        <translation type="unfinished">Неприпустима сума в %s=&lt;amount&gt;: '%s' (має бути не меншим за %s)</translation>
-    </message>
     <message>
         <source>Invalid amount for %s=&lt;amount&gt;: '%s'</source>
         <translation type="unfinished">Неприпустима сума в %s=&lt;amount&gt;: '%s'</translation>
     </message>
+    <message>
+        <source>A %zu MiB dbcache may be too large for a system memory of only %zu MiB.</source>
+        <translation type="unfinished">dbcache розміром %zu MiB може бути завеликим для системної пам'яті обсягом лише %zu MiB.</translation>
+    </message>
+    <message>
+        <source>Creating wallet…</source>
+        <translation type="unfinished">Створення гаманця…</translation>
+    </message>
+    <message>
+        <source>Duplicate binding configuration for address %s. Please check your -bind, -bind=...=onion and -whitebind settings.</source>
+        <translation type="unfinished">Дубльована конфігурація прив'язки для адреси %s. Перевірте налаштування -bind, -bind=...=onion та -whitebind.</translation>
+    </message>
+    <message>
+        <source>Error creating %s: Could not write version metadata.</source>
+        <translation type="unfinished">Помилка створення %s: Не вдалося записати метадані версії.</translation>
+    </message>
     <message>
         <source>Invalid amount for -%s=&lt;amount&gt;: '%s'</source>
         <translation type="unfinished">Неприпустима сума в %s=&lt;amount&gt;: '%s'</translation>
@@ -4871,7 +4916,7 @@ Unable to restore backup of wallet.</source>
     </message>
     <message>
         <source>Not found pre-selected input %s</source>
-        <translation type="unfinished">Не знайдено попередньо вибраних вхідних даних %s</translation>
+        <translation type="unfinished">Попередньо обраний вхід %s не знайдено</translation>
     </message>
     <message>
         <source>Not solvable pre-selected input %s</source>
@@ -4881,6 +4926,26 @@ Unable to restore backup of wallet.</source>
         <source>Only direction was set, no permissions: '%s'</source>
         <translation type="unfinished">Встановлено лише напрямок, без дозволів: '%s'</translation>
     </message>
+    <message>
+        <source>Option '-limitancestorsize' is given but ancestor size limits have been replaced with cluster size limits (see -limitclustersize). This option has no effect.</source>
+        <translation type="unfinished">Вказано параметр '-limitancestorsize', але обмеження розміру предків замінено на обмеження розміру кластера (див. -limitclustersize). Цей параметр не має ефекту.</translation>
+    </message>
+    <message>
+        <source>Option '-limitdescendantsize' is given but descendant size limits have been replaced with cluster size limits (see -limitclustersize). This option has no effect.</source>
+        <translation type="unfinished">Вказано параметр '-limitdescendantsize', але обмеження розміру нащадків замінено на обмеження розміру кластера (див. -limitclustersize). Цей параметр не має ефекту.</translation>
+    </message>
+    <message>
+        <source>Private broadcast of own transactions requested (-privatebroadcast) and -proxyrandomize is disabled. Tor circuits for private broadcast connections may be correlated to other connections over Tor. For maximum privacy set -proxyrandomize=1.</source>
+        <translation type="unfinished">Запитано приватне розповсюдження власних транзакцій (-privatebroadcast), а параметр -proxyrandomize вимкнено. Ланцюжки Tor для з'єднань приватного розповсюдження можуть бути пов'язані з іншими з'єднаннями через Tor. Для максимальної конфіденційності встановіть -proxyrandomize=1.</translation>
+    </message>
+    <message>
+        <source>Private broadcast of own transactions requested (-privatebroadcast), but -connect is also configured. They are incompatible because the private broadcast needs to open new connections to randomly chosen Tor or I2P peers. Consider using -maxconnections=0 -addnode=... instead</source>
+        <translation type="unfinished">Запитано приватне розповсюдження власних транзакцій (-privatebroadcast), але також налаштовано -connect. Вони несумісні, оскільки приватне розповсюдження потребує відкриття нових з'єднань із випадково обраними учасниками через Tor або I2P. Замість цього розгляньте можливість використання -maxconnections=0 -addnode=...</translation>
+    </message>
+    <message>
+        <source>Private broadcast of own transactions requested (-privatebroadcast), but none of Tor or I2P networks is reachable</source>
+        <translation type="unfinished">Запитано приватне розповсюдження власних транзакцій (-privatebroadcast), але жодна з мереж Tor або I2P недоступна.</translation>
+    </message>
     <message>
         <source>Prune cannot be configured with a negative value.</source>
         <translation type="unfinished">Розмір скороченого блокчейну не може бути від'ємним.</translation>
@@ -4889,6 +4954,10 @@ Unable to restore backup of wallet.</source>
         <source>Prune mode is incompatible with -txindex.</source>
         <translation type="unfinished">Режим скороченого блокчейну несумісний з -txindex.</translation>
     </message>
+    <message>
+        <source>Prune mode is incompatible with -txospenderindex.</source>
+        <translation type="unfinished">Режим скороченого блокчейну несумісний з -txospenderindex.</translation>
+    </message>
     <message>
         <source>Pruning blockstore…</source>
         <translation type="unfinished">Скорочення обсягу сховища блоків…</translation>
@@ -4989,6 +5058,10 @@ Unable to restore backup of wallet.</source>
         <source>The specified config file %s does not exist</source>
         <translation type="unfinished">Вказаний файл настройки %s не існує</translation>
     </message>
+    <message>
+        <source>The total exceeds your balance when the %s transaction fee is included.</source>
+        <translation type="unfinished">Загальна сума перевищує ваш баланс з урахуванням комісії за транзакцію %s.</translation>
+    </message>
     <message>
         <source>The transaction amount is too small to pay the fee</source>
         <translation type="unfinished">Неможливо сплатити комісію із-за малої суми транзакції</translation>
@@ -5013,10 +5086,6 @@ Unable to restore backup of wallet.</source>
         <source>This is the minimum transaction fee you pay on every transaction.</source>
         <translation type="unfinished">Це мінімальна плата за транзакцію, яку ви сплачуєте за кожну операцію.</translation>
     </message>
-    <message>
-        <source>This is the transaction fee you will pay if you send a transaction.</source>
-        <translation type="unfinished">Це транзакційна комісія, яку ви сплатите, якщо будете надсилати транзакцію.</translation>
-    </message>
     <message>
         <source>Transaction %s does not belong to this wallet</source>
         <translation type="unfinished">Транзакція %s не належить до цього гаманця</translation>
@@ -5039,7 +5108,7 @@ Unable to restore backup of wallet.</source>
     </message>
     <message>
         <source>Transaction needs a change address, but we can't generate it.</source>
-        <translation type="unfinished">Транзакції потрібна адреса для решти, але неможливо згенерувати таку адресу.</translation>
+        <translation type="unfinished">Транзакція потребує адресу для решти, але не можна створити її.</translation>
     </message>
     <message>
         <source>Transaction too large</source>
@@ -5105,6 +5174,10 @@ Unable to restore backup of wallet.</source>
         <source>Wallet file creation failed: %s</source>
         <translation type="unfinished">Помилка створення файлу гаманця: %s</translation>
     </message>
+    <message>
+        <source>Warning: Found invalid chain more than 6 blocks longer than our best chain. This could be due to database corruption or consensus incompatibility with peers.</source>
+        <translation type="unfinished">Попередження: Знайдено недійсний ланцюжок, на понад 6 блоків довший за наш найкращий ланцюжок. Це може бути спричинено пошкодженням бази даних або несумісністю консенсусу з учасниками.</translation>
+    </message>
     <message>
         <source>acceptstalefeeestimates is not supported on %s chain.</source>
         <translation type="unfinished">acceptstalefeeestimates не підтримується для %s блокчейну.</translation>
diff --git a/src/qt/locale/bitcoin_ur.ts b/src/qt/locale/bitcoin_ur.ts
index 6cd41c3323e8..3203f6b1b8a1 100644
--- a/src/qt/locale/bitcoin_ur.ts
+++ b/src/qt/locale/bitcoin_ur.ts
@@ -301,19 +301,90 @@ Signing is only possible with addresses of the type 'legacy'.</source>
         <source>unknown</source>
         <translation type="unfinished">نامعلوم</translation>
     </message>
+    <message>
+        <source>Custom…</source>
+        <translation type="unfinished">"کسٹم…"</translation>
+    </message>
     <message>
         <source>Amount</source>
         <translation type="unfinished">رقم</translation>
     </message>
+    <message>
+        <source>Ctrl+W</source>
+        <translation type="unfinished">موجودہ ٹیب بند کریں</translation>
+    </message>
     <message>
         <source>Unroutable</source>
         <translation type="unfinished">ناقابل استعمال</translation>
     </message>
+    <message>
+        <source>IPv4</source>
+        <comment>network name</comment>
+        <extracomment>Name of IPv4 network in peer info</extracomment>
+        <translation type="unfinished"> آئی پی وی 4</translation>
+    </message>
+    <message>
+        <source>IPv6</source>
+        <comment>network name</comment>
+        <extracomment>Name of IPv6 network in peer info</extracomment>
+        <translation type="unfinished">"آئی پی وی 6"</translation>
+    </message>
+    <message>
+        <source>Onion</source>
+        <comment>network name</comment>
+        <extracomment>Name of Tor network in peer info</extracomment>
+        <translation type="unfinished">پیاز </translation>
+    </message>
+    <message>
+        <source>I2P</source>
+        <comment>network name</comment>
+        <extracomment>Name of I2P network in peer info</extracomment>
+        <translation type="unfinished">آئی ٹو پی</translation>
+    </message>
+    <message>
+        <source>CJDNS</source>
+        <comment>network name</comment>
+        <extracomment>Name of CJDNS network in peer info</extracomment>
+        <translation type="unfinished">مکمل ریلے</translation>
+    </message>
+    <message>
+        <source>Inbound</source>
+        <extracomment>An inbound connection from a peer. An inbound connection is a connection initiated by a peer.</extracomment>
+        <translation type="unfinished">آنے والا</translation>
+    </message>
+    <message>
+        <source>Outbound</source>
+        <extracomment>An outbound connection to a peer. An outbound connection is a connection initiated by us.</extracomment>
+        <translation type="unfinished">باہر جانے والا</translation>
+    </message>
+    <message>
+        <source>Full Relay</source>
+        <extracomment>Peer connection type that relays all network information.</extracomment>
+        <translation type="unfinished">"مکمل ریلے"</translation>
+    </message>
+    <message>
+        <source>Manual</source>
+        <extracomment>Peer connection type established manually through one of several methods.</extracomment>
+        <translation type="unfinished">دستی</translation>
+    </message>
+    <message>
+        <source>Feeler</source>
+        <extracomment>Short-lived peer connection type that tests the aliveness of known addresses.</extracomment>
+        <translation type="unfinished">محسوس کرنے والا</translation>
+    </message>
     <message>
         <source>Address Fetch</source>
         <extracomment>Short-lived peer connection type that solicits known addresses from a peer.</extracomment>
         <translation type="unfinished">پتہ بازیافت کریں۔</translation>
     </message>
+    <message>
+        <source>None</source>
+        <translation type="unfinished">کوئی نہیں</translation>
+    </message>
+    <message>
+        <source>N/A</source>
+        <translation type="unfinished">لاگو نہیں</translation>
+    </message>
     <message>
         <source>%1 ms</source>
         <translation type="unfinished">ملی سیکنڈز %1</translation>
@@ -744,19 +815,19 @@ Signing is only possible with addresses of the type 'legacy'.</source>
     <message>
         <source>Date: %1
 </source>
-        <translation type="unfinished">%1' تاریخ۔
+        <translation type="unfinished">1%1' تاریخ۔
 </translation>
     </message>
     <message>
         <source>Amount: %1
 </source>
-        <translation type="unfinished">%1' مقدار
+        <translation type="unfinished">1%1' مقدار
 </translation>
     </message>
     <message>
         <source>Wallet: %1
 </source>
-        <translation type="unfinished">%1' والیٹ
+        <translation type="unfinished">1%1' والیٹ
 </translation>
     </message>
     <message>
@@ -768,13 +839,13 @@ Signing is only possible with addresses of the type 'legacy'.</source>
     <message>
         <source>Label: %1
 </source>
-        <translation type="unfinished">%1'لیبل
+        <translation type="unfinished">1%1'لیبل
 </translation>
     </message>
     <message>
         <source>Address: %1
 </source>
-        <translation type="unfinished">%1' پتہ
+        <translation type="unfinished">1%1' پتہ
 </translation>
     </message>
     <message>
@@ -968,7 +1039,11 @@ Signing is only possible with addresses of the type 'legacy'.</source>
         <source>Can't list signers</source>
         <translation type="unfinished">دستخط کنندگان کی فہرست نہیں بن سکتی</translation>
     </message>
-    </context>
+    <message>
+        <source>Too many external signers found</source>
+        <translation type="unfinished">بہت سارے باہر کے دستخط کرنے والے ملے</translation>
+    </message>
+</context>
 <context>
     <name>LoadWalletsActivity</name>
     <message>
@@ -984,6 +1059,10 @@ Signing is only possible with addresses of the type 'legacy'.</source>
 </context>
 <context>
     <name>MigrateWalletActivity</name>
+    <message>
+        <source>Migrate wallet</source>
+        <translation type="unfinished">بٹ کوائن کے لیے بٹوے کو منتقل کریں</translation>
+    </message>
     <message>
         <source>Migrating the wallet will convert this wallet to one or more descriptor wallets. A new wallet backup will need to be made.
 If this wallet contains any watchonly scripts, a new wallet will be created which contains those watchonly scripts.
@@ -1002,7 +1081,20 @@ The migration process will create a backup of the wallet before migrating. This
         <source>Migrate Wallet</source>
         <translation type="unfinished">والیٹ منتقل کریں</translation>
     </message>
-    </context>
+    <message>
+        <source>Restore Wallet</source>
+        <extracomment>Title of progress window which is displayed when wallets are being restored.</extracomment>
+        <translation type="unfinished">والیٹ بحال کریں</translation>
+    </message>
+    <message>
+        <source>Migration failed</source>
+        <translation type="unfinished">بٹ کوائن کے لیے منتقلی ناکام ہوئی</translation>
+    </message>
+    <message>
+        <source>Migration Successful</source>
+        <translation type="unfinished">بٹ کوائن کے لیے منتقلی کامیاب ہوئی</translation>
+    </message>
+</context>
 <context>
     <name>OpenWalletActivity</name>
     <message>
@@ -1026,7 +1118,22 @@ The migration process will create a backup of the wallet before migrating. This
         <extracomment>Title of progress window which is displayed when wallets are being restored.</extracomment>
         <translation type="unfinished">والیٹ بحال کریں</translation>
     </message>
-    </context>
+    <message>
+        <source>Restore wallet failed</source>
+        <extracomment>Title of message box which is displayed when the wallet could not be restored.</extracomment>
+        <translation type="unfinished">بٹ کوئن والٹ بحال کرنے میں ناکام</translation>
+    </message>
+    <message>
+        <source>Restore wallet warning</source>
+        <extracomment>Title of message box which is displayed when the wallet is restored with some warning.</extracomment>
+        <translation type="unfinished">بٹ کوئن والٹ بحال کرنے کا انتباہ </translation>
+    </message>
+    <message>
+        <source>Restore wallet message</source>
+        <extracomment>Title of message box which is displayed when the wallet is successfully restored.</extracomment>
+        <translation type="unfinished">بٹ کوائن کے لیے بٹوے کو بحال کریں</translation>
+    </message>
+</context>
 <context>
     <name>WalletController</name>
     <message>
@@ -1052,6 +1159,10 @@ The migration process will create a backup of the wallet before migrating. This
         <source>Create Wallet</source>
         <translation type="unfinished">والیٹ بنائیں</translation>
     </message>
+    <message>
+        <source>You are one step away from creating your new wallet!</source>
+        <translation type="unfinished">آپ بٹ کوائن کے لیے نئے بٹوے بنانے سے صرف ایک قدم دور ہیں!</translation>
+    </message>
     <message>
         <source>Please provide a name and, if desired, enable any advanced options</source>
         <translation type="unfinished">براہ کرم ایک نام فراہم کریں اور، اگر مطلوب ہو تو، کوئی بھی اعلی درجے کے اختیارات کو فعال کریں</translation>
@@ -1084,10 +1195,6 @@ The migration process will create a backup of the wallet before migrating. This
         <source>Disable Private Keys</source>
         <translation type="unfinished">نجی چابیاں غیر فعال کریں۔</translation>
     </message>
-    <message>
-        <source>Make a blank wallet. Blank wallets do not initially have private keys or scripts. Private keys and addresses can be imported, or an HD seed can be set, at a later time.</source>
-        <translation type="unfinished">ایک خالی والیٹ بنائیں۔ خالی والیٹ میں ابتدائی طور پر نجی چابیاں یا اسکرپٹ نہیں ہوتے ہیں۔ نجی چابیاں اور پتے درآمد کیے جا سکتے ہیں، یا بعد میں ایک HD بیج سیٹ کیا جا سکتا ہے۔</translation>
-    </message>
     <message>
         <source>Make Blank Wallet</source>
         <translation type="unfinished">خالی والیٹ بنائیں</translation>
@@ -1257,6 +1364,10 @@ The migration process will create a backup of the wallet before migrating. This
             <numerusform />
         </translation>
     </message>
+    <message>
+        <source>Choose data directory</source>
+        <translation type="unfinished">ٹ کوائن کے لیے ڈیٹا ڈائریکٹری منتخب کریں</translation>
+    </message>
     <message numerus="yes">
         <source>(sufficient to restore backups %n day(s) old)</source>
         <extracomment>Explanatory text on the capability of the current prune target.</extracomment>
@@ -1351,6 +1462,11 @@ The migration process will create a backup of the wallet before migrating. This
         <source>Enabling pruning significantly reduces the disk space required to store transactions. All blocks are still fully validated. Reverting this setting requires re-downloading the entire blockchain.</source>
         <translation type="unfinished">کٹائی کو فعال کرنا لین دین کو ذخیرہ کرنے کے لیے درکار ڈسک کی جگہ کو نمایاں طور پر کم کرتا ہے۔ تمام بلاکس اب بھی مکمل طور پر درست ہیں۔ اس ترتیب کو واپس کرنے کے لیے پورے بلاکچین کو دوبارہ ڈاؤن لوڈ کرنے کی ضرورت ہے۔</translation>
     </message>
+    <message>
+        <source>Maximum database cache size. Make sure you have enough RAM. A larger cache can contribute to faster sync, after which the benefit is less pronounced for most use cases. Lowering the cache size will reduce memory usage. Unused mempool memory is shared for this cache.</source>
+        <extracomment>Tooltip text for Options window setting that sets the size of the database cache. Explains the corresponding effects of increasing/decreasing this value.</extracomment>
+        <translation type="unfinished">"بٹ کوائن کے لیے زیادہ سے زیادہ ڈیٹابیس کیش کا سائز۔ یقینی بنائیں کہ آپ کے پاس کافی ریم ہے۔ بڑا کیش تیز سنک کرنے میں مدد کر سکتا ہے، لیکن اس کے بعد زیادہ تر استعمال کے لیے فائدہ کم ہوتا ہے۔ کیش کا سائز کم کرنے سے میموری کا استعمال کم ہوگا۔ غیر استعمال شدہ میمپول میموری اس کیش کے لیے شیئر کی جاتی ہے</translation>
+    </message>
     <message>
         <source>Size of &amp;database cache</source>
         <translation type="unfinished">ڈیٹا بیس کیشے کا سائز</translation>
@@ -1359,6 +1475,14 @@ The migration process will create a backup of the wallet before migrating. This
         <source>Number of script &amp;verification threads</source>
         <translation type="unfinished">اسکرپٹ اور تصدیقی دھاگوں کی تعداد</translation>
     </message>
+    <message>
+        <source>Automatically open the Bitcoin client port on the router. This only works when your router supports PCP or NAT-PMP and it is enabled. The external port could be random.</source>
+        <translation type="unfinished">"بٹ کوائن کلائنٹ پورٹ کو روٹر پر خودکار طور پر کھولیں۔ یہ صرف اس وقت کام کرتا ہے جب آپ کا روٹر PCP یا NAT-PMP کو سپورٹ کرتا ہو اور یہ فعال ہو۔ بیرونی پورٹ بے ترتیب ہو سکتا ہے۔</translation>
+    </message>
+    <message>
+        <source>Map port using PCP or NA&amp;T-PMP</source>
+        <translation type="unfinished">بٹ کوائن کے لیے PCP یا NAT-PMP کا استعمال کرتے ہوئے پورٹ میپ کریں</translation>
+    </message>
     <message>
         <source>IP address of the proxy (e.g. IPv4: 127.0.0.1 / IPv6: ::1)</source>
         <translation type="unfinished">پراکسی کا IP پتہ (جیسے IPv4: 127.0.0.1 / IPv6: ::1)</translation>
@@ -1371,6 +1495,10 @@ The migration process will create a backup of the wallet before migrating. This
         <source>Minimize instead of exit the application when the window is closed. When this option is enabled, the application will be closed only after selecting Exit in the menu.</source>
         <translation type="unfinished">ونڈو بند ہونے پر ایپلیکیشن سے باہر نکلنے کے بجائے چھوٹا کریں۔ جب یہ آپشن فعال ہو جائے گا تو مینو میں ایگزٹ کو منتخب کرنے کے بعد ہی ایپلیکیشن بند ہو جائے گی۔</translation>
     </message>
+    <message>
+        <source>Font in the Overview tab: </source>
+        <translation type="unfinished">بٹ کوائن کے لیے اوور ویو ٹیب میں فونٹ"</translation>
+    </message>
     <message>
         <source>Open Configuration File</source>
         <translation type="unfinished">ترتیب والی فائل کھولیں۔</translation>
@@ -1395,6 +1523,35 @@ The migration process will create a backup of the wallet before migrating. This
         <source>Reverting this setting requires re-downloading the entire blockchain.</source>
         <translation type="unfinished">اس ترتیب کو واپس کرنے کے لیے پورے بلاکچین کو دوبارہ ڈاؤن لوڈ کرنے کی ضرورت ہے۔</translation>
     </message>
+    <message>
+        <source>MiB</source>
+        <translation type="unfinished">بٹ کوائن کے لیے بلاک اسٹوریج کو میبی بائٹ تک پرون کریں</translation>
+    </message>
+    <message>
+        <source>Set the number of script verification threads. Negative values correspond to the number of cores you want to leave free to the system.</source>
+        <extracomment>Tooltip text for Options window setting that sets the number of script verification threads. Explains that negative values mean to leave these many cores free to the system.</extracomment>
+        <translation type="unfinished">بٹ کوائن کے لیے اسکرپٹ تصدیق کے دھاگوں کی تعداد سیٹ کریں۔ منفی اقدار اس تعداد کے مساوی ہیں جو آپ سسٹم کے لیے آزاد رکھنا چاہتے ہیں</translation>
+    </message>
+    <message>
+        <source>(0 = auto, &lt;0 = leave that many cores free)</source>
+        <translation type="unfinished">(بٹ کوائن کے لیے) 0 = خودکار، &lt;0 = اتنی کورز کو سسٹم کے لیے آزاد
+ چھوڑیں</translation>
+    </message>
+    <message>
+        <source>This allows you or a third party tool to communicate with the node through command-line and JSON-RPC commands.</source>
+        <extracomment>Tooltip text for Options window setting that enables the RPC server.</extracomment>
+        <translation type="unfinished">بٹ کوائن کے لیے اس سے آپ یا کوئی تیسری پارٹی کا ٹول نوڈ کے ساتھ کمانڈ لائن اور JSON-RPC کمانڈز کے ذریعے رابطہ کر سکتا ہے۔"</translation>
+    </message>
+    <message>
+        <source>Whether to set subtract fee from amount as default or not.</source>
+        <extracomment>Tooltip text for Options window setting that sets subtracting the fee from a sending amount as default.</extracomment>
+        <translation type="unfinished">بٹ کوائن کے لیے کیا فیس کو رقم سے خودکار طور پر منہا کرنا ہے یا نہیں۔</translation>
+    </message>
+    <message>
+        <source>Subtract &amp;fee from amount by default</source>
+        <extracomment>An Options window setting to set subtracting the fee from a sending amount as default.</extracomment>
+        <translation type="unfinished">فیس کو رقم سے خودکار طور پر منہا کریں</translation>
+    </message>
     <message>
         <source>Expert</source>
         <translation type="unfinished">ماہر</translation>
@@ -1411,10 +1568,68 @@ The migration process will create a backup of the wallet before migrating. This
         <source>&amp;Spend unconfirmed change</source>
         <translation type="unfinished">اور غیر مصدقہ تبدیلی خرچ کریں۔</translation>
     </message>
+    <message>
+        <source>Whether to show PSBT controls.</source>
+        <extracomment>Tooltip text for options window setting that enables PSBT controls.</extracomment>
+        <translation type="unfinished">کیا PSBT کنٹرولز دکھانے ہیں۔"</translation>
+    </message>
+    <message>
+        <source>External Signer (e.g. hardware wallet)</source>
+        <translation type="unfinished">یرونی دستخط کنندہ (مثلاً ہارڈویئر بٹوا)</translation>
+    </message>
+    <message>
+        <source>Accept connections from outside.</source>
+        <translation type="unfinished">باہر سے رابطے قبول کری</translation>
+    </message>
+    <message>
+        <source>Connect to the Bitcoin network through a SOCKS5 proxy.</source>
+        <translation type="unfinished">بٹ کوائن نیٹ ورک سے SOCKS5 پراکسی کے ذریع
+ے رابطہ کریں"</translation>
+    </message>
+    <message>
+        <source>Port of the proxy (e.g. 9050)</source>
+        <translation type="unfinished">پراکسی کا پورٹ (مثلاً 9050)"</translation>
+    </message>
+    <message>
+        <source>Used for reaching peers via:</source>
+        <translation type="unfinished">"ساتھیوں تک رسائی کے لیے استعمال کیا جاتا ہے:</translation>
+    </message>
+    <message>
+        <source>IPv4</source>
+        <translation type="unfinished"> آئی پی وی 4</translation>
+    </message>
+    <message>
+        <source>IPv6</source>
+        <translation type="unfinished">"آئی پی وی 6"</translation>
+    </message>
+    <message>
+        <source>Tor</source>
+        <translation type="unfinished">ور"</translation>
+    </message>
     <message>
         <source>&amp;Window</source>
         <translation type="unfinished">اور ونڈو</translation>
     </message>
+    <message>
+        <source>Show the icon in the system tray.</source>
+        <translation type="unfinished">سسٹم ٹرے میں آئیکن دکھائیں</translation>
+    </message>
+    <message>
+        <source>Show only a tray icon after minimizing the window.</source>
+        <translation type="unfinished">"ونڈو کو کم کرنے کے بعد صرف ٹرے آئیکن دکھائیں"</translation>
+    </message>
+    <message>
+        <source>Choose the default subdivision unit to show in the interface and when sending coins.</source>
+        <translation type="unfinished">انٹرفیس میں دکھانے اور سکے بھیجتے وقت پہلے سے طے شدہ تقسیم یونٹ منتخب کریں</translation>
+    </message>
+    <message>
+        <source>Whether to show coin control features or not.</source>
+        <translation type="unfinished">"کیا سکے کنٹرول فیچرز دکھانے ہیں یا نہیں۔</translation>
+    </message>
+    <message>
+        <source>Connect to the Bitcoin network through a separate SOCKS5 proxy for Tor onion services.</source>
+        <translation type="unfinished">ور آنین سروسز کے لیے الگ SOCKS5 پراکسی کے ذریعے بٹ کوائن نیٹ ورک سے رابطہ کریں</translation>
+    </message>
     <message>
         <source>Compiled without external signing support (required for external signing)</source>
         <extracomment>"External signing" means using devices such as hardware wallets.</extracomment>
@@ -1448,14 +1663,27 @@ The migration process will create a backup of the wallet before migrating. This
         <extracomment>Window title text of pop-up box that allows opening up of configuration file.</extracomment>
         <translation type="unfinished">کنفیگریشن کے اختیارات</translation>
     </message>
+    <message>
+        <source>The configuration file is used to specify advanced user options which override GUI settings. Additionally, any command-line options will override this configuration file.</source>
+        <extracomment>Explanatory text about the priority order of instructions considered by client. The order from high to low being: command-line, configuration file, GUI settings.</extracomment>
+        <translation type="unfinished">کنفیگریشن فائل کا استعمال اعلیٰ صارف اختیارات کو متعین کرنے کے لیے کیا جاتا ہے جو GUI سیٹنگز کو اوور رائیڈ کرتے ہیں۔ اس کے علاوہ، کوئی بھی کمانڈ لائن اختیارات اس کنفیگریشن فائل کو اوور رائیڈ کریں گے۔"</translation>
+    </message>
     <message>
         <source>Continue</source>
         <translation type="unfinished">جاری رکھیں</translation>
     </message>
+    <message>
+        <source>Cancel</source>
+        <translation type="unfinished">نسوخ کریں"</translation>
+    </message>
     <message>
         <source>Error</source>
         <translation type="unfinished">نقص</translation>
     </message>
+    <message>
+        <source>The configuration file could not be opened.</source>
+        <translation type="unfinished">کنفیگریشن فائل کھولی نہیں جا سکی۔"</translation>
+    </message>
     <message>
         <source>This change would require a client restart.</source>
         <translation type="unfinished">اس تبدیلی کو کلائنٹ کو دوبارہ شروع کرنے کی ضرورت ہوگی۔</translation>
@@ -1522,6 +1750,18 @@ The migration process will create a backup of the wallet before migrating. This
 </context>
 <context>
     <name>PSBTOperationsDialog</name>
+    <message>
+        <source>PSBT Operations</source>
+        <translation type="unfinished">"PSBT آپریشنز</translation>
+    </message>
+    <message>
+        <source>Sign Tx</source>
+        <translation type="unfinished">رانزیکشن پر دستخط کریں"</translation>
+    </message>
+    <message>
+        <source>Broadcast Tx</source>
+        <translation type="unfinished">ٹرانزیکشن نشر کریں"</translation>
+    </message>
     <message>
         <source>Copy to Clipboard</source>
         <translation type="unfinished">کلپ بورڈ پر کاپی کریں۔</translation>
@@ -1542,14 +1782,58 @@ The migration process will create a backup of the wallet before migrating. This
         <source>Failed to sign transaction: %1</source>
         <translation type="unfinished">لین دین پر دستخط کرنے میں ناکام:%1</translation>
     </message>
+    <message>
+        <source>Cannot sign inputs while wallet is locked.</source>
+        <translation type="unfinished">"جب بٹوا مقفل ہو تو ان پٹس پر دستخط نہیں کیے جا سکتے۔"</translation>
+    </message>
     <message>
         <source>Could not sign any more inputs.</source>
         <translation type="unfinished">مزید ان پٹ پر دستخط نہیں ہو سکے۔</translation>
     </message>
+    <message numerus="yes">
+        <source>Signed %n input(s), but more signatures are still required.</source>
+        <translation type="unfinished">
+            <numerusform />
+            <numerusform />
+        </translation>
+    </message>
+    <message>
+        <source>Signed transaction successfully. Transaction is ready to broadcast.</source>
+        <translation type="unfinished">"ٹرانزیکشن پر کامیابی سے دستخط کر دیا گیا۔ ٹرانزیکشن نشر کرنے کے لیے تیار ہے۔</translation>
+    </message>
+    <message>
+        <source>Unknown error processing transaction.</source>
+        <translation type="unfinished">ٹرانزیکشن پر عمل کرنے میں نامعلوم خرابی۔</translation>
+    </message>
+    <message>
+        <source>PSBT copied to clipboard.</source>
+        <translation type="unfinished">"PSBT کلپ بورڈ پر کاپی کر دیا گیا۔"</translation>
+    </message>
     <message>
         <source>Save Transaction Data</source>
         <translation type="unfinished">لین دین کا ڈیٹا محفوظ کریں۔</translation>
     </message>
+    <message>
+        <source>Partially Signed Transaction (Binary)</source>
+        <extracomment>Expanded name of the binary PSBT file format. See: BIP 174.</extracomment>
+        <translation type="unfinished">جزوی طور پر دستخط شدہ ٹرانزیکشن (بائنری</translation>
+    </message>
+    <message>
+        <source>PSBT saved to disk.</source>
+        <translation type="unfinished">PSBT ڈسک پر محفوظ کر دیا گیا۔"</translation>
+    </message>
+    <message>
+        <source>own address</source>
+        <translation type="unfinished">اپنا پتہ"</translation>
+    </message>
+    <message>
+        <source>Unable to calculate transaction fee or total transaction amount.</source>
+        <translation type="unfinished">"ٹرانزیکشن فیس یا کل ٹرانزیکشن رقم کا حساب لگانے میں ناکامی۔"</translation>
+    </message>
+    <message>
+        <source>Pays transaction fee: </source>
+        <translation type="unfinished">ٹرانزیکشن فیس ادا کرتا ہے:"</translation>
+    </message>
     <message>
         <source>Total Amount</source>
         <translation type="unfinished">کل رقم</translation>
@@ -1558,14 +1842,33 @@ The migration process will create a backup of the wallet before migrating. This
         <source>or</source>
         <translation type="unfinished">یا</translation>
     </message>
+    <message numerus="yes">
+        <source>Transaction has %n unsigned input(s).</source>
+        <translation type="unfinished">
+            <numerusform />
+            <numerusform />
+        </translation>
+    </message>
     <message>
         <source>Transaction still needs signature(s).</source>
         <translation type="unfinished">لین دین کو ابھی بھی دستخط کی ضرورت ہے۔</translation>
     </message>
+    <message>
+        <source>(But no wallet is loaded.)</source>
+        <translation type="unfinished">(لیکن کوئی بٹوا لوڈ نہیں کیا گیا۔)</translation>
+    </message>
     <message>
         <source>(But this wallet cannot sign transactions.)</source>
         <translation type="unfinished">(لیکن یہ والیٹ لین دین پر دستخط نہیں کر سکتا۔)</translation>
     </message>
+    <message>
+        <source>(But this wallet does not have the right keys.)</source>
+        <translation type="unfinished">(لیکن اس بٹوے کے پاس صحیح چابیاں نہیں ہیں۔)</translation>
+    </message>
+    <message>
+        <source>Transaction is fully signed and ready for broadcast.</source>
+        <translation type="unfinished">لین دین مکمل طور پر دستخط شدہ ہے اور نشر کرنے کے لیے تیار ہے۔</translation>
+    </message>
     <message>
         <source>Transaction status is unknown.</source>
         <translation type="unfinished">لین دین کی حیثیت نامعلوم ہے۔</translation>
@@ -1577,13 +1880,29 @@ The migration process will create a backup of the wallet before migrating. This
         <source>Payment request error</source>
         <translation type="unfinished">ادائیگی کی درخواست کی خرابی۔</translation>
     </message>
+    <message>
+        <source>Cannot start bitcoin: click-to-pay handler</source>
+        <translation type="unfinished">کوائن شروع نہیں کیا جا سکتا: کلک کرکے ادائیگی کرنے والا ہینڈلر۔</translation>
+    </message>
+    <message>
+        <source>URI handling</source>
+        <translation type="unfinished">یُو آر آئی کی ہینڈلنگ</translation>
+    </message>
     <message>
         <source>Cannot process payment request because BIP70 is not supported.
 Due to widespread security flaws in BIP70 it's strongly recommended that any merchant instructions to switch wallets be ignored.
 If you are receiving this error you should request the merchant provide a BIP21 compatible URI.</source>
         <translation type="unfinished">ادائیگی کی درخواست پر کارروائی نہیں کی جا سکتی کیونکہ BIP70 تعاون یافتہ نہیں ہے۔ BIP70 میں سیکورٹی کی وسیع خامیوں کی وجہ سے یہ پرزور مشورہ دیا جاتا ہے کہ والیٹ کو تبدیل کرنے کے لیے کسی بھی تاجر کی ہدایات کو نظر انداز کر دیا جائے۔ اگر آپ کو یہ خرابی موصول ہو رہی ہے تو آپ کو مرچنٹ سے BIP21 مطابقت پذیر URI فراہم کرنے کی درخواست کرنی چاہیے۔</translation>
     </message>
-    </context>
+    <message>
+        <source>URI cannot be parsed! This can be caused by an invalid Bitcoin address or malformed URI parameters.</source>
+        <translation type="unfinished">URI کو پارس نہیں کیا جا سکتا! اس کی وجہ ایک غلط بٹ کوائن ایڈریس یا خراب URI پیرا میٹرز ہو سکتے ہیں۔</translation>
+    </message>
+    <message>
+        <source>Payment request file handling</source>
+        <translation type="unfinished">ادائیگی کی درخواست فائل کا انتظام</translation>
+    </message>
+</context>
 <context>
     <name>PeerTableModel</name>
     <message>
@@ -1601,6 +1920,16 @@ If you are receiving this error you should request the merchant provide a BIP21
         <extracomment>Title of Peers Table column which contains a unique number used to identify a connection.</extracomment>
         <translation type="unfinished">فریق</translation>
     </message>
+    <message>
+        <source>Age</source>
+        <extracomment>Title of Peers Table column which indicates the duration (length of time) since the peer connection started.</extracomment>
+        <translation type="unfinished">عمر</translation>
+    </message>
+    <message>
+        <source>Direction</source>
+        <extracomment>Title of Peers Table column which indicates the direction the peer connection was initiated from.</extracomment>
+        <translation type="unfinished">راہنمائی </translation>
+    </message>
     <message>
         <source>Sent</source>
         <extracomment>Title of Peers Table column which indicates the total amount of network information we have sent to the peer.</extracomment>
@@ -1626,7 +1955,17 @@ If you are receiving this error you should request the merchant provide a BIP21
         <extracomment>Title of Peers Table column which states the network the peer connected through.</extracomment>
         <translation type="unfinished">نیٹ ورک</translation>
     </message>
-    </context>
+    <message>
+        <source>Inbound</source>
+        <extracomment>An Inbound Connection from a Peer.</extracomment>
+        <translation type="unfinished">آنے والا</translation>
+    </message>
+    <message>
+        <source>Outbound</source>
+        <extracomment>An Outbound Connection to a Peer.</extracomment>
+        <translation type="unfinished">باہر جانے والا</translation>
+    </message>
+</context>
 <context>
     <name>QRImageWidget</name>
     <message>
@@ -1637,17 +1976,46 @@ If you are receiving this error you should request the merchant provide a BIP21
         <source>&amp;Copy Image</source>
         <translation type="unfinished">اور تصویر کاپی کریں۔</translation>
     </message>
+    <message>
+        <source>Resulting URI too long, try to reduce the text for label / message.</source>
+        <translation type="unfinished">"یو آر آئی بہت لمبا ہے، براہ کرم لیبل یا پیغام کے متن کو کم کریں۔"</translation>
+    </message>
+    <message>
+        <source>Error encoding URI into QR Code.</source>
+        <translation type="unfinished">"یو آر آئی کو QR کوڈ میں انکوڈ کرنے میں خرابی۔"</translation>
+    </message>
+    <message>
+        <source>QR code support not available.</source>
+        <translation type="unfinished">QR کوڈ کی سپورٹ دستیاب نہیں ہے۔"</translation>
+    </message>
     <message>
         <source>Save QR Code</source>
         <translation type="unfinished">کیو آر کوڈ محفوظ کریں۔</translation>
     </message>
-    </context>
+    <message>
+        <source>PNG Image</source>
+        <extracomment>Expanded name of the PNG file format. See: https://en.wikipedia.org/wiki/Portable_Network_Graphics.</extracomment>
+        <translation type="unfinished">PNG قسم کی تصویر</translation>
+    </message>
+</context>
 <context>
     <name>RPCConsole</name>
+    <message>
+        <source>N/A</source>
+        <translation type="unfinished">لاگو نہیں</translation>
+    </message>
+    <message>
+        <source>Client version</source>
+        <translation type="unfinished">صارف کا نسخہ</translation>
+    </message>
     <message>
         <source>&amp;Information</source>
         <translation type="unfinished">اور معلومات</translation>
     </message>
+    <message>
+        <source>General</source>
+        <translation type="unfinished">عمومی</translation>
+    </message>
     <message>
         <source>Startup time</source>
         <translation type="unfinished">آغاز کا وقت</translation>
@@ -1704,10 +2072,6 @@ If you are receiving this error you should request the merchant provide a BIP21
         <source>Select a peer to view detailed information.</source>
         <translation type="unfinished">تفصیلی معلومات دیکھنے کے لیے فریق کا انتخاب کریں۔</translation>
     </message>
-    <message>
-        <source>Starting Block</source>
-        <translation type="unfinished">شروع ہونے والا بلاک</translation>
-    </message>
     <message>
         <source>Synced Blocks</source>
         <translation type="unfinished">مطابقت پذیر بلاکس</translation>
@@ -1793,6 +2157,10 @@ If you are receiving this error you should request the merchant provide a BIP21
         <source>Network activity disabled</source>
         <translation type="unfinished">نیٹ ورک کی سرگرمی غیر فعال ہے۔</translation>
     </message>
+    <message>
+        <source>None</source>
+        <translation type="unfinished">کوئی نہیں</translation>
+    </message>
     <message>
         <source>Yes</source>
         <translation type="unfinished">جی ہاں</translation>
@@ -2087,6 +2455,11 @@ If you are receiving this error you should request the merchant provide a BIP21
         <source>Save Transaction Data</source>
         <translation type="unfinished">لین دین کا ڈیٹا محفوظ کریں۔</translation>
     </message>
+    <message>
+        <source>Partially Signed Transaction (Binary)</source>
+        <extracomment>Expanded name of the binary PSBT file format. See: BIP 174.</extracomment>
+        <translation type="unfinished">جزوی طور پر دستخط شدہ ٹرانزیکشن (بائنری</translation>
+    </message>
     <message>
         <source>External balance:</source>
         <translation type="unfinished">بیرونی توازن:</translation>
@@ -2280,6 +2653,10 @@ If you are receiving this error you should request the merchant provide a BIP21
         <source>To</source>
         <translation type="unfinished">کو</translation>
     </message>
+    <message>
+        <source>own address</source>
+        <translation type="unfinished">اپنا پتہ"</translation>
+    </message>
     <message numerus="yes">
         <source>matures in %n more block(s)</source>
         <translation type="unfinished">
@@ -2400,7 +2777,11 @@ If you are receiving this error you should request the merchant provide a BIP21
         <extracomment>Name of the wallet data file format.</extracomment>
         <translation type="unfinished">والیٹ کا ڈیٹا</translation>
     </message>
-    </context>
+    <message>
+        <source>Cancel</source>
+        <translation type="unfinished">نسوخ کریں"</translation>
+    </message>
+</context>
 <context>
     <name>bitcoin-core</name>
     <message>
diff --git a/src/qt/locale/bitcoin_uz.ts b/src/qt/locale/bitcoin_uz.ts
index 2ba659c3d734..a661ced4e354 100644
--- a/src/qt/locale/bitcoin_uz.ts
+++ b/src/qt/locale/bitcoin_uz.ts
@@ -588,19 +588,19 @@ Signing is only possible with addresses of the type 'legacy'.</source>
     </message>
     <message>
         <source>Request payments (generates QR codes and bitcoin: URIs)</source>
-        <translation type="unfinished">To'lovlarni so'rash(QR kolar va bitkoin yaratish: URL manzillar)</translation>
+        <translation type="unfinished">Тўловлар (QR кодлари ва bitcoin ёрдамида яратишлар: URI’лар) сўраш</translation>
     </message>
     <message>
         <source>Show the list of used sending addresses and labels</source>
-        <translation type="unfinished">Manzillar va yorliqlar ro'yxatini ko'rsatish</translation>
+        <translation type="unfinished">Фойдаланилган жўнатилган манзиллар ва ёрлиқлар рўйхатини кўрсатиш</translation>
     </message>
     <message>
         <source>Show the list of used receiving addresses and labels</source>
-        <translation type="unfinished">Qabul qilish manzillari va yorliqlar ro'yxatini ko'rsatish</translation>
+        <translation type="unfinished">Фойдаланилган қабул қилинган манзиллар ва ёрлиқлар рўйхатини кўрсатиш</translation>
     </message>
     <message>
         <source>&amp;Command-line options</source>
-        <translation type="unfinished">&amp;Command-line sozlamalari</translation>
+        <translation type="unfinished">&amp;Буйруқлар сатри мосламалари</translation>
     </message>
     <message numerus="yes">
         <source>Processed %n block(s) of transaction history.</source>
@@ -611,7 +611,7 @@ Signing is only possible with addresses of the type 'legacy'.</source>
     </message>
     <message>
         <source>%1 behind</source>
-        <translation type="unfinished">%1 yonida</translation>
+        <translation type="unfinished">%1 орқада</translation>
     </message>
     <message>
         <source>Catching up…</source>
@@ -619,27 +619,27 @@ Signing is only possible with addresses of the type 'legacy'.</source>
     </message>
     <message>
         <source>Last received block was generated %1 ago.</source>
-        <translation type="unfinished">%1 oldin oxirgi marta blok qabul qilingan edi.</translation>
+        <translation type="unfinished">Сўнги қабул қилинган блок %1 олдин яратилган.</translation>
     </message>
     <message>
         <source>Transactions after this will not yet be visible.</source>
-        <translation type="unfinished">Shundan keyingi operatsiyalar hali ko'rinmaydi.</translation>
+        <translation type="unfinished">Бундан кейинги пул ўтказмалари кўринмайдиган бўлади.</translation>
     </message>
     <message>
         <source>Error</source>
-        <translation type="unfinished">Xatolik</translation>
+        <translation type="unfinished">Хатолик</translation>
     </message>
     <message>
         <source>Warning</source>
-        <translation type="unfinished">Eslatma</translation>
+        <translation type="unfinished">Диққат</translation>
     </message>
     <message>
         <source>Information</source>
-        <translation type="unfinished">Informatsiya</translation>
+        <translation type="unfinished">Маълумот</translation>
     </message>
     <message>
         <source>Up to date</source>
-        <translation type="unfinished">Hozirgi kunda</translation>
+        <translation type="unfinished">Янгиланган</translation>
     </message>
     <message>
         <source>Ctrl+Q</source>
@@ -943,7 +943,7 @@ Signing is only possible with addresses of the type 'legacy'.</source>
     </message>
     <message>
         <source>Date</source>
-        <translation type="unfinished">Sana</translation>
+        <translation type="unfinished">Сана</translation>
     </message>
     <message>
         <source>Confirmations</source>
@@ -983,7 +983,7 @@ Signing is only possible with addresses of the type 'legacy'.</source>
     </message>
     <message>
         <source>Copy quantity</source>
-        <translation type="unfinished">Miqdorni nusxalash</translation>
+        <translation type="unfinished">Нусха сони</translation>
     </message>
     <message>
         <source>Copy fee</source>
@@ -991,7 +991,7 @@ Signing is only possible with addresses of the type 'legacy'.</source>
     </message>
     <message>
         <source>Copy after fee</source>
-        <translation type="unfinished">'To'lovdan keyin' ni nusxalash</translation>
+        <translation type="unfinished">Нусха солиқдан сўнг</translation>
     </message>
     <message>
         <source>Copy bytes</source>
@@ -1106,6 +1106,16 @@ Migratsiya jarayoni ko'chirishdan oldin hamyonning zaxira nusxasini yaratadi. Us
         <source>Solvable but not watched scripts have been migrated to a new wallet named '%1'.</source>
         <translation type="unfinished">Yechish mumkin bo'lgan, lekin ko'rilmagan skriptlar nomli yangi hamyonga o'tkazildi%1</translation>
     </message>
+    <message>
+        <source>Restore Wallet</source>
+        <extracomment>Title of progress window which is displayed when wallets are being restored.</extracomment>
+        <translation type="unfinished">Hamyonni tiklash</translation>
+    </message>
+    <message>
+        <source>Restoring Wallet &lt;b&gt;%1&lt;/b&gt;…</source>
+        <extracomment>Descriptive text of the restore wallets progress window which indicates to the user that wallets are currently being restored.</extracomment>
+        <translation type="unfinished">Hamyon tiklanmoqda&lt;b&gt;%1&lt;/b&gt;</translation>
+    </message>
     <message>
         <source>Migration failed</source>
         <translation type="unfinished">Migratsiya amalga oshmadi</translation>
@@ -1229,10 +1239,6 @@ Migratsiya jarayoni ko'chirishdan oldin hamyonning zaxira nusxasini yaratadi. Us
         <source>Disable Private Keys</source>
         <translation type="unfinished">Maxfiy kalitlarni faolsizlantirish</translation>
     </message>
-    <message>
-        <source>Make a blank wallet. Blank wallets do not initially have private keys or scripts. Private keys and addresses can be imported, or an HD seed can be set, at a later time.</source>
-        <translation type="unfinished">Bo'sh hamyon yaratish. Bo'sh hamyonlarga keyinchalik maxfiy kalitlar yoki manzillar import qilinishi mumkin, yana HD seedlar ham o'rnatilishi mumkin.</translation>
-    </message>
     <message>
         <source>Make Blank Wallet</source>
         <translation type="unfinished">Bo'sh hamyon yaratish</translation>
@@ -1947,6 +1953,13 @@ Migratsiya jarayoni ko'chirishdan oldin hamyonning zaxira nusxasini yaratadi. Us
         <source>Cannot sign inputs while wallet is locked.</source>
         <translation type="unfinished">Hamyon maʼlumotlarga imzo qoʻyib boʻlmaydi.</translation>
     </message>
+    <message numerus="yes">
+        <source>Signed %n input(s), but more signatures are still required.</source>
+        <translation type="unfinished">
+            <numerusform />
+            <numerusform />
+        </translation>
+    </message>
     <message>
         <source>own address</source>
         <translation type="unfinished">ўз манзили</translation>
@@ -1955,6 +1968,13 @@ Migratsiya jarayoni ko'chirishdan oldin hamyonning zaxira nusxasini yaratadi. Us
         <source>or</source>
         <translation type="unfinished">ёки</translation>
     </message>
+    <message numerus="yes">
+        <source>Transaction has %n unsigned input(s).</source>
+        <translation type="unfinished">
+            <numerusform />
+            <numerusform />
+        </translation>
+    </message>
     </context>
 <context>
     <name>PaymentServer</name>
@@ -2258,7 +2278,7 @@ Migratsiya jarayoni ko'chirishdan oldin hamyonning zaxira nusxasini yaratadi. Us
     <name>RecentRequestsTableModel</name>
     <message>
         <source>Date</source>
-        <translation type="unfinished">Сана</translation>
+        <translation type="unfinished">Sana</translation>
     </message>
     <message>
         <source>Label</source>
@@ -2385,7 +2405,7 @@ Migratsiya jarayoni ko'chirishdan oldin hamyonning zaxira nusxasini yaratadi. Us
     </message>
     <message>
         <source>Copy bytes</source>
-        <translation type="unfinished">Нусха байти</translation>
+        <translation type="unfinished">Baytlarni nusxalash</translation>
     </message>
     <message>
         <source>Copy change</source>
@@ -2744,7 +2764,7 @@ Migratsiya jarayoni ko'chirishdan oldin hamyonning zaxira nusxasini yaratadi. Us
     </message>
     <message>
         <source>Exporting Failed</source>
-        <translation type="unfinished">Eksport qilinmadi</translation>
+        <translation type="unfinished">Экспорт қилиб бўлмади</translation>
     </message>
     <message>
         <source>The transaction history was successfully saved to %1.</source>
diff --git a/src/qt/locale/bitcoin_uz@Cyrl.ts b/src/qt/locale/bitcoin_uz@Cyrl.ts
index e0de801921bd..79ce2e28d420 100644
--- a/src/qt/locale/bitcoin_uz@Cyrl.ts
+++ b/src/qt/locale/bitcoin_uz@Cyrl.ts
@@ -345,35 +345,30 @@ Signing is only possible with addresses of the type 'legacy'.</source>
         <source>%n second(s)</source>
         <translation type="unfinished">
             <numerusform />
-            <numerusform />
         </translation>
     </message>
     <message numerus="yes">
         <source>%n minute(s)</source>
         <translation type="unfinished">
             <numerusform />
-            <numerusform />
         </translation>
     </message>
     <message numerus="yes">
         <source>%n hour(s)</source>
         <translation type="unfinished">
             <numerusform />
-            <numerusform />
         </translation>
     </message>
     <message numerus="yes">
         <source>%n day(s)</source>
         <translation type="unfinished">
             <numerusform />
-            <numerusform />
         </translation>
     </message>
     <message numerus="yes">
         <source>%n week(s)</source>
         <translation type="unfinished">
             <numerusform />
-            <numerusform />
         </translation>
     </message>
     <message>
@@ -384,7 +379,6 @@ Signing is only possible with addresses of the type 'legacy'.</source>
         <source>%n year(s)</source>
         <translation type="unfinished">
             <numerusform />
-            <numerusform />
         </translation>
     </message>
     <message>
@@ -603,7 +597,6 @@ Signing is only possible with addresses of the type 'legacy'.</source>
         <source>Processed %n block(s) of transaction history.</source>
         <translation type="unfinished">
             <numerusform>Tranzaksiya tarixining %n blok(lar)i qayta ishlandi.</numerusform>
-            <numerusform />
         </translation>
     </message>
     <message>
@@ -773,7 +766,6 @@ Signing is only possible with addresses of the type 'legacy'.</source>
         <extracomment>A substring of the tooltip.</extracomment>
         <translation type="unfinished">
             <numerusform>Bitkoin tarmog'iga %n aktiv ulanishlar.</numerusform>
-            <numerusform />
         </translation>
     </message>
     <message>
@@ -1067,6 +1059,10 @@ Signing is only possible with addresses of the type 'legacy'.</source>
         <source>Migrate wallet</source>
         <translation type="unfinished">Hamyonni ko'chirish</translation>
     </message>
+    <message>
+        <source>Are you sure you wish to migrate the wallet &lt;i&gt;%1&lt;/i&gt;?</source>
+        <translation type="unfinished">Hamyonni ko'chirmoqchi ekanligingizga ishonchingiz komilmi?&lt;i&gt;%1&lt;/i&gt;</translation>
+    </message>
     <message>
         <source>Migrating the wallet will convert this wallet to one or more descriptor wallets. A new wallet backup will need to be made.
 If this wallet contains any watchonly scripts, a new wallet will be created which contains those watchonly scripts.
@@ -1099,6 +1095,16 @@ Migratsiya jarayoni ko'chirishdan oldin hamyonning zaxira nusxasini yaratadi. Us
         <source>Solvable but not watched scripts have been migrated to a new wallet named '%1'.</source>
         <translation type="unfinished">Yechish mumkin bo'lgan, lekin ko'rilmagan skriptlar nomli yangi hamyonga o'tkazildi%1</translation>
     </message>
+    <message>
+        <source>Restore Wallet</source>
+        <extracomment>Title of progress window which is displayed when wallets are being restored.</extracomment>
+        <translation type="unfinished">Hamyonni tiklash</translation>
+    </message>
+    <message>
+        <source>Restoring Wallet &lt;b&gt;%1&lt;/b&gt;…</source>
+        <extracomment>Descriptive text of the restore wallets progress window which indicates to the user that wallets are currently being restored.</extracomment>
+        <translation type="unfinished">Wallet tiklanmoqda&lt;b&gt;%1&lt;/b&gt;</translation>
+    </message>
     <message>
         <source>Migration failed</source>
         <translation type="unfinished">Migratsiya amalga oshmadi</translation>
@@ -1222,10 +1228,6 @@ Migratsiya jarayoni ko'chirishdan oldin hamyonning zaxira nusxasini yaratadi. Us
         <source>Disable Private Keys</source>
         <translation type="unfinished">Maxfiy kalitlarni faolsizlantirish</translation>
     </message>
-    <message>
-        <source>Make a blank wallet. Blank wallets do not initially have private keys or scripts. Private keys and addresses can be imported, or an HD seed can be set, at a later time.</source>
-        <translation type="unfinished">Bo'sh hamyon yaratish. Bo'sh hamyonlarga keyinchalik maxfiy kalitlar yoki manzillar import qilinishi mumkin, yana HD seedlar ham o'rnatilishi mumkin.</translation>
-    </message>
     <message>
         <source>Make Blank Wallet</source>
         <translation type="unfinished">Bo'sh hamyon yaratish</translation>
@@ -1402,21 +1404,18 @@ Migratsiya jarayoni ko'chirishdan oldin hamyonning zaxira nusxasini yaratadi. Us
         <source>%n GB of space available</source>
         <translation type="unfinished">
             <numerusform>%nGb bo'sh joy mavjud</numerusform>
-            <numerusform />
         </translation>
     </message>
     <message numerus="yes">
         <source>(of %n GB needed)</source>
         <translation type="unfinished">
             <numerusform>(%nGb kerak)</numerusform>
-            <numerusform />
         </translation>
     </message>
     <message numerus="yes">
         <source>(%n GB needed for full chain)</source>
         <translation type="unfinished">
             <numerusform>(To'liq zanjir uchun%n GB kerak)</numerusform>
-            <numerusform />
         </translation>
     </message>
     <message>
@@ -1436,7 +1435,6 @@ Migratsiya jarayoni ko'chirishdan oldin hamyonning zaxira nusxasini yaratadi. Us
         <extracomment>Explanatory text on the capability of the current prune target.</extracomment>
         <translation type="unfinished">
             <numerusform>(%n kun oldingi zaxira nusxalarini tiklash uchun etarli)</numerusform>
-            <numerusform />
         </translation>
     </message>
     <message>
@@ -1936,6 +1934,12 @@ Migratsiya jarayoni ko'chirishdan oldin hamyonning zaxira nusxasini yaratadi. Us
         <source>Cannot sign inputs while wallet is locked.</source>
         <translation type="unfinished">Hamyon maʼlumotlarga imzo qoʻyib boʻlmaydi.</translation>
     </message>
+    <message numerus="yes">
+        <source>Signed %n input(s), but more signatures are still required.</source>
+        <translation type="unfinished">
+            <numerusform />
+        </translation>
+    </message>
     <message>
         <source>own address</source>
         <translation type="unfinished">ўз манзили</translation>
@@ -1944,6 +1948,12 @@ Migratsiya jarayoni ko'chirishdan oldin hamyonning zaxira nusxasini yaratadi. Us
         <source>or</source>
         <translation type="unfinished">ёки</translation>
     </message>
+    <message numerus="yes">
+        <source>Transaction has %n unsigned input(s).</source>
+        <translation type="unfinished">
+            <numerusform />
+        </translation>
+    </message>
     </context>
 <context>
     <name>PaymentServer</name>
@@ -2404,7 +2414,6 @@ Migratsiya jarayoni ko'chirishdan oldin hamyonning zaxira nusxasini yaratadi. Us
         <source>Estimated to begin confirmation within %n block(s).</source>
         <translation type="unfinished">
             <numerusform />
-            <numerusform />
         </translation>
     </message>
     <message>
@@ -2522,7 +2531,6 @@ Migratsiya jarayoni ko'chirishdan oldin hamyonning zaxira nusxasini yaratadi. Us
         <source>matures in %n more block(s)</source>
         <translation type="unfinished">
             <numerusform />
-            <numerusform />
         </translation>
     </message>
     <message>
diff --git a/src/qt/locale/bitcoin_uz@Latn.ts b/src/qt/locale/bitcoin_uz@Latn.ts
index b9131e2a316f..2d7782e9d7de 100644
--- a/src/qt/locale/bitcoin_uz@Latn.ts
+++ b/src/qt/locale/bitcoin_uz@Latn.ts
@@ -345,35 +345,30 @@ Kirish faqat 'legacy' turidagi manzillar uchun.</translation>
         <source>%n second(s)</source>
         <translation type="unfinished">
             <numerusform />
-            <numerusform />
         </translation>
     </message>
     <message numerus="yes">
         <source>%n minute(s)</source>
         <translation type="unfinished">
             <numerusform />
-            <numerusform />
         </translation>
     </message>
     <message numerus="yes">
         <source>%n hour(s)</source>
         <translation type="unfinished">
             <numerusform />
-            <numerusform />
         </translation>
     </message>
     <message numerus="yes">
         <source>%n day(s)</source>
         <translation type="unfinished">
             <numerusform />
-            <numerusform />
         </translation>
     </message>
     <message numerus="yes">
         <source>%n week(s)</source>
         <translation type="unfinished">
             <numerusform />
-            <numerusform />
         </translation>
     </message>
     <message>
@@ -384,7 +379,6 @@ Kirish faqat 'legacy' turidagi manzillar uchun.</translation>
         <source>%n year(s)</source>
         <translation type="unfinished">
             <numerusform />
-            <numerusform />
         </translation>
     </message>
     <message>
@@ -585,30 +579,29 @@ Kirish faqat 'legacy' turidagi manzillar uchun.</translation>
     </message>
     <message>
         <source>Request payments (generates QR codes and bitcoin: URIs)</source>
-        <translation type="unfinished">To'lovlarni so'rash(QR kolar va bitkoin yaratish: URL manzillar)</translation>
+        <translation type="unfinished">Тўловлар (QR кодлари ва bitcoin ёрдамида яратишлар: URI’лар) сўраш</translation>
     </message>
     <message>
         <source>Show the list of used sending addresses and labels</source>
-        <translation type="unfinished">Manzillar va yorliqlar ro'yxatini ko'rsatish</translation>
+        <translation type="unfinished">Фойдаланилган жўнатилган манзиллар ва ёрлиқлар рўйхатини кўрсатиш</translation>
     </message>
     <message>
         <source>Show the list of used receiving addresses and labels</source>
-        <translation type="unfinished">Qabul qilish manzillari va yorliqlar ro'yxatini ko'rsatish</translation>
+        <translation type="unfinished">Фойдаланилган қабул қилинган манзиллар ва ёрлиқлар рўйхатини кўрсатиш</translation>
     </message>
     <message>
         <source>&amp;Command-line options</source>
-        <translation type="unfinished">&amp;Command-line sozlamalari</translation>
+        <translation type="unfinished">&amp;Буйруқлар сатри мосламалари</translation>
     </message>
     <message numerus="yes">
         <source>Processed %n block(s) of transaction history.</source>
         <translation type="unfinished">
             <numerusform>Tranzaksiya tarixining %n blok(lar)i qayta ishlandi.</numerusform>
-            <numerusform />
         </translation>
     </message>
     <message>
         <source>%1 behind</source>
-        <translation type="unfinished">%1 yonida</translation>
+        <translation type="unfinished">%1 орқада</translation>
     </message>
     <message>
         <source>Catching up…</source>
@@ -616,27 +609,27 @@ Kirish faqat 'legacy' turidagi manzillar uchun.</translation>
     </message>
     <message>
         <source>Last received block was generated %1 ago.</source>
-        <translation type="unfinished">%1 oldin oxirgi marta blok qabul qilingan edi.</translation>
+        <translation type="unfinished">Сўнги қабул қилинган блок %1 олдин яратилган.</translation>
     </message>
     <message>
         <source>Transactions after this will not yet be visible.</source>
-        <translation type="unfinished">Shundan keyingi operatsiyalar hali ko'rinmaydi.</translation>
+        <translation type="unfinished">Бундан кейинги пул ўтказмалари кўринмайдиган бўлади.</translation>
     </message>
     <message>
         <source>Error</source>
-        <translation type="unfinished">Xatolik</translation>
+        <translation type="unfinished">Хатолик</translation>
     </message>
     <message>
         <source>Warning</source>
-        <translation type="unfinished">Eslatma</translation>
+        <translation type="unfinished">Диққат</translation>
     </message>
     <message>
         <source>Information</source>
-        <translation type="unfinished">Informatsiya</translation>
+        <translation type="unfinished">Маълумот</translation>
     </message>
     <message>
         <source>Up to date</source>
-        <translation type="unfinished">Hozirgi kunda</translation>
+        <translation type="unfinished">Янгиланган</translation>
     </message>
     <message>
         <source>Ctrl+Q</source>
@@ -773,7 +766,6 @@ Kirish faqat 'legacy' turidagi manzillar uchun.</translation>
         <extracomment>A substring of the tooltip.</extracomment>
         <translation type="unfinished">
             <numerusform>Bitkoin tarmog'iga %n aktiv ulanishlar.</numerusform>
-            <numerusform />
         </translation>
     </message>
     <message>
@@ -972,7 +964,7 @@ Kirish faqat 'legacy' turidagi manzillar uchun.</translation>
     </message>
     <message>
         <source>L&amp;ock unspent</source>
-        <translation type="unfinished">Sarflanmagan miqdorlarni q&amp;ulflash</translation>
+        <translation type="unfinished">Sarflanmagan tranzaksiyalarni q&amp;ulflash</translation>
     </message>
     <message>
         <source>&amp;Unlock unspent</source>
@@ -1008,7 +1000,7 @@ Kirish faqat 'legacy' turidagi manzillar uchun.</translation>
     </message>
     <message>
         <source>(no label)</source>
-        <translation type="unfinished">(Ёрлиқ мавжуд эмас)</translation>
+        <translation type="unfinished">(Yorliqlar mavjud emas)</translation>
     </message>
     <message>
         <source>change from %1 (%2)</source>
@@ -1067,6 +1059,10 @@ Kirish faqat 'legacy' turidagi manzillar uchun.</translation>
         <source>Migrate wallet</source>
         <translation type="unfinished">Hamyonni ko'chirish</translation>
     </message>
+    <message>
+        <source>Are you sure you wish to migrate the wallet &lt;i&gt;%1&lt;/i&gt;?</source>
+        <translation type="unfinished">Hamyonni ko'chirmoqchi ekanligingizga ishonchingiz komilmi?&lt;i&gt;%1&lt;/i&gt;</translation>
+    </message>
     <message>
         <source>Migrating the wallet will convert this wallet to one or more descriptor wallets. A new wallet backup will need to be made.
 If this wallet contains any watchonly scripts, a new wallet will be created which contains those watchonly scripts.
@@ -1099,6 +1095,16 @@ Migratsiya jarayoni ko'chirishdan oldin hamyonning zaxira nusxasini yaratadi. Us
         <source>Solvable but not watched scripts have been migrated to a new wallet named '%1'.</source>
         <translation type="unfinished">Yechish mumkin bo'lgan, lekin ko'rilmagan skriptlar nomli yangi hamyonga o'tkazildi%1</translation>
     </message>
+    <message>
+        <source>Restore Wallet</source>
+        <extracomment>Title of progress window which is displayed when wallets are being restored.</extracomment>
+        <translation type="unfinished">Hamyonni tiklash</translation>
+    </message>
+    <message>
+        <source>Restoring Wallet &lt;b&gt;%1&lt;/b&gt;…</source>
+        <extracomment>Descriptive text of the restore wallets progress window which indicates to the user that wallets are currently being restored.</extracomment>
+        <translation type="unfinished">Wallet tiklanmoqda&lt;b&gt;%1&lt;/b&gt;</translation>
+    </message>
     <message>
         <source>Migration failed</source>
         <translation type="unfinished">Migratsiya amalga oshmadi</translation>
@@ -1222,10 +1228,6 @@ Migratsiya jarayoni ko'chirishdan oldin hamyonning zaxira nusxasini yaratadi. Us
         <source>Disable Private Keys</source>
         <translation type="unfinished">Maxfiy kalitlarni faolsizlantirish</translation>
     </message>
-    <message>
-        <source>Make a blank wallet. Blank wallets do not initially have private keys or scripts. Private keys and addresses can be imported, or an HD seed can be set, at a later time.</source>
-        <translation type="unfinished">Bo'sh hamyon yaratish. Bo'sh hamyonlarga keyinchalik maxfiy kalitlar yoki manzillar import qilinishi mumkin, yana HD seedlar ham o'rnatilishi mumkin.</translation>
-    </message>
     <message>
         <source>Make Blank Wallet</source>
         <translation type="unfinished">Bo'sh hamyon yaratish</translation>
@@ -1402,21 +1404,18 @@ Migratsiya jarayoni ko'chirishdan oldin hamyonning zaxira nusxasini yaratadi. Us
         <source>%n GB of space available</source>
         <translation type="unfinished">
             <numerusform>%nGb bo'sh joy mavjud</numerusform>
-            <numerusform />
         </translation>
     </message>
     <message numerus="yes">
         <source>(of %n GB needed)</source>
         <translation type="unfinished">
             <numerusform>(%nGb kerak)</numerusform>
-            <numerusform />
         </translation>
     </message>
     <message numerus="yes">
         <source>(%n GB needed for full chain)</source>
         <translation type="unfinished">
             <numerusform>(To'liq zanjir uchun%n GB kerak)</numerusform>
-            <numerusform />
         </translation>
     </message>
     <message>
@@ -1436,7 +1435,6 @@ Migratsiya jarayoni ko'chirishdan oldin hamyonning zaxira nusxasini yaratadi. Us
         <extracomment>Explanatory text on the capability of the current prune target.</extracomment>
         <translation type="unfinished">
             <numerusform>(%n kun oldingi zaxira nusxalarini tiklash uchun etarli)</numerusform>
-            <numerusform />
         </translation>
     </message>
     <message>
@@ -1928,10 +1926,6 @@ Migratsiya jarayoni ko'chirishdan oldin hamyonning zaxira nusxasini yaratadi. Us
         <source>Close</source>
         <translation type="unfinished">Yopish</translation>
     </message>
-    <message>
-        <source>Failed to load transaction: %1</source>
-        <translation type="unfinished">Tranzaksiyani yuklab bo'lmadi: %1</translation>
-    </message>
     <message>
         <source>Failed to sign transaction: %1</source>
         <translation type="unfinished">Tranzaksiyani muhirlab bo'lmadi: %1</translation>
@@ -1940,6 +1934,12 @@ Migratsiya jarayoni ko'chirishdan oldin hamyonning zaxira nusxasini yaratadi. Us
         <source>Cannot sign inputs while wallet is locked.</source>
         <translation type="unfinished">Hamyon maʼlumotlarga imzo qoʻyib boʻlmaydi.</translation>
     </message>
+    <message numerus="yes">
+        <source>Signed %n input(s), but more signatures are still required.</source>
+        <translation type="unfinished">
+            <numerusform />
+        </translation>
+    </message>
     <message>
         <source>own address</source>
         <translation type="unfinished">ўз манзили</translation>
@@ -1948,6 +1948,12 @@ Migratsiya jarayoni ko'chirishdan oldin hamyonning zaxira nusxasini yaratadi. Us
         <source>or</source>
         <translation type="unfinished">ёки</translation>
     </message>
+    <message numerus="yes">
+        <source>Transaction has %n unsigned input(s).</source>
+        <translation type="unfinished">
+            <numerusform />
+        </translation>
+    </message>
     </context>
 <context>
     <name>PaymentServer</name>
@@ -2408,7 +2414,6 @@ Migratsiya jarayoni ko'chirishdan oldin hamyonning zaxira nusxasini yaratadi. Us
         <source>Estimated to begin confirmation within %n block(s).</source>
         <translation type="unfinished">
             <numerusform />
-            <numerusform />
         </translation>
     </message>
     <message>
@@ -2526,7 +2531,6 @@ Migratsiya jarayoni ko'chirishdan oldin hamyonning zaxira nusxasini yaratadi. Us
         <source>matures in %n more block(s)</source>
         <translation type="unfinished">
             <numerusform />
-            <numerusform />
         </translation>
     </message>
     <message>
@@ -2629,7 +2633,7 @@ Migratsiya jarayoni ko'chirishdan oldin hamyonning zaxira nusxasini yaratadi. Us
     </message>
     <message>
         <source>(no label)</source>
-        <translation type="unfinished">(Yorliqlar mavjud emas)</translation>
+        <translation type="unfinished">(Ёрлиқ мавжуд эмас)</translation>
     </message>
     <message>
         <source>Transaction status. Hover over this field to show number of confirmations.</source>
diff --git a/src/qt/locale/bitcoin_ve.ts b/src/qt/locale/bitcoin_ve.ts
index 13c565b8fc33..0b44596559ca 100644
--- a/src/qt/locale/bitcoin_ve.ts
+++ b/src/qt/locale/bitcoin_ve.ts
@@ -591,6 +591,21 @@ U ṱanganya ṱhoho (%1%)...</translation>
         <translation type="unfinished">Bvelaphanḓa</translation>
     </message>
     </context>
+<context>
+    <name>PSBTOperationsDialog</name>
+    <message numerus="yes">
+        <source>Signed %n input(s), but more signatures are still required.</source>
+        <translation type="unfinished">
+            <numerusform />
+        </translation>
+    </message>
+    <message numerus="yes">
+        <source>Transaction has %n unsigned input(s).</source>
+        <translation type="unfinished">
+            <numerusform />
+        </translation>
+    </message>
+    </context>
 <context>
     <name>PeerTableModel</name>
     <message>
diff --git a/src/qt/locale/bitcoin_yi.ts b/src/qt/locale/bitcoin_yi.ts
index 949ed17c2a33..476fd4474223 100644
--- a/src/qt/locale/bitcoin_yi.ts
+++ b/src/qt/locale/bitcoin_yi.ts
@@ -445,6 +445,23 @@ Signing is only possible with addresses of the type 'legacy'.</source>
         <translation type="unfinished">פאָרזעצן</translation>
     </message>
     </context>
+<context>
+    <name>PSBTOperationsDialog</name>
+    <message numerus="yes">
+        <source>Signed %n input(s), but more signatures are still required.</source>
+        <translation type="unfinished">
+            <numerusform />
+            <numerusform />
+        </translation>
+    </message>
+    <message numerus="yes">
+        <source>Transaction has %n unsigned input(s).</source>
+        <translation type="unfinished">
+            <numerusform />
+            <numerusform />
+        </translation>
+    </message>
+    </context>
 <context>
     <name>PeerTableModel</name>
     <message>
@@ -602,10 +619,6 @@ Unable to restore backup of wallet.</source>
         <source>Elliptic curve cryptography sanity check failure. %s is shutting down.</source>
         <translation type="unfinished">עליפטישער קרויִז קריפּטאָגראַפֿיע סאַנטי טשעק פעלער. 1%s איז שפּאַשנדיק אאָפֿן.</translation>
     </message>
-    <message>
-        <source>Error creating %s</source>
-        <translation type="unfinished">אור מיט שאפן 1%s</translation>
-    </message>
     <message>
         <source>Error initializing block database</source>
         <translation type="unfinished">אַראָר אין אריינשאַפֿן בלאָק דאַטאַבאַזע</translation>
@@ -614,10 +627,6 @@ Unable to restore backup of wallet.</source>
         <source>Error loading %s</source>
         <translation type="unfinished">ערראָר לאָאַדינג 1%s</translation>
     </message>
-    <message>
-        <source>Error loading %s: Private keys can only be disabled during creation</source>
-        <translation type="unfinished">גרייַזונג לאָדן 1%s: פּריוואַטע שליסלען קענען נאָר ווערן דיסאַבלירט בזמן שלאַפֿן</translation>
-    </message>
     <message>
         <source>Error loading %s: Wallet corrupted</source>
         <translation type="unfinished">Ошибка לאָדן 1%s: װאַלעט קראָופּטעד</translation>
@@ -734,10 +743,6 @@ Unable to restore backup of wallet.</source>
         <source>Error: database transaction cannot be executed for wallet %s</source>
         <translation type="unfinished">טעות: די דאטאבאזע טראַנזאַקשאַן קען נישט דורכגעפֿירט ווערן פֿאַר וואַלעט 1%s</translation>
     </message>
-    <message>
-        <source>Failed to connect best block (%s).</source>
-        <translation type="unfinished">ניט הצלחה צו פאַרבינדן דעם בעסטן בלאָק (1%s).</translation>
-    </message>
     <message>
         <source>Failed to disconnect block.</source>
         <translation type="unfinished">פֿאַרפאַלן צונויפֿרובֿן בלאָק</translation>
@@ -762,14 +767,6 @@ Unable to restore backup of wallet.</source>
         <source>Failed to write block.</source>
         <translation type="unfinished">געפאלן צו געשריבן בלוק</translation>
     </message>
-    <message>
-        <source>Failed to write to block index database.</source>
-        <translation type="unfinished">זיך נישט מצליח געווען צו שרייַבן צו בלאָק אינדעקס דאַטאַבאַסע.</translation>
-    </message>
-    <message>
-        <source>Failed to write to coin database.</source>
-        <translation type="unfinished">פאַרפאלן צו רעקאָרדירן אין דער קוינס דאַטאַבאַסע.</translation>
-    </message>
     <message>
         <source>Failed to write undo data.</source>
         <translation type="unfinished">איז נישט אויסגעקומען צו שרייבן צוריקצוקערן דאטן.</translation>
@@ -822,10 +819,6 @@ Unable to restore backup of wallet.</source>
         <source>Invalid P2P permission: '%s'</source>
         <translation type="unfinished">יוצרים פּ2פּ זכּות: '1%s'</translation>
     </message>
-    <message>
-        <source>Invalid amount for %s=&lt;amount&gt;: '%s' (must be at least %s)</source>
-        <translation type="unfinished">ניט גאָלדיגער בטראַכט פֿאַר 1%s=: '1%s' (מוז זײַן בּאַלד נישט ווייניקער ווי 1%s)</translation>
-    </message>
     <message>
         <source>Invalid amount for %s=&lt;amount&gt;: '%s'</source>
         <translation type="unfinished">ניט גילטיקע סך פאר %s=&lt;amount&gt;: '%s'</translation>
@@ -1018,10 +1011,6 @@ Unable to restore backup of wallet.</source>
         <source>This is the minimum transaction fee you pay on every transaction.</source>
         <translation type="unfinished">און דאָס איז דער מינימאַלער טראַנסאַקציאָנס-פיע וואָס איר באַצאָלט אויף יעדער טראַנסאַקציע.</translation>
     </message>
-    <message>
-        <source>This is the transaction fee you will pay if you send a transaction.</source>
-        <translation type="unfinished">אַזוי איז דער טראַנסאַקשאַן פייַעך וואָס איר וועט צאָלן אויב איר שיקט אַ טראַנסאַקשאַן.</translation>
-    </message>
     <message>
         <source>Transaction %s does not belong to this wallet</source>
         <translation type="unfinished">טראַנסאַקטיאָן 1%s איז נישט פֿאַר די וואָלט</translation>
diff --git a/src/qt/locale/bitcoin_yo.ts b/src/qt/locale/bitcoin_yo.ts
new file mode 100644
index 000000000000..85708581cee3
--- /dev/null
+++ b/src/qt/locale/bitcoin_yo.ts
@@ -0,0 +1,702 @@
+<TS version="2.1" language="yo">
+<context>
+    <name>AddressBookPage</name>
+    <message>
+        <source>Right-click to edit address or label</source>
+        <translation type="unfinished">Te botiini apa otun lati se atunse si adireesi tabi isaami</translation>
+    </message>
+    <message>
+        <source>Create a new address</source>
+        <translation type="unfinished">si adireesi tuntun</translation>
+    </message>
+    <message>
+        <source>&amp;New</source>
+        <translation type="unfinished">&amp;ati tuntun</translation>
+    </message>
+    <message>
+        <source>&amp;Copy</source>
+        <translation type="unfinished">daako</translation>
+    </message>
+    <message>
+        <source>C&amp;lose</source>
+        <translation type="unfinished">paade</translation>
+    </message>
+    <message>
+        <source>Delete the currently selected address from the list</source>
+        <translation type="unfinished">samukuro adiresi ti o sese sayan kuro ninu akojo</translation>
+    </message>
+    <message>
+        <source>Enter address or label to search</source>
+        <translation type="unfinished">Tẹ adirẹsi sii tàbí áámì làtí wáá</translation>
+    </message>
+    <message>
+        <source>Export the data in the current tab to a file</source>
+        <translation type="unfinished">Se òkèéé dátà ní tàábù lọwọlọwọ sí fáílì kán.</translation>
+    </message>
+    <message>
+        <source>&amp;Export</source>
+        <translation type="unfinished">ìkójáde</translation>
+    </message>
+    <message>
+        <source>&amp;Delete</source>
+        <translation type="unfinished">Pàrẹẹ</translation>
+    </message>
+    <message>
+        <source>Choose the address to send coins to</source>
+        <translation type="unfinished">Yan àdírẹ́sì láti fi owó àpólà ránṣẹ́ sí</translation>
+    </message>
+    <message>
+        <source>Choose the address to receive coins with</source>
+        <translation type="unfinished">Yan àdírẹ́sì láti gba owó àpólà</translation>
+    </message>
+    <message>
+        <source>C&amp;hoose</source>
+        <translation type="unfinished">yan</translation>
+    </message>
+    <message>
+        <source>These are your Bitcoin addresses for sending payments. Always check the amount and the receiving address before sending coins.</source>
+        <translation type="unfinished">Àwọn àdírẹ́sì Bitcoin rẹ fún fífi owó àpólà ránṣẹ́ ni wọ̀nyí. Máa ṣàyẹ̀wò iye owó àti àdírẹ́sì agbàwọlé dáadáa kí o tó ránṣẹ́.</translation>
+    </message>
+    <message>
+        <source>These are your Bitcoin addresses for receiving payments. Use the 'Create new receiving address' button in the receive tab to create new addresses.
+Signing is only possible with addresses of the type 'legacy'.</source>
+        <translation type="unfinished">Àwọn àdírẹ́sì Bitcoin rẹ fún gbigba owó àpólà ni wọ̀nyí. Lo bọ́tìnì ‘Ṣẹ̀dá àdírẹ́sì agbàwọlé tuntun’ nínú taabu gbigba láti ṣẹ̀dá àwọn àdírẹ́sì tuntun
+Fífọwọ́sowọ́pọ̀ jẹ́ ẹni pé ó ṣeé ṣe pẹ̀lú àwọn àdírẹ́sì irú ‘legacy’ nìkan</translation>
+    </message>
+    <message>
+        <source>&amp;Copy Address</source>
+        <translation type="unfinished">Ṣàfọwọ́kọ Àdírẹ́sì</translation>
+    </message>
+    <message>
+        <source>Copy &amp;Label</source>
+        <translation type="unfinished">Ṣàfọwọ́kọ Àkọlé</translation>
+    </message>
+    <message>
+        <source>&amp;Edit</source>
+        <translation type="unfinished">Ṣàtúnṣe</translation>
+    </message>
+    <message>
+        <source>Export Address List</source>
+        <translation type="unfinished">Ìkójáde Àtòjọ Àdírẹ́sì</translation>
+    </message>
+    <message>
+        <source>Comma separated file</source>
+        <extracomment>Expanded name of the CSV file format. See: https://en.wikipedia.org/wiki/Comma-separated_values.</extracomment>
+        <translation type="unfinished">Fáìlì tí a pín pẹ̀lú àmì ìdámẹ́ta</translation>
+    </message>
+    <message>
+        <source>There was an error trying to save the address list to %1. Please try again.</source>
+        <extracomment>An error message. %1 is a stand-in argument for the name of the file we attempted to save to.</extracomment>
+        <translation type="unfinished">Àṣìṣe kan wáyé nígbà tí a ń gbìyànjú láti fipamọ́ àtòjọ àdírẹ́sì sí %1. Jọ̀wọ́, gbìyànjú lẹ́ẹ̀kansi</translation>
+    </message>
+    <message>
+        <source>Sending addresses - %1</source>
+        <translation type="unfinished">fífi àwọn àdírẹ́sì ránṣẹ́-%1</translation>
+    </message>
+    <message>
+        <source>Receiving addresses - %1</source>
+        <translation type="unfinished">gbà àwọn àdírẹ́sì - %1</translation>
+    </message>
+    <message>
+        <source>Exporting Failed</source>
+        <translation type="unfinished">Ìkójáde Kùnà</translation>
+    </message>
+</context>
+<context>
+    <name>AddressTableModel</name>
+    <message>
+        <source>Label</source>
+        <translation type="unfinished">Àkọlé</translation>
+    </message>
+    <message>
+        <source>Address</source>
+        <translation type="unfinished">àdírẹ́sì</translation>
+    </message>
+    <message>
+        <source>(no label)</source>
+        <translation type="unfinished">kòsí àkọlé</translation>
+    </message>
+</context>
+<context>
+    <name>AskPassphraseDialog</name>
+    <message>
+        <source>Passphrase Dialog</source>
+        <translation type="unfinished">Férèsé Ọ̀rọ̀-ìfàṣẹsí</translation>
+    </message>
+    <message>
+        <source>Enter passphrase</source>
+        <translation type="unfinished">Tẹ ọ̀rọ̀-ìfàṣẹsí</translation>
+    </message>
+    <message>
+        <source>New passphrase</source>
+        <translation type="unfinished">ọ̀rọ̀-ìfàṣẹsí tuntun</translation>
+    </message>
+    <message>
+        <source>Repeat new passphrase</source>
+        <translation type="unfinished">Tún ọ̀rọ̀-ìfàṣẹsí tuntun ṣe</translation>
+    </message>
+    <message>
+        <source>Show passphrase</source>
+        <translation type="unfinished">Fi ọ̀rọ̀-ìfàṣẹsí hàn</translation>
+    </message>
+    <message>
+        <source>Encrypt wallet</source>
+        <translation type="unfinished">Ṣìfúná apò-owó</translation>
+    </message>
+    <message>
+        <source>This operation needs your wallet passphrase to unlock the wallet.</source>
+        <translation type="unfinished">Ìṣe yìí nílò ọ̀rọ̀-ìfàṣẹsí apò-owó rẹ láti ṣí apò-owó náà</translation>
+    </message>
+    <message>
+        <source>Unlock wallet</source>
+        <translation type="unfinished">Ṣí apò-owó</translation>
+    </message>
+    <message>
+        <source>Change passphrase</source>
+        <translation type="unfinished">Ṣàtúnṣe ọ̀rọ̀-ìfàṣẹsí</translation>
+    </message>
+    <message>
+        <source>Confirm wallet encryption</source>
+        <translation type="unfinished">Ṣàfihàn ìdánimọ̀ ìṣìfúná apò-owó</translation>
+    </message>
+    <message>
+        <source>Warning: If you encrypt your wallet and lose your passphrase, you will &lt;b&gt;LOSE ALL OF YOUR BITCOINS&lt;/b&gt;!</source>
+        <translation type="unfinished">Ìkìlọ̀: Bí o bá ṣìfúná apò-owó rẹ tí o sì pàdánù ọ̀rọ̀-ìfàṣẹsí rẹ, ìwọ yóò&lt;b&gt;ìwọ yóò sọnù gbogbo àwọn Bitcoin rẹ&lt;/b&gt;!</translation>
+    </message>
+    <message>
+        <source>Are you sure you wish to encrypt your wallet?</source>
+        <translation type="unfinished">Ṣé o dájú pé o fẹ́ ṣìfúná apò-owó rẹ?</translation>
+    </message>
+    <message>
+        <source>Wallet encrypted</source>
+        <translation type="unfinished">Apò-owó ti ṣìfúná</translation>
+    </message>
+    <message>
+        <source>Enter the new passphrase for the wallet.&lt;br/&gt;Please use a passphrase of &lt;b&gt;ten or more random characters&lt;/b&gt;, or &lt;b&gt;eight or more words&lt;/b&gt;.</source>
+        <translation type="unfinished">Tẹ ọ̀rọ̀-ìfàṣẹsí tuntun fún apò-owó náà&lt;br/&gt;Jọ̀wọ́ lo ọ̀rọ̀-ìfàṣẹsí tó ní&lt;b&gt;àmì àìtẹ̀síwájú mẹ́wàá tàbí ju bẹ́ẹ̀ lọ&lt;/b&gt;, tàbí &lt;b&gt;ọ̀rọ̀ mẹ́jọ tàbí ju bẹ́ẹ̀ lọ&lt;/b&gt;.</translation>
+    </message>
+    <message>
+        <source>Enter the old passphrase and new passphrase for the wallet.</source>
+        <translation type="unfinished">Tẹ ọ̀rọ̀-ìfàṣẹsí atijọ́ àti ọ̀rọ̀-ìfàṣẹsí tuntun fún apò-owó náà</translation>
+    </message>
+    <message>
+        <source>Continue</source>
+        <translation type="unfinished">Tẹ̀síwájú</translation>
+    </message>
+    <message>
+        <source>Back</source>
+        <translation type="unfinished">Padà</translation>
+    </message>
+    <message>
+        <source>Remember that encrypting your wallet cannot fully protect your bitcoins from being stolen by malware infecting your computer.</source>
+        <translation type="unfinished">Rántí pé ṣíìfúná apò-owó rẹ kì í lè dáàbò bo àwọn Bitcoin rẹ pátápátá kúrò lọ́wọ́ ìjìnlẹ̀ olè sọ́fitiwia búburú tó bá kó kọ̀mpútà rẹ</translation>
+    </message>
+    <message>
+        <source>Wallet to be encrypted</source>
+        <translation type="unfinished">Apò-owó tí yóò ṣìfúná</translation>
+    </message>
+    <message>
+        <source>Your wallet is about to be encrypted. </source>
+        <translation type="unfinished">Apò-owó rẹ̀ ti máa ṣìfúná lọ́jọ́gbọ̀n.</translation>
+    </message>
+    <message>
+        <source>Your wallet is now encrypted. </source>
+        <translation type="unfinished">Apò-owó rẹ̀ ti ṣìfúná báyìí.</translation>
+    </message>
+    <message>
+        <source>IMPORTANT: Any previous backups you have made of your wallet file should be replaced with the newly generated, encrypted wallet file. For security reasons, previous backups of the unencrypted wallet file will become useless as soon as you start using the new, encrypted wallet.</source>
+        <translation type="unfinished">PÀTÀKÌ: Ohun gbogbo àfipamọ́ (backup) tí o ti ṣe tẹ́lẹ̀ fún fáìlì apò-owó rẹ gbọ́dọ̀ rọ́pò pẹ̀lú fáìlì tuntun tí a ṣẹ̀dá, tí a sì ti ṣìfúná. Fún ààbò, àwọn àfipamọ́ fáìlì apò-owó tí kò tíì ṣìfúná yóò di asán ní kánkán lẹ́yìn tí o bá bẹ̀rẹ̀ sí í lo apò-owó tuntun tí a ti ṣìfúná.</translation>
+    </message>
+    <message>
+        <source>Wallet encryption failed</source>
+        <translation type="unfinished">Ṣíṣìfúná apò-owó kò ṣàṣeyọrí</translation>
+    </message>
+    <message>
+        <source>Wallet encryption failed due to an internal error. Your wallet was not encrypted.</source>
+        <translation type="unfinished">Ìṣìfúná apò-owó ṣìṣe kò ṣàṣeyọrí nítorí àṣìṣe inú eto. Apò-owó rẹ kò tíì jẹ́ kí o ṣìfúná</translation>
+    </message>
+    <message>
+        <source>The supplied passphrases do not match.</source>
+        <translation type="unfinished">Àwọn ọ̀rọ̀-ìfàṣẹsí tí a fi ránṣẹ́ kò bá ara wọn mu</translation>
+    </message>
+    <message>
+        <source>Wallet unlock failed</source>
+        <translation type="unfinished">Ṣí apò-owó kò ṣàṣeyọrí</translation>
+    </message>
+    <message>
+        <source>The passphrase entered for the wallet decryption was incorrect.</source>
+        <translation type="unfinished">Ọ̀rọ̀-ìfàṣẹsí tí o tẹ̀ sílẹ̀ fún ṣiṣí apò-owó jẹ́ aṣìṣe</translation>
+    </message>
+    <message>
+        <source>The passphrase entered for the wallet decryption is incorrect. It contains a null character (ie - a zero byte). If the passphrase was set with a version of this software prior to 25.0, please try again with only the characters up to — but not including — the first null character. If this is successful, please set a new passphrase to avoid this issue in the future.</source>
+        <translation type="unfinished">Ọ̀rọ̀-ìfàṣẹsí tí o tẹ̀ sílẹ̀ fún ṣiṣí apò-owó jẹ́ aṣìṣe. Ó ní ààmì ofo (ie – ààmì zero byte). Bí a bá ti ṣètò ọ̀rọ̀-ìfàṣẹsí yìí pẹ̀lú ẹ̀dá sọ́fitiwia yìí tó wáyé ṣáájú 25.0, jọ̀wọ́ gbìyànjú lẹ́ẹ̀kansi pẹ̀lú àwọn àmì tó wà títí dé — ṣùgbọ́n má kà ààmì ofo àkọ́kọ́. Bí èyí bá ṣàṣeyọrí, jọ̀wọ́ ṣètò ọ̀rọ̀-ìfàṣẹsí tuntun láti yá àṣìṣe yìí kúrò ní ọjọ́ iwájú.</translation>
+    </message>
+    <message>
+        <source>Wallet passphrase was successfully changed.</source>
+        <translation type="unfinished">Ọ̀rọ̀-ìfàṣẹsí apò-owó ti yí padà ní àṣeyọrí</translation>
+    </message>
+    <message>
+        <source>Passphrase change failed</source>
+        <translation type="unfinished">Ìyípadà ọ̀rọ̀-ìfàṣẹsí kò ṣàṣeyọrí</translation>
+    </message>
+    <message>
+        <source>The old passphrase entered for the wallet decryption is incorrect. It contains a null character (ie - a zero byte). If the passphrase was set with a version of this software prior to 25.0, please try again with only the characters up to — but not including — the first null character.</source>
+        <translation type="unfinished">Ọ̀rọ̀-ìfàṣẹsí atijọ́ tí o tẹ̀ sílẹ̀ fún ṣiṣí apò-owó jẹ́ aṣìṣe. Ó ní ààmì ofo (ie – ààmì zero byte). Bí a bá ti ṣètò ọ̀rọ̀-ìfàṣẹsí yìí pẹ̀lú ẹ̀dá sọ́fitiwia tó wáyé ṣáájú 25.0, jọ̀wọ́ gbìyànjú lẹ́ẹ̀kansi pẹ̀lú àwọn àmì tó wà títí dé — ṣùgbọ́n má kà ààmì ofo àkọ́kọ́.</translation>
+    </message>
+    <message>
+        <source>Warning: The Caps Lock key is on!</source>
+        <translation type="unfinished">Ìkìlọ̀: Bọtìnì Caps Lock ti ṣiṣẹ́</translation>
+    </message>
+</context>
+<context>
+    <name>BanTableModel</name>
+    <message>
+        <source>IP/Netmask</source>
+        <translation type="unfinished">IP/Àgbo-ìnà-nẹ́tìwọ́ọ̀kì</translation>
+    </message>
+    <message>
+        <source>Banned Until</source>
+        <translation type="unfinished">Ìdènà títí di</translation>
+    </message>
+</context>
+<context>
+    <name>BitcoinApplication</name>
+    <message>
+        <source>Settings file %1 might be corrupt or invalid.</source>
+        <translation type="unfinished">Fáìlì ìṣètò%1lè ti bàjẹ́ tàbí kò tọ́́</translation>
+    </message>
+    <message>
+        <source>Runaway exception</source>
+        <translation type="unfinished">Àṣìṣe tó sá lọ́wọ́</translation>
+    </message>
+    <message>
+        <source>A fatal error occurred. %1 can no longer continue safely and will quit.</source>
+        <translation type="unfinished">Àṣìṣe pàtàkì kan wáyé. %1 Kò lè tẹ̀síwájú láìsí ewu mọ́, a ó sì dá ìṣèjọba dúró.</translation>
+    </message>
+    <message>
+        <source>Internal error</source>
+        <translation type="unfinished">Àṣìṣe inú eto</translation>
+    </message>
+    <message>
+        <source>An internal error occurred. %1 will attempt to continue safely. This is an unexpected bug which can be reported as described below.</source>
+        <translation type="unfinished">Àṣìṣe inú eto kan wáyé.%1 A máa gbìyànjú láti tẹ̀síwájú láìsí ewu. Èyí jẹ́ kokoro àìmọ̀tótó tí ó lè jẹ́ pé a lè rọ́pọ̀ rẹ gẹ́gẹ́ bí a ṣe ṣàlàyé ní isalẹ.</translation>
+    </message>
+</context>
+<context>
+    <name>QObject</name>
+    <message>
+        <source>Do you want to reset settings to default values, or to abort without making changes?</source>
+        <extracomment>Explanatory text shown on startup when the settings file cannot be read. Prompts user to make a choice between resetting or aborting.</extracomment>
+        <translation type="unfinished">Ṣé o fẹ́ tún ìṣètò padà sí àwọn iye aiyipada, tàbí dá a dúró láì ṣe àtúnṣe kankan?</translation>
+    </message>
+    <message>
+        <source>A fatal error occurred. Check that settings file is writable, or try running with -nosettings.</source>
+        <extracomment>Explanatory text shown on startup when the settings file could not be written. Prompts user to check that we have the ability to write to the file. Explains that the user has the option of running without a settings file.</extracomment>
+        <translation type="unfinished">Àṣìṣe pàtàkì kan wáyé. Ṣàyẹ̀wò pé fáìlì ìṣètò lè kọ́wé, tàbí gbìyànjú láti ṣiṣẹ́ pẹ̀lú - Kò sí ìṣètò.</translation>
+    </message>
+    <message>
+        <source>Error: %1</source>
+        <translation type="unfinished">Àṣìṣe: %1</translation>
+    </message>
+    <message>
+        <source>%1 didn't yet exit safely…</source>
+        <translation type="unfinished">%1 Kò tíì jáde láìsí ààbò…</translation>
+    </message>
+    <message numerus="yes">
+        <source>%n second(s)</source>
+        <translation type="unfinished">
+            <numerusform />
+        </translation>
+    </message>
+    <message numerus="yes">
+        <source>%n minute(s)</source>
+        <translation type="unfinished">
+            <numerusform />
+        </translation>
+    </message>
+    <message numerus="yes">
+        <source>%n hour(s)</source>
+        <translation type="unfinished">
+            <numerusform />
+        </translation>
+    </message>
+    <message numerus="yes">
+        <source>%n day(s)</source>
+        <translation type="unfinished">
+            <numerusform />
+        </translation>
+    </message>
+    <message numerus="yes">
+        <source>%n week(s)</source>
+        <translation type="unfinished">
+            <numerusform />
+        </translation>
+    </message>
+    <message numerus="yes">
+        <source>%n year(s)</source>
+        <translation type="unfinished">
+            <numerusform />
+        </translation>
+    </message>
+    </context>
+<context>
+    <name>BitcoinGUI</name>
+    <message>
+        <source>&amp;Overview</source>
+        <translation type="unfinished">Àkótán</translation>
+    </message>
+    <message>
+        <source>Show general overview of wallet</source>
+        <translation type="unfinished">Fihàn àkótán gbogbogbò ti apò-owó</translation>
+    </message>
+    <message>
+        <source>&amp;Transactions</source>
+        <translation type="unfinished">Àwọn ìṣàkóso owó</translation>
+    </message>
+    <message>
+        <source>Browse transaction history</source>
+        <translation type="unfinished">Ṣàwárí ìtàn ìṣàkóso owó</translation>
+    </message>
+    <message>
+        <source>E&amp;xit</source>
+        <translation type="unfinished">Jáde</translation>
+    </message>
+    <message>
+        <source>Quit application</source>
+        <translation type="unfinished">Dákẹ́ àpèsè náà</translation>
+    </message>
+    <message>
+        <source>&amp;About %1</source>
+        <translation type="unfinished">Nípa %1</translation>
+    </message>
+    <message>
+        <source>Show information about %1</source>
+        <translation type="unfinished">Fihàn ìmọ̀ nípa %1</translation>
+    </message>
+    <message>
+        <source>About &amp;Qt</source>
+        <translation type="unfinished">Nípa Qt</translation>
+    </message>
+    <message>
+        <source>Show information about Qt</source>
+        <translation type="unfinished">Fihàn ìmọ̀ nípa Qt</translation>
+    </message>
+    <message>
+        <source>Modify configuration options for %1</source>
+        <translation type="unfinished">Ṣàtúnṣe àwọn àṣàyàn ìṣètò fún %1</translation>
+    </message>
+    <message>
+        <source>Create a new wallet</source>
+        <translation type="unfinished">Ṣẹ́da apò-owó tuntun</translation>
+    </message>
+    <message>
+        <source>&amp;Minimize</source>
+        <translation type="unfinished">Dín kékè</translation>
+    </message>
+    <message>
+        <source>Wallet:</source>
+        <translation type="unfinished">Apò-owó</translation>
+    </message>
+    <message>
+        <source>Network activity disabled.</source>
+        <extracomment>A substring of the tooltip.</extracomment>
+        <translation type="unfinished">Iṣẹ́ nẹ́tíwọ́ọ̀kì ti wa ní pípà</translation>
+    </message>
+    <message>
+        <source>Send coins to a Bitcoin address</source>
+        <translation type="unfinished">Rán owó kóìn sí àdírẹ́sì Bitcoin kan</translation>
+    </message>
+    <message>
+        <source>&amp;Send</source>
+        <translation type="unfinished">Gba</translation>
+    </message>
+    <message>
+        <source>&amp;Receive</source>
+        <translation type="unfinished">Fifun ni</translation>
+    </message>
+    <message>
+        <source>&amp;Options…</source>
+        <translation type="unfinished">Àwọn àṣàyàn</translation>
+    </message>
+    <message>
+        <source>&amp;Verify message…</source>
+        <translation type="unfinished">Ṣàyẹ̀wò ìfiranṣẹ</translation>
+    </message>
+    <message>
+        <source>Open &amp;URI…</source>
+        <translation type="unfinished">Sí URL</translation>
+    </message>
+    <message>
+        <source>Close Wallet…</source>
+        <translation type="unfinished">Sí àpò ìpamọ́</translation>
+    </message>
+    <message>
+        <source>Create Wallet…</source>
+        <translation type="unfinished">Sí àpò ìpamọ́</translation>
+    </message>
+    <message>
+        <source>Close All Wallets…</source>
+        <translation type="unfinished">Pa gbogbo àpò ìpamọ́ de</translation>
+    </message>
+    <message>
+        <source>&amp;File</source>
+        <translation type="unfinished">Fáìlì</translation>
+    </message>
+    <message>
+        <source>&amp;Settings</source>
+        <translation type="unfinished">Àwọn ètò</translation>
+    </message>
+    <message>
+        <source>&amp;Help</source>
+        <translation type="unfinished">Ìrànlọ́wọ́</translation>
+    </message>
+    <message numerus="yes">
+        <source>Processed %n block(s) of transaction history.</source>
+        <translation type="unfinished">
+            <numerusform />
+        </translation>
+    </message>
+    <message>
+        <source>Open Wallet</source>
+        <translation type="unfinished">sii apamowo</translation>
+    </message>
+    <message>
+        <source>Open a wallet</source>
+        <translation type="unfinished">sii apamowo</translation>
+    </message>
+    <message>
+        <source>Close wallet</source>
+        <translation type="unfinished">Ti Apamowo</translation>
+    </message>
+    <message numerus="yes">
+        <source>%n active connection(s) to Bitcoin network.</source>
+        <extracomment>A substring of the tooltip.</extracomment>
+        <translation type="unfinished">
+            <numerusform />
+        </translation>
+    </message>
+    <message>
+        <source>Error: %1</source>
+        <translation type="unfinished">Àṣìṣe: %1</translation>
+    </message>
+    </context>
+<context>
+    <name>CoinControlDialog</name>
+    <message>
+        <source>Date</source>
+        <translation type="unfinished">Ojo</translation>
+    </message>
+    <message>
+        <source>(no label)</source>
+        <translation type="unfinished">kòsí àkọlé</translation>
+    </message>
+    </context>
+<context>
+    <name>OpenWalletActivity</name>
+    <message>
+        <source>Open Wallet</source>
+        <extracomment>Title of window indicating the progress of opening of a wallet.</extracomment>
+        <translation type="unfinished">sii apamowo</translation>
+    </message>
+    </context>
+<context>
+    <name>WalletController</name>
+    <message>
+        <source>Close wallet</source>
+        <translation type="unfinished">Ti Apamowo</translation>
+    </message>
+    </context>
+<context>
+    <name>FreespaceChecker</name>
+    <message>
+        <source>name</source>
+        <translation type="unfinished">oruko</translation>
+    </message>
+    </context>
+<context>
+    <name>Intro</name>
+    <message>
+        <source>Welcome</source>
+        <translation type="unfinished">Ka bo</translation>
+    </message>
+    <message numerus="yes">
+        <source>%n GB of space available</source>
+        <translation type="unfinished">
+            <numerusform />
+        </translation>
+    </message>
+    <message numerus="yes">
+        <source>(of %n GB needed)</source>
+        <translation type="unfinished">
+            <numerusform />
+        </translation>
+    </message>
+    <message numerus="yes">
+        <source>(%n GB needed for full chain)</source>
+        <translation type="unfinished">
+            <numerusform />
+        </translation>
+    </message>
+    <message numerus="yes">
+        <source>(sufficient to restore backups %n day(s) old)</source>
+        <extracomment>Explanatory text on the capability of the current prune target.</extracomment>
+        <translation type="unfinished">
+            <numerusform />
+        </translation>
+    </message>
+    </context>
+<context>
+    <name>OptionsDialog</name>
+    <message>
+        <source>&amp;OK</source>
+        <translation type="unfinished">&amp;o da</translation>
+    </message>
+    <message>
+        <source>Continue</source>
+        <translation type="unfinished">Tẹ̀síwájú</translation>
+    </message>
+    </context>
+<context>
+    <name>PSBTOperationsDialog</name>
+    <message numerus="yes">
+        <source>Signed %n input(s), but more signatures are still required.</source>
+        <translation type="unfinished">
+            <numerusform />
+        </translation>
+    </message>
+    <message numerus="yes">
+        <source>Transaction has %n unsigned input(s).</source>
+        <translation type="unfinished">
+            <numerusform />
+        </translation>
+    </message>
+    </context>
+<context>
+    <name>PeerTableModel</name>
+    <message>
+        <source>Address</source>
+        <extracomment>Title of Peers Table column which contains the IP/Onion/I2P address of the connected peer.</extracomment>
+        <translation type="unfinished">àdírẹ́sì</translation>
+    </message>
+    </context>
+<context>
+    <name>RPCConsole</name>
+    <message>
+        <source>Name</source>
+        <translation type="unfinished">Oruko</translation>
+    </message>
+    <message>
+        <source>1 &amp;year</source>
+        <translation type="unfinished">okan ati &amp;odun</translation>
+    </message>
+    </context>
+<context>
+    <name>ReceiveRequestDialog</name>
+    <message>
+        <source>Wallet:</source>
+        <translation type="unfinished">Apò-owó</translation>
+    </message>
+    </context>
+<context>
+    <name>RecentRequestsTableModel</name>
+    <message>
+        <source>Date</source>
+        <translation type="unfinished">Ojo</translation>
+    </message>
+    <message>
+        <source>Label</source>
+        <translation type="unfinished">Àkọlé</translation>
+    </message>
+    <message>
+        <source>(no label)</source>
+        <translation type="unfinished">kòsí àkọlé</translation>
+    </message>
+    </context>
+<context>
+    <name>SendCoinsDialog</name>
+    <message numerus="yes">
+        <source>Estimated to begin confirmation within %n block(s).</source>
+        <translation type="unfinished">
+            <numerusform />
+        </translation>
+    </message>
+    <message>
+        <source>(no label)</source>
+        <translation type="unfinished">kòsí àkọlé</translation>
+    </message>
+</context>
+<context>
+    <name>TransactionDesc</name>
+    <message>
+        <source>Date</source>
+        <translation type="unfinished">Ojo</translation>
+    </message>
+    <message numerus="yes">
+        <source>matures in %n more block(s)</source>
+        <translation type="unfinished">
+            <numerusform />
+        </translation>
+    </message>
+    </context>
+<context>
+    <name>TransactionTableModel</name>
+    <message>
+        <source>Date</source>
+        <translation type="unfinished">Ojo</translation>
+    </message>
+    <message>
+        <source>Label</source>
+        <translation type="unfinished">Àkọlé</translation>
+    </message>
+    <message>
+        <source>(no label)</source>
+        <translation type="unfinished">kòsí àkọlé</translation>
+    </message>
+    </context>
+<context>
+    <name>TransactionView</name>
+    <message>
+        <source>This year</source>
+        <translation type="unfinished">Odun yi</translation>
+    </message>
+    <message>
+        <source>Comma separated file</source>
+        <extracomment>Expanded name of the CSV file format. See: https://en.wikipedia.org/wiki/Comma-separated_values.</extracomment>
+        <translation type="unfinished">Fáìlì tí a pín pẹ̀lú àmì ìdámẹ́ta</translation>
+    </message>
+    <message>
+        <source>Date</source>
+        <translation type="unfinished">Ojo</translation>
+    </message>
+    <message>
+        <source>Label</source>
+        <translation type="unfinished">Àkọlé</translation>
+    </message>
+    <message>
+        <source>Address</source>
+        <translation type="unfinished">àdírẹ́sì</translation>
+    </message>
+    <message>
+        <source>Exporting Failed</source>
+        <translation type="unfinished">Ìkójáde Kùnà</translation>
+    </message>
+    </context>
+<context>
+    <name>WalletFrame</name>
+    <message>
+        <source>Create a new wallet</source>
+        <translation type="unfinished">Ṣẹ́da apò-owó tuntun</translation>
+    </message>
+    </context>
+<context>
+    <name>WalletView</name>
+    <message>
+        <source>&amp;Export</source>
+        <translation type="unfinished">ìkójáde</translation>
+    </message>
+    <message>
+        <source>Export the data in the current tab to a file</source>
+        <translation type="unfinished">Se òkèéé dátà ní tàábù lọwọlọwọ sí fáílì kán.</translation>
+    </message>
+    </context>
+</TS>
\ No newline at end of file
diff --git a/src/qt/locale/bitcoin_yue.ts b/src/qt/locale/bitcoin_yue.ts
index e26d49de7d20..927a12dbbc06 100644
--- a/src/qt/locale/bitcoin_yue.ts
+++ b/src/qt/locale/bitcoin_yue.ts
@@ -321,11 +321,29 @@ Signing is only possible with addresses of the type 'legacy'.</source>
         <source>Amount</source>
         <translation type="unfinished">金额</translation>
     </message>
+    <message>
+        <source>Enter a Bitcoin address (e.g. %1)</source>
+        <translation type="unfinished">请输入一个比特币地址 (例如 %1)</translation>
+    </message>
+    <message>
+        <source>Unroutable</source>
+        <translation type="unfinished">不可路由</translation>
+    </message>
     <message>
         <source>Inbound</source>
         <extracomment>An inbound connection from a peer. An inbound connection is a connection initiated by a peer.</extracomment>
         <translation type="unfinished">進來</translation>
     </message>
+    <message>
+        <source>Outbound</source>
+        <extracomment>An outbound connection to a peer. An outbound connection is a connection initiated by us.</extracomment>
+        <translation type="unfinished">傳出</translation>
+    </message>
+    <message>
+        <source>Full Relay</source>
+        <extracomment>Peer connection type that relays all network information.</extracomment>
+        <translation type="unfinished">完整转发</translation>
+    </message>
     <message>
         <source>Block Relay</source>
         <extracomment>Peer connection type that relays network information about blocks and not transactions or addresses.</extracomment>
@@ -336,6 +354,16 @@ Signing is only possible with addresses of the type 'legacy'.</source>
         <extracomment>Peer connection type established manually through one of several methods.</extracomment>
         <translation type="unfinished">手册</translation>
     </message>
+    <message>
+        <source>Feeler</source>
+        <extracomment>Short-lived peer connection type that tests the aliveness of known addresses.</extracomment>
+        <translation type="unfinished">触须</translation>
+    </message>
+    <message>
+        <source>Address Fetch</source>
+        <extracomment>Short-lived peer connection type that solicits known addresses from a peer.</extracomment>
+        <translation type="unfinished">地址取回</translation>
+    </message>
     <message>
         <source>%1 h</source>
         <translation type="unfinished">%1 小时</translation>
@@ -548,10 +576,6 @@ Signing is only possible with addresses of the type 'legacy'.</source>
         <source>Processing blocks on disk…</source>
         <translation type="unfinished">处理磁盘上的区块...</translation>
     </message>
-    <message>
-        <source>Connecting to peers…</source>
-        <translation type="unfinished">连接到节点...</translation>
-    </message>
     <message>
         <source>Request payments (generates QR codes and bitcoin: URIs)</source>
         <translation type="unfinished">请求支付 (生成二维码和 bitcoin: URI)</translation>
@@ -562,7 +586,7 @@ Signing is only possible with addresses of the type 'legacy'.</source>
     </message>
     <message>
         <source>Show the list of used receiving addresses and labels</source>
-        <translation type="unfinished">显示用过的收款地址和标签的列表</translation>
+        <translation type="unfinished">顯示已使用過的接收地址和標籤清單</translation>
     </message>
     <message>
         <source>&amp;Command-line options</source>
@@ -582,10 +606,6 @@ Signing is only possible with addresses of the type 'legacy'.</source>
         <source>Catching up…</source>
         <translation type="unfinished">正在追上进度...</translation>
     </message>
-    <message>
-        <source>Last received block was generated %1 ago.</source>
-        <translation type="unfinished">最新收到的区块产生于 %1 之前。</translation>
-    </message>
     <message>
         <source>Transactions after this will not yet be visible.</source>
         <translation type="unfinished">在此之后的交易尚不可见</translation>
@@ -594,18 +614,6 @@ Signing is only possible with addresses of the type 'legacy'.</source>
         <source>Error</source>
         <translation type="unfinished">错误</translation>
     </message>
-    <message>
-        <source>Warning</source>
-        <translation type="unfinished">警告</translation>
-    </message>
-    <message>
-        <source>Information</source>
-        <translation type="unfinished">信息</translation>
-    </message>
-    <message>
-        <source>Up to date</source>
-        <translation type="unfinished">已是最新</translation>
-    </message>
     <message>
         <source>Load Partially Signed Bitcoin Transaction</source>
         <translation type="unfinished">加载部分签名比特币交易（PSBT）</translation>
@@ -706,7 +714,24 @@ Signing is only possible with addresses of the type 'legacy'.</source>
     <message>
         <source>Wallet Name</source>
         <extracomment>Label of the input field where the name of the wallet is entered.</extracomment>
-        <translation type="unfinished">钱包名称</translation>
+        <translation type="unfinished">錢包名稱</translation>
+    </message>
+    <message>
+        <source>Invalid Wallet Name</source>
+        <translation type="unfinished">無效的錢包名稱</translation>
+    </message>
+    <message>
+        <source>Wallet name cannot be empty</source>
+        <translation type="unfinished">錢包名稱不能為空白</translation>
+    </message>
+    <message>
+        <source>Restore and Migrate Wallet Backup</source>
+        <translation type="unfinished">恢復及遷移錢包備份</translation>
+    </message>
+    <message>
+        <source>Restore and Migrate Wallet</source>
+        <extracomment>Title of pop-up window shown when the user is attempting to restore a wallet.</extracomment>
+        <translation type="unfinished">恢復及遷移錢包</translation>
     </message>
     <message>
         <source>&amp;Window</source>
@@ -879,6 +904,10 @@ Signing is only possible with addresses of the type 'legacy'.</source>
         <source>Received with address</source>
         <translation type="unfinished">收款地址</translation>
     </message>
+    <message>
+        <source>Date</source>
+        <translation type="unfinished">日期</translation>
+    </message>
     <message>
         <source>Copy amount</source>
         <translation type="unfinished">复制金额</translation>
@@ -903,6 +932,10 @@ Signing is only possible with addresses of the type 'legacy'.</source>
         <source>L&amp;ock unspent</source>
         <translation type="unfinished">锁定未花费(&amp;O)</translation>
     </message>
+    <message>
+        <source>&amp;Unlock unspent</source>
+        <translation type="unfinished">解鎖未花費的</translation>
+    </message>
     <message>
         <source>Copy quantity</source>
         <translation type="unfinished">复制数目</translation>
@@ -1011,6 +1044,24 @@ The migration process will create a backup of the wallet before migrating. This
         <source>Solvable but not watched scripts have been migrated to a new wallet named '%1'.</source>
         <translation type="unfinished">可解决但未被观察到的脚本已经被迁移到被命名为“%1”的新钱包。</translation>
     </message>
+    <message>
+        <source>Restore and Migrate wallet</source>
+        <translation type="unfinished">恢復及遷移錢包</translation>
+    </message>
+    <message>
+        <source>Are you sure you wish to restore the wallet file &lt;i&gt;%1&lt;/i&gt; to &lt;i&gt;%2&lt;/i&gt; and migrate it?</source>
+        <translation type="unfinished">您確定要恢復錢包檔案&lt;i&gt;%1&lt;/i&gt;到&lt;i&gt;%2&lt;/i&gt;及遷移它嗎？</translation>
+    </message>
+    <message>
+        <source>Restore Wallet</source>
+        <extracomment>Title of progress window which is displayed when wallets are being restored.</extracomment>
+        <translation type="unfinished">恢復錢包</translation>
+    </message>
+    <message>
+        <source>Restoring Wallet &lt;b&gt;%1&lt;/b&gt;…</source>
+        <extracomment>Descriptive text of the restore wallets progress window which indicates to the user that wallets are currently being restored.</extracomment>
+        <translation type="unfinished">正在恢復錢包&lt;b&gt;%1&lt;/b&gt;...</translation>
+    </message>
     <message>
         <source>Migration failed</source>
         <translation type="unfinished">迁移失败</translation>
@@ -1117,10 +1168,6 @@ The migration process will create a backup of the wallet before migrating. This
         <source>Disable Private Keys</source>
         <translation type="unfinished">禁用私鑰</translation>
     </message>
-    <message>
-        <source>Make a blank wallet. Blank wallets do not initially have private keys or scripts. Private keys and addresses can be imported, or an HD seed can be set, at a later time.</source>
-        <translation type="unfinished">製作一個空白的錢包。空白錢包最初沒有私鑰或腳本。以後可以匯入私鑰和地址，或者可以設定HD種子。</translation>
-    </message>
     <message>
         <source>Make Blank Wallet</source>
         <translation type="unfinished">製作空白錢包</translation>
@@ -1768,7 +1815,7 @@ The migration process will create a backup of the wallet before migrating. This
     </message>
     <message>
         <source>Sign Tx</source>
-        <translation type="unfinished">签名交易</translation>
+        <translation type="unfinished">簽名交易</translation>
     </message>
     <message>
         <source>Broadcast Tx</source>
@@ -1776,15 +1823,15 @@ The migration process will create a backup of the wallet before migrating. This
     </message>
     <message>
         <source>Copy to Clipboard</source>
-        <translation type="unfinished">复制到剪贴板</translation>
+        <translation type="unfinished">複製到剪貼簿</translation>
     </message>
     <message>
         <source>Save…</source>
-        <translation type="unfinished">保存...</translation>
+        <translation type="unfinished">拯救...</translation>
     </message>
     <message>
         <source>Close</source>
-        <translation type="unfinished">关闭</translation>
+        <translation type="unfinished">關閉</translation>
     </message>
     <message>
         <source>Failed to load transaction: %1</source>
@@ -1802,9 +1849,11 @@ The migration process will create a backup of the wallet before migrating. This
         <source>Could not sign any more inputs.</source>
         <translation type="unfinished">没有交易输入项可供签名了。</translation>
     </message>
-    <message>
-        <source>Signed %1 inputs, but more signatures are still required.</source>
-        <translation type="unfinished">已签名 %1 个交易输入项，但是仍然还有余下的项目需要签名。</translation>
+    <message numerus="yes">
+        <source>Signed %n input(s), but more signatures are still required.</source>
+        <translation type="unfinished">
+            <numerusform />
+        </translation>
     </message>
     <message>
         <source>Signed transaction successfully. Transaction is ready to broadcast.</source>
@@ -1814,14 +1863,6 @@ The migration process will create a backup of the wallet before migrating. This
         <source>Unknown error processing transaction.</source>
         <translation type="unfinished">处理交易时遇到未知错误。</translation>
     </message>
-    <message>
-        <source>Transaction broadcast successfully! Transaction ID: %1</source>
-        <translation type="unfinished">已成功广播交易！交易ID: %1</translation>
-    </message>
-    <message>
-        <source>Transaction broadcast failed: %1</source>
-        <translation type="unfinished">交易广播失败: %1</translation>
-    </message>
     <message>
         <source>PSBT copied to clipboard.</source>
         <translation type="unfinished">已复制PSBT到剪贴板</translation>
@@ -1847,6 +1888,10 @@ The migration process will create a backup of the wallet before migrating. This
         <source>own address</source>
         <translation type="unfinished">自己的地址</translation>
     </message>
+    <message>
+        <source>Unable to calculate transaction fee or total transaction amount.</source>
+        <translation type="unfinished">无法计算交易费用或总交易金额。</translation>
+    </message>
     <message>
         <source>Pays transaction fee: </source>
         <translation type="unfinished">支付交易费用:</translation>
@@ -1859,6 +1904,12 @@ The migration process will create a backup of the wallet before migrating. This
         <source>or</source>
         <translation type="unfinished">或</translation>
     </message>
+    <message numerus="yes">
+        <source>Transaction has %n unsigned input(s).</source>
+        <translation type="unfinished">
+            <numerusform />
+        </translation>
+    </message>
     <message>
         <source>Transaction is missing some information about inputs.</source>
         <translation type="unfinished">交易中有输入项缺失某些信息。</translation>
@@ -1875,6 +1926,14 @@ The migration process will create a backup of the wallet before migrating. This
         <source>(But this wallet cannot sign transactions.)</source>
         <translation type="unfinished">(但这个钱包不能签名交易)</translation>
     </message>
+    <message>
+        <source>(But this wallet does not have the right keys.)</source>
+        <translation type="unfinished">(但这个钱包没有正确的密钥)</translation>
+    </message>
+    <message>
+        <source>Transaction is fully signed and ready for broadcast.</source>
+        <translation type="unfinished">交易已经完全签名，可以广播。</translation>
+    </message>
     <message>
         <source>Transaction status is unknown.</source>
         <translation type="unfinished">交易状态未知。</translation>
@@ -1886,6 +1945,10 @@ The migration process will create a backup of the wallet before migrating. This
         <source>Payment request error</source>
         <translation type="unfinished">支付请求出错</translation>
     </message>
+    <message>
+        <source>Cannot start bitcoin: click-to-pay handler</source>
+        <translation type="unfinished">无法启动 bitcoin: 协议的“一键支付”处理程序</translation>
+    </message>
     <message>
         <source>URI handling</source>
         <translation type="unfinished">URI 處理</translation>
@@ -1963,7 +2026,12 @@ If you are receiving this error you should request the merchant provide a BIP21
         <extracomment>An Inbound Connection from a Peer.</extracomment>
         <translation type="unfinished">進來</translation>
     </message>
-    </context>
+    <message>
+        <source>Outbound</source>
+        <extracomment>An Outbound Connection to a Peer.</extracomment>
+        <translation type="unfinished">傳出</translation>
+    </message>
+</context>
 <context>
     <name>QRImageWidget</name>
     <message>
@@ -2130,10 +2198,6 @@ If you are receiving this error you should request the merchant provide a BIP21
         <source>Transaction Relay</source>
         <translation type="unfinished">交易转发</translation>
     </message>
-    <message>
-        <source>Starting Block</source>
-        <translation type="unfinished">起步区块</translation>
-    </message>
     <message>
         <source>Synced Headers</source>
         <translation type="unfinished">已同步前導資料</translation>
@@ -2416,10 +2480,6 @@ If you are receiving this error you should request the merchant provide a BIP21
         <source>Network activity disabled</source>
         <translation type="unfinished">网络活动已禁用</translation>
     </message>
-    <message>
-        <source>None</source>
-        <translation type="unfinished">无</translation>
-    </message>
     <message>
         <source>Executing command without any wallet</source>
         <translation type="unfinished">不使用任何钱包执行命令</translation>
@@ -2667,10 +2727,6 @@ For more information on using this console, type %6.
 </context>
 <context>
     <name>RecentRequestsTableModel</name>
-    <message>
-        <source>Date</source>
-        <translation type="unfinished">日期</translation>
-    </message>
     <message>
         <source>Label</source>
         <translation type="unfinished">标签</translation>
@@ -2992,10 +3048,6 @@ Note:  Since the fee is calculated on a per-byte basis, a fee rate of "100 satos
         <source>The amount exceeds your balance.</source>
         <translation type="unfinished">金额超出您的余额。</translation>
     </message>
-    <message>
-        <source>The total exceeds your balance when the %1 transaction fee is included.</source>
-        <translation type="unfinished">计入 %1 手续费后，金额超出了您的余额。</translation>
-    </message>
     <message>
         <source>Duplicate address found: addresses should only be used once each.</source>
         <translation type="unfinished">发现重复地址:每个地址应该只使用一次。</translation>
@@ -3623,6 +3675,10 @@ Note:  Since the fee is calculated on a per-byte basis, a fee rate of "100 satos
         <extracomment>Expanded name of the CSV file format. See: https://en.wikipedia.org/wiki/Comma-separated_values.</extracomment>
         <translation type="unfinished">逗號分隔文件</translation>
     </message>
+    <message>
+        <source>Confirmed</source>
+        <translation type="unfinished">已確認</translation>
+    </message>
     <message>
         <source>Date</source>
         <translation type="unfinished">日期</translation>
@@ -3939,10 +3995,6 @@ Go to File &gt; Open Wallet to load a wallet.
         <source>Warning: Private keys detected in wallet {%s} with disabled private keys</source>
         <translation type="unfinished">警告：在已经禁用私钥的钱包 {%s} 中仍然检测到私钥</translation>
     </message>
-    <message>
-        <source>Warning: We do not appear to fully agree with our peers! You may need to upgrade, or other nodes may need to upgrade.</source>
-        <translation type="unfinished">警告：我们和其他节点似乎没达成共识！您可能需要升级，或者就是其他节点可能需要升级。</translation>
-    </message>
     <message>
         <source>Witness data for blocks after height %d requires validation. Please restart with -reindex.</source>
         <translation type="unfinished">需要验证高度在%d之后的区块见证数据。请使用 -reindex 重新启动。</translation>
@@ -4023,14 +4075,6 @@ Go to File &gt; Open Wallet to load a wallet.
         <source>Option '-checkpoints' is set but checkpoints were removed. This option has no effect.</source>
         <translation type="unfinished">选项“-checkpoints”已设置，但检查点已被移除。该选项不再生效。 </translation>
     </message>
-    <message>
-        <source>Option '-maxorphantx' is set but no longer has any effect (see release notes). Please remove it from your configuration.</source>
-        <translation type="unfinished">选项“-maxorphantx”已设置，但已不再生效（参见发行说明）。请从您的配置中移除该选项。 </translation>
-    </message>
-    <message>
-        <source>Options '-datacarrier' or '-datacarriersize' are set but are marked as deprecated. They will be removed in a future version.</source>
-        <translation type="unfinished">选项“-datacarrier”或“-datacarriersize”已设置，但已标记为弃用。它们将在未来版本中移除。 </translation>
-    </message>
     <message>
         <source>Outbound connections restricted to CJDNS (-onlynet=cjdns) but -cjdnsreachable is not provided</source>
         <translation type="unfinished">传出连接被限制为仅使用CJDNS (-onlynet=cjdns) ，但却未提供 -cjdnsreachable 参数。</translation>
@@ -4089,10 +4133,6 @@ Unable to restore backup of wallet.</source>
         <translation type="unfinished">
 无法还原钱包备份</translation>
     </message>
-    <message>
-        <source>-paytxfee is deprecated and will be fully removed in v31.0.</source>
-        <translation type="unfinished">“-paytxfee”已弃用，并将在 v31.0 中完全移除。 </translation>
-    </message>
     <message>
         <source>A fatal internal error occurred, see debug.log for details: </source>
         <translation type="unfinished">發生致命的內部錯誤，有關詳情請查看 debug.log：</translation>
@@ -4102,8 +4142,12 @@ Unable to restore backup of wallet.</source>
         <translation type="unfinished">区块验证已中断</translation>
     </message>
     <message>
-        <source>Cannot add WalletDescriptor to a non-descriptor wallet</source>
-        <translation type="unfinished">无法将钱包描述符添加到非描述符钱包。</translation>
+        <source>Can't spend unconfirmed version %d pre-selected input with a version 3 tx</source>
+        <translation type="unfinished">无法使用版本3交易花费未确认版本1%d的预选输入。</translation>
+    </message>
+    <message>
+        <source>Can't spend unconfirmed version 3 pre-selected input with a version %d tx</source>
+        <translation type="unfinished">无法使用版本1%d交易花费未确认版本3的预选输入。</translation>
     </message>
     <message>
         <source>Cannot write to directory '%s'; check permissions.</source>
@@ -4149,10 +4193,6 @@ Unable to restore backup of wallet.</source>
         <source>Dump file %s does not exist.</source>
         <translation type="unfinished">转储文件 %s 不存在</translation>
     </message>
-    <message>
-        <source>Error creating %s</source>
-        <translation type="unfinished">创建%s时出错</translation>
-    </message>
     <message>
         <source>Error initializing block database</source>
         <translation type="unfinished">初始化区块数据库时出错</translation>
@@ -4161,10 +4201,6 @@ Unable to restore backup of wallet.</source>
         <source>Error loading %s</source>
         <translation type="unfinished">載入檔案 %s 時發生錯誤</translation>
     </message>
-    <message>
-        <source>Error loading %s: Private keys can only be disabled during creation</source>
-        <translation type="unfinished">載入 %s 時發生錯誤: 只有在造新錢包時能夠指定不允許私鑰</translation>
-    </message>
     <message>
         <source>Error loading %s: Wallet corrupted</source>
         <translation type="unfinished">載入檔案 %s 時發生錯誤: 錢包損毀了</translation>
@@ -4325,10 +4361,6 @@ Unable to restore backup of wallet.</source>
         <source>Failed to write block.</source>
         <translation type="unfinished">寫入區塊失敗。</translation>
     </message>
-    <message>
-        <source>Failed to write to block index database.</source>
-        <translation type="unfinished">寫入區塊索引資料庫失敗。</translation>
-    </message>
     <message>
         <source>Failure removing transaction: %s</source>
         <translation type="unfinished">%s删除交易时失败: </translation>
@@ -4369,14 +4401,14 @@ Unable to restore backup of wallet.</source>
         <source>Invalid P2P permission: '%s'</source>
         <translation type="unfinished">无效的 P2P 权限：'%s'</translation>
     </message>
-    <message>
-        <source>Invalid amount for %s=&lt;amount&gt;: '%s' (must be at least %s)</source>
-        <translation type="unfinished">%s=&lt;amount&gt;: '%s' 中指定了非法的金额 (必须至少达到 %s)</translation>
-    </message>
     <message>
         <source>Invalid amount for %s=&lt;amount&gt;: '%s'</source>
         <translation type="unfinished">%s=&lt;amount&gt;: '%s' 中指定了非法的金额</translation>
     </message>
+    <message>
+        <source>Creating wallet…</source>
+        <translation type="unfinished">創建錢包...</translation>
+    </message>
     <message>
         <source>Invalid amount for -%s=&lt;amount&gt;: '%s'</source>
         <translation type="unfinished">参数 -%s=&lt;amount&gt;: '%s' 指定了无效的金额</translation>
@@ -4477,6 +4509,10 @@ Unable to restore backup of wallet.</source>
         <source>Starting network threads…</source>
         <translation type="unfinished">正在開始網路線程...</translation>
     </message>
+    <message>
+        <source>The %s path uses exFAT, which is known to have intermittent corruption problems on macOS. Move this directory to a different filesystem to avoid data loss.</source>
+        <translation type="unfinished">%s路径使用exFAT，该格式在macOS上已知会出现间歇性损坏问题。请将此目录移动到其他文件系统以避免数据丢失。</translation>
+    </message>
     <message>
         <source>The source code is available from %s.</source>
         <translation type="unfinished">可以从 %s 获取源代码。</translation>
diff --git a/src/qt/locale/bitcoin_zh-Hans.ts b/src/qt/locale/bitcoin_zh-Hans.ts
index e76749e04fb5..1241cbf19406 100644
--- a/src/qt/locale/bitcoin_zh-Hans.ts
+++ b/src/qt/locale/bitcoin_zh-Hans.ts
@@ -593,10 +593,6 @@ Signing is only possible with addresses of the type 'legacy'.</source>
         <source>Processing blocks on disk…</source>
         <translation type="unfinished">处理磁盘上的区块...</translation>
     </message>
-    <message>
-        <source>Connecting to peers…</source>
-        <translation type="unfinished">连接到节点...</translation>
-    </message>
     <message>
         <source>Request payments (generates QR codes and bitcoin: URIs)</source>
         <translation type="unfinished">请求支付 (生成二维码和 bitcoin: URI)</translation>
@@ -607,7 +603,7 @@ Signing is only possible with addresses of the type 'legacy'.</source>
     </message>
     <message>
         <source>Show the list of used receiving addresses and labels</source>
-        <translation type="unfinished">显示用过的收款地址和标签的列表</translation>
+        <translation type="unfinished">顯示已使用過的接收地址和標籤清單</translation>
     </message>
     <message>
         <source>&amp;Command-line options</source>
@@ -627,10 +623,6 @@ Signing is only possible with addresses of the type 'legacy'.</source>
         <source>Catching up…</source>
         <translation type="unfinished">正在追上进度...</translation>
     </message>
-    <message>
-        <source>Last received block was generated %1 ago.</source>
-        <translation type="unfinished">最新收到的区块产生于 %1 之前。</translation>
-    </message>
     <message>
         <source>Transactions after this will not yet be visible.</source>
         <translation type="unfinished">在此之后的交易尚不可见</translation>
@@ -639,18 +631,6 @@ Signing is only possible with addresses of the type 'legacy'.</source>
         <source>Error</source>
         <translation type="unfinished">错误</translation>
     </message>
-    <message>
-        <source>Warning</source>
-        <translation type="unfinished">警告</translation>
-    </message>
-    <message>
-        <source>Information</source>
-        <translation type="unfinished">信息</translation>
-    </message>
-    <message>
-        <source>Up to date</source>
-        <translation type="unfinished">已是最新</translation>
-    </message>
     <message>
         <source>Load Partially Signed Bitcoin Transaction</source>
         <translation type="unfinished">加载部分签名比特币交易（PSBT）</translation>
@@ -753,6 +733,23 @@ Signing is only possible with addresses of the type 'legacy'.</source>
         <extracomment>Label of the input field where the name of the wallet is entered.</extracomment>
         <translation type="unfinished">钱包名称</translation>
     </message>
+    <message>
+        <source>Invalid Wallet Name</source>
+        <translation type="unfinished">無效的錢包名稱</translation>
+    </message>
+    <message>
+        <source>Wallet name cannot be empty</source>
+        <translation type="unfinished">錢包名稱不能為空白</translation>
+    </message>
+    <message>
+        <source>Restore and Migrate Wallet Backup</source>
+        <translation type="unfinished">恢復及遷移錢包備份</translation>
+    </message>
+    <message>
+        <source>Restore and Migrate Wallet</source>
+        <extracomment>Title of pop-up window shown when the user is attempting to restore a wallet.</extracomment>
+        <translation type="unfinished">恢復及遷移錢包</translation>
+    </message>
     <message>
         <source>&amp;Window</source>
         <translation type="unfinished">窗口(&amp;W)</translation>
@@ -1111,6 +1108,24 @@ The migration process will create a backup of the wallet before migrating. This
         <source>Solvable but not watched scripts have been migrated to a new wallet named '%1'.</source>
         <translation type="unfinished">可解决但未被观察到的脚本已经被迁移到被命名为“%1”的新钱包。</translation>
     </message>
+    <message>
+        <source>Restore and Migrate wallet</source>
+        <translation type="unfinished">恢復及遷移錢包</translation>
+    </message>
+    <message>
+        <source>Are you sure you wish to restore the wallet file &lt;i&gt;%1&lt;/i&gt; to &lt;i&gt;%2&lt;/i&gt; and migrate it?</source>
+        <translation type="unfinished">您確定要恢復錢包檔案&lt;i&gt;%1&lt;/i&gt;到&lt;i&gt;%2&lt;/i&gt;及遷移它嗎？</translation>
+    </message>
+    <message>
+        <source>Restore Wallet</source>
+        <extracomment>Title of progress window which is displayed when wallets are being restored.</extracomment>
+        <translation type="unfinished">恢复钱包</translation>
+    </message>
+    <message>
+        <source>Restoring Wallet &lt;b&gt;%1&lt;/b&gt;…</source>
+        <extracomment>Descriptive text of the restore wallets progress window which indicates to the user that wallets are currently being restored.</extracomment>
+        <translation type="unfinished">恢复钱包&lt;b&gt;%1&lt;/b&gt;…</translation>
+    </message>
     <message>
         <source>Migration failed</source>
         <translation type="unfinished">迁移失败</translation>
@@ -1234,10 +1249,6 @@ The migration process will create a backup of the wallet before migrating. This
         <source>Disable Private Keys</source>
         <translation type="unfinished">禁用私钥</translation>
     </message>
-    <message>
-        <source>Make a blank wallet. Blank wallets do not initially have private keys or scripts. Private keys and addresses can be imported, or an HD seed can be set, at a later time.</source>
-        <translation type="unfinished">创建一个空白的钱包。空白钱包最初不含有任何私钥或脚本。可以以后再导入私钥和地址，或设置HD种子。</translation>
-    </message>
     <message>
         <source>Make Blank Wallet</source>
         <translation type="unfinished">创建空白钱包</translation>
@@ -1276,7 +1287,7 @@ The migration process will create a backup of the wallet before migrating. This
     </message>
     <message>
         <source>The address associated with this address list entry. This can only be modified for sending addresses.</source>
-        <translation type="unfinished">与这个地址列表项关联的地址。只有发送地址可以修改。</translation>
+        <translation type="unfinished">跟這個地址清單關聯的地址。只有發送地址能被修改。</translation>
     </message>
     <message>
         <source>&amp;Address</source>
@@ -1973,9 +1984,11 @@ The migration process will create a backup of the wallet before migrating. This
         <source>Could not sign any more inputs.</source>
         <translation type="unfinished">没有交易输入项可供签名了。</translation>
     </message>
-    <message>
-        <source>Signed %1 inputs, but more signatures are still required.</source>
-        <translation type="unfinished">已签名 %1 个交易输入项，但是仍然还有余下的项目需要签名。</translation>
+    <message numerus="yes">
+        <source>Signed %n input(s), but more signatures are still required.</source>
+        <translation type="unfinished">
+            <numerusform />
+        </translation>
     </message>
     <message>
         <source>Signed transaction successfully. Transaction is ready to broadcast.</source>
@@ -2034,9 +2047,11 @@ The migration process will create a backup of the wallet before migrating. This
         <source>or</source>
         <translation type="unfinished">或</translation>
     </message>
-    <message>
-        <source>Transaction has %1 unsigned inputs.</source>
-        <translation type="unfinished">交易中含有%1个未签名输入项。</translation>
+    <message numerus="yes">
+        <source>Transaction has %n unsigned input(s).</source>
+        <translation type="unfinished">
+            <numerusform />
+        </translation>
     </message>
     <message>
         <source>Transaction is missing some information about inputs.</source>
@@ -2326,10 +2341,6 @@ If you are receiving this error you should request the merchant provide a BIP21
         <source>Transaction Relay</source>
         <translation type="unfinished">交易转发</translation>
     </message>
-    <message>
-        <source>Starting Block</source>
-        <translation type="unfinished">起步区块</translation>
-    </message>
     <message>
         <source>Synced Headers</source>
         <translation type="unfinished">已同步区块头</translation>
@@ -3210,10 +3221,6 @@ Note:  Since the fee is calculated on a per-byte basis, a fee rate of "100 satos
         <source>The amount exceeds your balance.</source>
         <translation type="unfinished">金额超出您的余额。</translation>
     </message>
-    <message>
-        <source>The total exceeds your balance when the %1 transaction fee is included.</source>
-        <translation type="unfinished">计入 %1 手续费后，金额超出了您的余额。</translation>
-    </message>
     <message>
         <source>Duplicate address found: addresses should only be used once each.</source>
         <translation type="unfinished">发现重复地址:每个地址应该只使用一次。</translation>
@@ -4160,10 +4167,6 @@ Go to File &gt; Open Wallet to load a wallet.
         <source>Warning: Private keys detected in wallet {%s} with disabled private keys</source>
         <translation type="unfinished">警告：在已经禁用私钥的钱包 {%s} 中仍然检测到私钥</translation>
     </message>
-    <message>
-        <source>Warning: We do not appear to fully agree with our peers! You may need to upgrade, or other nodes may need to upgrade.</source>
-        <translation type="unfinished">警告：我们和其他节点似乎没达成共识！您可能需要升级，或者就是其他节点可能需要升级。</translation>
-    </message>
     <message>
         <source>Witness data for blocks after height %d requires validation. Please restart with -reindex.</source>
         <translation type="unfinished">需要验证高度在%d之后的区块见证数据。请使用 -reindex 重新启动。</translation>
@@ -4244,14 +4247,6 @@ Go to File &gt; Open Wallet to load a wallet.
         <source>Option '-checkpoints' is set but checkpoints were removed. This option has no effect.</source>
         <translation type="unfinished">选项“-checkpoints”已设置，但检查点已被移除。该选项不再生效。 </translation>
     </message>
-    <message>
-        <source>Option '-maxorphantx' is set but no longer has any effect (see release notes). Please remove it from your configuration.</source>
-        <translation type="unfinished">选项“-maxorphantx”已设置，但已不再生效（参见发行说明）。请从您的配置中移除该选项。 </translation>
-    </message>
-    <message>
-        <source>Options '-datacarrier' or '-datacarriersize' are set but are marked as deprecated. They will be removed in a future version.</source>
-        <translation type="unfinished">选项“-datacarrier”或“-datacarriersize”已设置，但已标记为弃用。它们将在未来版本中移除。 </translation>
-    </message>
     <message>
         <source>Outbound connections restricted to CJDNS (-onlynet=cjdns) but -cjdnsreachable is not provided</source>
         <translation type="unfinished">传出连接被限制为仅使用CJDNS (-onlynet=cjdns) ，但却未提供 -cjdnsreachable 参数。</translation>
@@ -4314,10 +4309,6 @@ Unable to restore backup of wallet.</source>
         <source>default wallet</source>
         <translation type="unfinished">默认钱包</translation>
     </message>
-    <message>
-        <source>-paytxfee is deprecated and will be fully removed in v31.0.</source>
-        <translation type="unfinished">“-paytxfee”已弃用，并将在 v31.0 中完全移除。 </translation>
-    </message>
     <message>
         <source>A fatal internal error occurred, see debug.log for details: </source>
         <translation type="unfinished">發生致命的內部錯誤，有關詳情請查看 debug.log：</translation>
@@ -4327,8 +4318,12 @@ Unable to restore backup of wallet.</source>
         <translation type="unfinished">区块验证已中断</translation>
     </message>
     <message>
-        <source>Cannot add WalletDescriptor to a non-descriptor wallet</source>
-        <translation type="unfinished">无法将钱包描述符添加到非描述符钱包。</translation>
+        <source>Can't spend unconfirmed version %d pre-selected input with a version 3 tx</source>
+        <translation type="unfinished">无法使用版本3交易花费未确认版本1%d的预选输入。</translation>
+    </message>
+    <message>
+        <source>Can't spend unconfirmed version 3 pre-selected input with a version %d tx</source>
+        <translation type="unfinished">无法使用版本1%d交易花费未确认版本3的预选输入。</translation>
     </message>
     <message>
         <source>Cannot write to directory '%s'; check permissions.</source>
@@ -4374,10 +4369,6 @@ Unable to restore backup of wallet.</source>
         <source>Dump file %s does not exist.</source>
         <translation type="unfinished">转储文件 %s 不存在</translation>
     </message>
-    <message>
-        <source>Error creating %s</source>
-        <translation type="unfinished">创建%s时出错</translation>
-    </message>
     <message>
         <source>Error initializing block database</source>
         <translation type="unfinished">初始化区块数据库时出错</translation>
@@ -4386,10 +4377,6 @@ Unable to restore backup of wallet.</source>
         <source>Error loading %s</source>
         <translation type="unfinished">载入 %s 时发生错误</translation>
     </message>
-    <message>
-        <source>Error loading %s: Private keys can only be disabled during creation</source>
-        <translation type="unfinished">加载 %s 时出错：只能在创建钱包时禁用私钥。</translation>
-    </message>
     <message>
         <source>Error loading %s: Wallet corrupted</source>
         <translation type="unfinished">%s 加载出错:钱包损坏</translation>
@@ -4558,10 +4545,6 @@ Unable to restore backup of wallet.</source>
         <source>Failed to write block.</source>
         <translation type="unfinished">寫入區塊失敗。</translation>
     </message>
-    <message>
-        <source>Failed to write to block index database.</source>
-        <translation type="unfinished">寫入區塊索引資料庫失敗。</translation>
-    </message>
     <message>
         <source>Failure removing transaction: %s</source>
         <translation type="unfinished">删除交易时失败: %s</translation>
@@ -4610,14 +4593,14 @@ Unable to restore backup of wallet.</source>
         <source>Invalid P2P permission: '%s'</source>
         <translation type="unfinished">无效的 P2P 权限：'%s'</translation>
     </message>
-    <message>
-        <source>Invalid amount for %s=&lt;amount&gt;: '%s' (must be at least %s)</source>
-        <translation type="unfinished">%s=&lt;amount&gt;: '%s' 中指定了非法的金额 (必须至少达到 %s)</translation>
-    </message>
     <message>
         <source>Invalid amount for %s=&lt;amount&gt;: '%s'</source>
         <translation type="unfinished">%s=&lt;amount&gt;: '%s' 中指定了非法的金额</translation>
     </message>
+    <message>
+        <source>Creating wallet…</source>
+        <translation type="unfinished">創建錢包...</translation>
+    </message>
     <message>
         <source>Invalid amount for -%s=&lt;amount&gt;: '%s'</source>
         <translation type="unfinished">参数 -%s=&lt;amount&gt;: '%s' 指定了无效的金额</translation>
@@ -4746,6 +4729,10 @@ Unable to restore backup of wallet.</source>
         <source>Starting network threads…</source>
         <translation type="unfinished">启动网络线程...</translation>
     </message>
+    <message>
+        <source>The %s path uses exFAT, which is known to have intermittent corruption problems on macOS. Move this directory to a different filesystem to avoid data loss.</source>
+        <translation type="unfinished">%s路径使用exFAT，该格式在macOS上已知会出现间歇性损坏问题。请将此目录移动到其他文件系统以避免数据丢失。</translation>
+    </message>
     <message>
         <source>The source code is available from %s.</source>
         <translation type="unfinished">可以从 %s 获取源代码。</translation>
@@ -4774,10 +4761,6 @@ Unable to restore backup of wallet.</source>
         <source>This is the minimum transaction fee you pay on every transaction.</source>
         <translation type="unfinished">这是你每次交易付款时最少要付的手续费。</translation>
     </message>
-    <message>
-        <source>This is the transaction fee you will pay if you send a transaction.</source>
-        <translation type="unfinished">如果发送交易，这将是你要支付的手续费。</translation>
-    </message>
     <message>
         <source>Transaction %s does not belong to this wallet</source>
         <translation type="unfinished">交易%s不属于这个钱包</translation>
diff --git a/src/qt/locale/bitcoin_zh-Hant.ts b/src/qt/locale/bitcoin_zh-Hant.ts
index 86d0072e02ed..66e81db3ca0d 100644
--- a/src/qt/locale/bitcoin_zh-Hant.ts
+++ b/src/qt/locale/bitcoin_zh-Hant.ts
@@ -321,11 +321,29 @@ Signing is only possible with addresses of the type 'legacy'.</source>
         <source>Amount</source>
         <translation type="unfinished">金额</translation>
     </message>
+    <message>
+        <source>Enter a Bitcoin address (e.g. %1)</source>
+        <translation type="unfinished">请输入一个比特币地址 (例如 %1)</translation>
+    </message>
+    <message>
+        <source>Unroutable</source>
+        <translation type="unfinished">不可路由</translation>
+    </message>
     <message>
         <source>Inbound</source>
         <extracomment>An inbound connection from a peer. An inbound connection is a connection initiated by a peer.</extracomment>
         <translation type="unfinished">進來</translation>
     </message>
+    <message>
+        <source>Outbound</source>
+        <extracomment>An outbound connection to a peer. An outbound connection is a connection initiated by us.</extracomment>
+        <translation type="unfinished">傳出</translation>
+    </message>
+    <message>
+        <source>Full Relay</source>
+        <extracomment>Peer connection type that relays all network information.</extracomment>
+        <translation type="unfinished">完整转发</translation>
+    </message>
     <message>
         <source>Block Relay</source>
         <extracomment>Peer connection type that relays network information about blocks and not transactions or addresses.</extracomment>
@@ -336,6 +354,16 @@ Signing is only possible with addresses of the type 'legacy'.</source>
         <extracomment>Peer connection type established manually through one of several methods.</extracomment>
         <translation type="unfinished">手册</translation>
     </message>
+    <message>
+        <source>Feeler</source>
+        <extracomment>Short-lived peer connection type that tests the aliveness of known addresses.</extracomment>
+        <translation type="unfinished">触须</translation>
+    </message>
+    <message>
+        <source>Address Fetch</source>
+        <extracomment>Short-lived peer connection type that solicits known addresses from a peer.</extracomment>
+        <translation type="unfinished">地址取回</translation>
+    </message>
     <message>
         <source>%1 h</source>
         <translation type="unfinished">%1 小时</translation>
@@ -548,10 +576,6 @@ Signing is only possible with addresses of the type 'legacy'.</source>
         <source>Processing blocks on disk…</source>
         <translation type="unfinished">处理磁盘上的区块...</translation>
     </message>
-    <message>
-        <source>Connecting to peers…</source>
-        <translation type="unfinished">连接到节点...</translation>
-    </message>
     <message>
         <source>Request payments (generates QR codes and bitcoin: URIs)</source>
         <translation type="unfinished">请求支付 (生成二维码和 bitcoin: URI)</translation>
@@ -562,7 +586,7 @@ Signing is only possible with addresses of the type 'legacy'.</source>
     </message>
     <message>
         <source>Show the list of used receiving addresses and labels</source>
-        <translation type="unfinished">显示用过的收款地址和标签的列表</translation>
+        <translation type="unfinished">顯示已使用過的接收地址和標籤清單</translation>
     </message>
     <message>
         <source>&amp;Command-line options</source>
@@ -582,10 +606,6 @@ Signing is only possible with addresses of the type 'legacy'.</source>
         <source>Catching up…</source>
         <translation type="unfinished">正在追上进度...</translation>
     </message>
-    <message>
-        <source>Last received block was generated %1 ago.</source>
-        <translation type="unfinished">最新收到的区块产生于 %1 之前。</translation>
-    </message>
     <message>
         <source>Transactions after this will not yet be visible.</source>
         <translation type="unfinished">在此之后的交易尚不可见</translation>
@@ -594,18 +614,6 @@ Signing is only possible with addresses of the type 'legacy'.</source>
         <source>Error</source>
         <translation type="unfinished">错误</translation>
     </message>
-    <message>
-        <source>Warning</source>
-        <translation type="unfinished">警告</translation>
-    </message>
-    <message>
-        <source>Information</source>
-        <translation type="unfinished">信息</translation>
-    </message>
-    <message>
-        <source>Up to date</source>
-        <translation type="unfinished">已是最新</translation>
-    </message>
     <message>
         <source>Load Partially Signed Bitcoin Transaction</source>
         <translation type="unfinished">加载部分签名比特币交易（PSBT）</translation>
@@ -708,6 +716,23 @@ Signing is only possible with addresses of the type 'legacy'.</source>
         <extracomment>Label of the input field where the name of the wallet is entered.</extracomment>
         <translation type="unfinished">錢包名稱</translation>
     </message>
+    <message>
+        <source>Invalid Wallet Name</source>
+        <translation type="unfinished">無效的錢包名稱</translation>
+    </message>
+    <message>
+        <source>Wallet name cannot be empty</source>
+        <translation type="unfinished">錢包名稱不能為空白</translation>
+    </message>
+    <message>
+        <source>Restore and Migrate Wallet Backup</source>
+        <translation type="unfinished">恢復及遷移錢包備份</translation>
+    </message>
+    <message>
+        <source>Restore and Migrate Wallet</source>
+        <extracomment>Title of pop-up window shown when the user is attempting to restore a wallet.</extracomment>
+        <translation type="unfinished">恢復及遷移錢包</translation>
+    </message>
     <message>
         <source>&amp;Window</source>
         <translation type="unfinished">窗口(&amp;W)</translation>
@@ -879,6 +904,10 @@ Signing is only possible with addresses of the type 'legacy'.</source>
         <source>Received with address</source>
         <translation type="unfinished">收款地址</translation>
     </message>
+    <message>
+        <source>Date</source>
+        <translation type="unfinished">日期</translation>
+    </message>
     <message>
         <source>Copy amount</source>
         <translation type="unfinished">复制金额</translation>
@@ -903,6 +932,10 @@ Signing is only possible with addresses of the type 'legacy'.</source>
         <source>L&amp;ock unspent</source>
         <translation type="unfinished">锁定未花费(&amp;O)</translation>
     </message>
+    <message>
+        <source>&amp;Unlock unspent</source>
+        <translation type="unfinished">解鎖未花費的</translation>
+    </message>
     <message>
         <source>Copy quantity</source>
         <translation type="unfinished">复制数目</translation>
@@ -1011,6 +1044,24 @@ The migration process will create a backup of the wallet before migrating. This
         <source>Solvable but not watched scripts have been migrated to a new wallet named '%1'.</source>
         <translation type="unfinished">可解决但未被观察到的脚本已经被迁移到被命名为“%1”的新钱包。</translation>
     </message>
+    <message>
+        <source>Restore and Migrate wallet</source>
+        <translation type="unfinished">恢復及遷移錢包</translation>
+    </message>
+    <message>
+        <source>Are you sure you wish to restore the wallet file &lt;i&gt;%1&lt;/i&gt; to &lt;i&gt;%2&lt;/i&gt; and migrate it?</source>
+        <translation type="unfinished">您確定要恢復錢包檔案&lt;i&gt;%1&lt;/i&gt;到&lt;i&gt;%2&lt;/i&gt;及遷移它嗎？</translation>
+    </message>
+    <message>
+        <source>Restore Wallet</source>
+        <extracomment>Title of progress window which is displayed when wallets are being restored.</extracomment>
+        <translation type="unfinished">恢復錢包</translation>
+    </message>
+    <message>
+        <source>Restoring Wallet &lt;b&gt;%1&lt;/b&gt;…</source>
+        <extracomment>Descriptive text of the restore wallets progress window which indicates to the user that wallets are currently being restored.</extracomment>
+        <translation type="unfinished">正在恢復錢包&lt;b&gt;%1&lt;/b&gt;...</translation>
+    </message>
     <message>
         <source>Migration failed</source>
         <translation type="unfinished">迁移失败</translation>
@@ -1121,10 +1172,6 @@ The migration process will create a backup of the wallet before migrating. This
         <source>Disable Private Keys</source>
         <translation type="unfinished">禁用私钥</translation>
     </message>
-    <message>
-        <source>Make a blank wallet. Blank wallets do not initially have private keys or scripts. Private keys and addresses can be imported, or an HD seed can be set, at a later time.</source>
-        <translation type="unfinished">製作一個空白的錢包。空白錢包最初沒有私鑰或腳本。以後可以匯入私鑰和地址，或者可以設定HD種子。</translation>
-    </message>
     <message>
         <source>Make Blank Wallet</source>
         <translation type="unfinished">製作空白錢包</translation>
@@ -1796,7 +1843,7 @@ The migration process will create a backup of the wallet before migrating. This
     </message>
     <message>
         <source>Sign Tx</source>
-        <translation type="unfinished">签名交易</translation>
+        <translation type="unfinished">簽名交易</translation>
     </message>
     <message>
         <source>Broadcast Tx</source>
@@ -1804,15 +1851,15 @@ The migration process will create a backup of the wallet before migrating. This
     </message>
     <message>
         <source>Copy to Clipboard</source>
-        <translation type="unfinished">复制到剪贴板</translation>
+        <translation type="unfinished">複製到剪貼簿</translation>
     </message>
     <message>
         <source>Save…</source>
-        <translation type="unfinished">保存...</translation>
+        <translation type="unfinished">拯救...</translation>
     </message>
     <message>
         <source>Close</source>
-        <translation type="unfinished">关闭</translation>
+        <translation type="unfinished">關閉</translation>
     </message>
     <message>
         <source>Failed to load transaction: %1</source>
@@ -1830,9 +1877,11 @@ The migration process will create a backup of the wallet before migrating. This
         <source>Could not sign any more inputs.</source>
         <translation type="unfinished">没有交易输入项可供签名了。</translation>
     </message>
-    <message>
-        <source>Signed %1 inputs, but more signatures are still required.</source>
-        <translation type="unfinished">已签名 %1 个交易输入项，但是仍然还有余下的项目需要签名。</translation>
+    <message numerus="yes">
+        <source>Signed %n input(s), but more signatures are still required.</source>
+        <translation type="unfinished">
+            <numerusform />
+        </translation>
     </message>
     <message>
         <source>Signed transaction successfully. Transaction is ready to broadcast.</source>
@@ -1844,11 +1893,11 @@ The migration process will create a backup of the wallet before migrating. This
     </message>
     <message>
         <source>Transaction broadcast successfully! Transaction ID: %1</source>
-        <translation type="unfinished">已成功广播交易！交易ID: %1</translation>
+        <translation type="unfinished">交易成功廣播！交易 ID： %1</translation>
     </message>
     <message>
         <source>Transaction broadcast failed: %1</source>
-        <translation type="unfinished">交易广播失败: %1</translation>
+        <translation type="unfinished">交易廣播失敗： %1</translation>
     </message>
     <message>
         <source>PSBT copied to clipboard.</source>
@@ -1875,6 +1924,10 @@ The migration process will create a backup of the wallet before migrating. This
         <source>own address</source>
         <translation type="unfinished">自己的地址</translation>
     </message>
+    <message>
+        <source>Unable to calculate transaction fee or total transaction amount.</source>
+        <translation type="unfinished">无法计算交易费用或总交易金额。</translation>
+    </message>
     <message>
         <source>Pays transaction fee: </source>
         <translation type="unfinished">支付交易费用:</translation>
@@ -1887,6 +1940,12 @@ The migration process will create a backup of the wallet before migrating. This
         <source>or</source>
         <translation type="unfinished">或</translation>
     </message>
+    <message numerus="yes">
+        <source>Transaction has %n unsigned input(s).</source>
+        <translation type="unfinished">
+            <numerusform />
+        </translation>
+    </message>
     <message>
         <source>Transaction is missing some information about inputs.</source>
         <translation type="unfinished">交易中有输入项缺失某些信息。</translation>
@@ -1903,6 +1962,14 @@ The migration process will create a backup of the wallet before migrating. This
         <source>(But this wallet cannot sign transactions.)</source>
         <translation type="unfinished">(但这个钱包不能签名交易)</translation>
     </message>
+    <message>
+        <source>(But this wallet does not have the right keys.)</source>
+        <translation type="unfinished">(但这个钱包没有正确的密钥)</translation>
+    </message>
+    <message>
+        <source>Transaction is fully signed and ready for broadcast.</source>
+        <translation type="unfinished">交易已经完全签名，可以广播。</translation>
+    </message>
     <message>
         <source>Transaction status is unknown.</source>
         <translation type="unfinished">交易状态未知。</translation>
@@ -1914,6 +1981,10 @@ The migration process will create a backup of the wallet before migrating. This
         <source>Payment request error</source>
         <translation type="unfinished">支付请求出错</translation>
     </message>
+    <message>
+        <source>Cannot start bitcoin: click-to-pay handler</source>
+        <translation type="unfinished">无法启动 bitcoin: 协议的“一键支付”处理程序</translation>
+    </message>
     <message>
         <source>URI handling</source>
         <translation type="unfinished">URI 處理</translation>
@@ -1991,7 +2062,12 @@ If you are receiving this error you should request the merchant provide a BIP21
         <extracomment>An Inbound Connection from a Peer.</extracomment>
         <translation type="unfinished">進來</translation>
     </message>
-    </context>
+    <message>
+        <source>Outbound</source>
+        <extracomment>An Outbound Connection to a Peer.</extracomment>
+        <translation type="unfinished">傳出</translation>
+    </message>
+</context>
 <context>
     <name>QRImageWidget</name>
     <message>
@@ -2158,10 +2234,6 @@ If you are receiving this error you should request the merchant provide a BIP21
         <source>Transaction Relay</source>
         <translation type="unfinished">交易转发</translation>
     </message>
-    <message>
-        <source>Starting Block</source>
-        <translation type="unfinished">起步区块</translation>
-    </message>
     <message>
         <source>Synced Headers</source>
         <translation type="unfinished">已同步前導資料</translation>
@@ -2444,10 +2516,6 @@ If you are receiving this error you should request the merchant provide a BIP21
         <source>Network activity disabled</source>
         <translation type="unfinished">网络活动已禁用</translation>
     </message>
-    <message>
-        <source>None</source>
-        <translation type="unfinished">无</translation>
-    </message>
     <message>
         <source>Executing command without any wallet</source>
         <translation type="unfinished">不使用任何钱包执行命令</translation>
@@ -2695,10 +2763,6 @@ For more information on using this console, type %6.
 </context>
 <context>
     <name>RecentRequestsTableModel</name>
-    <message>
-        <source>Date</source>
-        <translation type="unfinished">日期</translation>
-    </message>
     <message>
         <source>Label</source>
         <translation type="unfinished">标签</translation>
@@ -3020,10 +3084,6 @@ Note:  Since the fee is calculated on a per-byte basis, a fee rate of "100 satos
         <source>The amount exceeds your balance.</source>
         <translation type="unfinished">金额超出您的余额。</translation>
     </message>
-    <message>
-        <source>The total exceeds your balance when the %1 transaction fee is included.</source>
-        <translation type="unfinished">计入 %1 手续费后，金额超出了您的余额。</translation>
-    </message>
     <message>
         <source>Duplicate address found: addresses should only be used once each.</source>
         <translation type="unfinished">发现重复地址:每个地址应该只使用一次。</translation>
@@ -3651,6 +3711,10 @@ Note:  Since the fee is calculated on a per-byte basis, a fee rate of "100 satos
         <extracomment>Expanded name of the CSV file format. See: https://en.wikipedia.org/wiki/Comma-separated_values.</extracomment>
         <translation type="unfinished">逗號分隔文件</translation>
     </message>
+    <message>
+        <source>Confirmed</source>
+        <translation type="unfinished">已確認</translation>
+    </message>
     <message>
         <source>Date</source>
         <translation type="unfinished">日期</translation>
@@ -3967,10 +4031,6 @@ Go to File &gt; Open Wallet to load a wallet.
         <source>Warning: Private keys detected in wallet {%s} with disabled private keys</source>
         <translation type="unfinished">警告：在已经禁用私钥的钱包 {%s} 中仍然检测到私钥</translation>
     </message>
-    <message>
-        <source>Warning: We do not appear to fully agree with our peers! You may need to upgrade, or other nodes may need to upgrade.</source>
-        <translation type="unfinished">警告：我们和其他节点似乎没达成共识！您可能需要升级，或者就是其他节点可能需要升级。</translation>
-    </message>
     <message>
         <source>Witness data for blocks after height %d requires validation. Please restart with -reindex.</source>
         <translation type="unfinished">需要验证高度在%d之后的区块见证数据。请使用 -reindex 重新启动。</translation>
@@ -4051,14 +4111,6 @@ Go to File &gt; Open Wallet to load a wallet.
         <source>Option '-checkpoints' is set but checkpoints were removed. This option has no effect.</source>
         <translation type="unfinished">选项“-checkpoints”已设置，但检查点已被移除。该选项不再生效。 </translation>
     </message>
-    <message>
-        <source>Option '-maxorphantx' is set but no longer has any effect (see release notes). Please remove it from your configuration.</source>
-        <translation type="unfinished">选项“-maxorphantx”已设置，但已不再生效（参见发行说明）。请从您的配置中移除该选项。 </translation>
-    </message>
-    <message>
-        <source>Options '-datacarrier' or '-datacarriersize' are set but are marked as deprecated. They will be removed in a future version.</source>
-        <translation type="unfinished">选项“-datacarrier”或“-datacarriersize”已设置，但已标记为弃用。它们将在未来版本中移除。 </translation>
-    </message>
     <message>
         <source>Outbound connections restricted to CJDNS (-onlynet=cjdns) but -cjdnsreachable is not provided</source>
         <translation type="unfinished">传出连接被限制为仅使用CJDNS (-onlynet=cjdns) ，但却未提供 -cjdnsreachable 参数。</translation>
@@ -4117,10 +4169,6 @@ Unable to restore backup of wallet.</source>
         <translation type="unfinished">
 无法还原钱包备份</translation>
     </message>
-    <message>
-        <source>-paytxfee is deprecated and will be fully removed in v31.0.</source>
-        <translation type="unfinished">“-paytxfee”已弃用，并将在 v31.0 中完全移除。 </translation>
-    </message>
     <message>
         <source>A fatal internal error occurred, see debug.log for details: </source>
         <translation type="unfinished">發生致命的內部錯誤，有關詳情請查看 debug.log：</translation>
@@ -4130,8 +4178,12 @@ Unable to restore backup of wallet.</source>
         <translation type="unfinished">区块验证已中断</translation>
     </message>
     <message>
-        <source>Cannot add WalletDescriptor to a non-descriptor wallet</source>
-        <translation type="unfinished">无法将钱包描述符添加到非描述符钱包。</translation>
+        <source>Can't spend unconfirmed version %d pre-selected input with a version 3 tx</source>
+        <translation type="unfinished">无法使用版本3交易花费未确认版本1%d的预选输入。</translation>
+    </message>
+    <message>
+        <source>Can't spend unconfirmed version 3 pre-selected input with a version %d tx</source>
+        <translation type="unfinished">无法使用版本1%d交易花费未确认版本3的预选输入。</translation>
     </message>
     <message>
         <source>Cannot write to directory '%s'; check permissions.</source>
@@ -4177,10 +4229,6 @@ Unable to restore backup of wallet.</source>
         <source>Dump file %s does not exist.</source>
         <translation type="unfinished">转储文件 %s 不存在</translation>
     </message>
-    <message>
-        <source>Error creating %s</source>
-        <translation type="unfinished">创建%s时出错</translation>
-    </message>
     <message>
         <source>Error initializing block database</source>
         <translation type="unfinished">初始化区块数据库时出错</translation>
@@ -4189,10 +4237,6 @@ Unable to restore backup of wallet.</source>
         <source>Error loading %s</source>
         <translation type="unfinished">載入檔案 %s 時發生錯誤</translation>
     </message>
-    <message>
-        <source>Error loading %s: Private keys can only be disabled during creation</source>
-        <translation type="unfinished">載入 %s 時發生錯誤: 只有在造新錢包時能夠指定不允許私鑰</translation>
-    </message>
     <message>
         <source>Error loading %s: Wallet corrupted</source>
         <translation type="unfinished">載入檔案 %s 時發生錯誤: 錢包損毀了</translation>
@@ -4353,10 +4397,6 @@ Unable to restore backup of wallet.</source>
         <source>Failed to write block.</source>
         <translation type="unfinished">寫入區塊失敗。</translation>
     </message>
-    <message>
-        <source>Failed to write to block index database.</source>
-        <translation type="unfinished">寫入區塊索引資料庫失敗。</translation>
-    </message>
     <message>
         <source>Failure removing transaction: %s</source>
         <translation type="unfinished">%s删除交易时失败: </translation>
@@ -4397,14 +4437,14 @@ Unable to restore backup of wallet.</source>
         <source>Invalid P2P permission: '%s'</source>
         <translation type="unfinished">无效的 P2P 权限：'%s'</translation>
     </message>
-    <message>
-        <source>Invalid amount for %s=&lt;amount&gt;: '%s' (must be at least %s)</source>
-        <translation type="unfinished">%s=&lt;amount&gt;: '%s' 中指定了非法的金额 (必须至少达到 %s)</translation>
-    </message>
     <message>
         <source>Invalid amount for %s=&lt;amount&gt;: '%s'</source>
         <translation type="unfinished">%s=&lt;amount&gt;: '%s' 中指定了非法的金额</translation>
     </message>
+    <message>
+        <source>Creating wallet…</source>
+        <translation type="unfinished">創建錢包...</translation>
+    </message>
     <message>
         <source>Invalid amount for -%s=&lt;amount&gt;: '%s'</source>
         <translation type="unfinished">参数 -%s=&lt;amount&gt;: '%s' 指定了无效的金额</translation>
@@ -4505,6 +4545,10 @@ Unable to restore backup of wallet.</source>
         <source>Starting network threads…</source>
         <translation type="unfinished">正在開始網路線程...</translation>
     </message>
+    <message>
+        <source>The %s path uses exFAT, which is known to have intermittent corruption problems on macOS. Move this directory to a different filesystem to avoid data loss.</source>
+        <translation type="unfinished">%s路径使用exFAT，该格式在macOS上已知会出现间歇性损坏问题。请将此目录移动到其他文件系统以避免数据丢失。</translation>
+    </message>
     <message>
         <source>The source code is available from %s.</source>
         <translation type="unfinished">可以从 %s 获取源代码。</translation>
diff --git a/src/qt/locale/bitcoin_zh.ts b/src/qt/locale/bitcoin_zh.ts
new file mode 100644
index 000000000000..8f3199526139
--- /dev/null
+++ b/src/qt/locale/bitcoin_zh.ts
@@ -0,0 +1,1264 @@
+<TS version="2.1" language="zh">
+<context>
+    <name>AddressBookPage</name>
+    <message>
+        <source>&amp;Copy</source>
+        <translation type="unfinished">复制(&amp;C)</translation>
+    </message>
+    <message>
+        <source>C&amp;lose</source>
+        <translation type="unfinished">关闭(&amp;L)</translation>
+    </message>
+    <message>
+        <source>Delete the currently selected address from the list</source>
+        <translation type="unfinished">从列表中删除当前已选地址</translation>
+    </message>
+    <message>
+        <source>Enter address or label to search</source>
+        <translation type="unfinished">输入要搜索的地址或标签</translation>
+    </message>
+    <message>
+        <source>Copy the currently selected address to the clipboard</source>
+        <translation type="unfinished">复制当前选中的地址到剪贴板。</translation>
+    </message>
+    <message>
+        <source>These are your Bitcoin addresses for receiving payments. Use the 'Create new receiving address' button in the receive tab to create new addresses.
+Signing is only possible with addresses of the type 'legacy'.</source>
+        <translation type="unfinished">这些是您用于接收付款的比特币地址。使用“接收”选项卡中的“创建新接收地址”按钮来创建新地址。仅能使用“legacy”类型的地址进行签名。</translation>
+    </message>
+    </context>
+<context>
+    <name>QObject</name>
+    <message>
+        <source>N/A</source>
+        <translation type="unfinished">不可用</translation>
+    </message>
+    <message numerus="yes">
+        <source>%n second(s)</source>
+        <translation type="unfinished">
+            <numerusform>%n秒</numerusform>
+        </translation>
+    </message>
+    <message numerus="yes">
+        <source>%n minute(s)</source>
+        <translation type="unfinished">
+            <numerusform>%n分钟</numerusform>
+        </translation>
+    </message>
+    <message numerus="yes">
+        <source>%n hour(s)</source>
+        <translation type="unfinished">
+            <numerusform>%n 小时</numerusform>
+        </translation>
+    </message>
+    <message numerus="yes">
+        <source>%n day(s)</source>
+        <translation type="unfinished">
+            <numerusform>%n 天</numerusform>
+        </translation>
+    </message>
+    <message numerus="yes">
+        <source>%n week(s)</source>
+        <translation type="unfinished">
+            <numerusform>%n 周</numerusform>
+        </translation>
+    </message>
+    <message numerus="yes">
+        <source>%n year(s)</source>
+        <translation type="unfinished">
+            <numerusform>%n年</numerusform>
+        </translation>
+    </message>
+    <message>
+        <source>%1 MB</source>
+        <translation type="unfinished">%1 MB (百萬位元組)</translation>
+    </message>
+    <message>
+        <source>%1 GB</source>
+        <translation type="unfinished">%1 GB (十億位元組)</translation>
+    </message>
+    </context>
+<context>
+    <name>BitcoinGUI</name>
+    <message>
+        <source>Request payments (generates QR codes and bitcoin: URIs)</source>
+        <translation type="unfinished">请求支付(生成二维码和比特币链接)</translation>
+    </message>
+    <message>
+        <source>Show the list of used sending addresses and labels</source>
+        <translation type="unfinished">显示使用过的发送地址或标签的列表</translation>
+    </message>
+    <message>
+        <source>Show the list of used receiving addresses and labels</source>
+        <translation type="unfinished">显示使用接收的地址或标签的列表</translation>
+    </message>
+    <message>
+        <source>&amp;Command-line options</source>
+        <translation type="unfinished">&amp;命令行选项</translation>
+    </message>
+    <message numerus="yes">
+        <source>Processed %n block(s) of transaction history.</source>
+        <translation type="unfinished">
+            <numerusform>交易历史区块被通过%n</numerusform>
+        </translation>
+    </message>
+    <message>
+        <source>Load Partially Signed Bitcoin Transaction</source>
+        <translation type="unfinished">加载部分签名比特币交易（PSBT）</translation>
+    </message>
+    <message>
+        <source>No wallets available</source>
+        <translation type="unfinished">无可用钱包</translation>
+    </message>
+    <message>
+        <source>Wallet Data</source>
+        <extracomment>Name of the wallet data file format.</extracomment>
+        <translation type="unfinished">錢包資料</translation>
+    </message>
+    <message>
+        <source>Load Wallet Backup</source>
+        <extracomment>The title for Restore Wallet File Windows</extracomment>
+        <translation type="unfinished">載入錢包備份</translation>
+    </message>
+    <message>
+        <source>Restore Wallet</source>
+        <extracomment>Title of pop-up window shown when the user is attempting to restore a wallet.</extracomment>
+        <translation type="unfinished">恢復錢包</translation>
+    </message>
+    <message>
+        <source>Wallet Name</source>
+        <extracomment>Label of the input field where the name of the wallet is entered.</extracomment>
+        <translation type="unfinished">錢包名稱</translation>
+    </message>
+    <message>
+        <source>Invalid Wallet Name</source>
+        <translation type="unfinished">無效的錢包名稱</translation>
+    </message>
+    <message>
+        <source>Wallet name cannot be empty</source>
+        <translation type="unfinished">錢包名稱不能為空白</translation>
+    </message>
+    <message>
+        <source>Restore and Migrate Wallet Backup</source>
+        <translation type="unfinished">恢復及遷移錢包備份</translation>
+    </message>
+    <message>
+        <source>Restore and Migrate Wallet</source>
+        <extracomment>Title of pop-up window shown when the user is attempting to restore a wallet.</extracomment>
+        <translation type="unfinished">恢復及遷移錢包</translation>
+    </message>
+    <message numerus="yes">
+        <source>%n active connection(s) to Bitcoin network.</source>
+        <extracomment>A substring of the tooltip.</extracomment>
+        <translation type="unfinished">
+            <numerusform>%n active connection(s) to Bitcoin network.</numerusform>
+        </translation>
+    </message>
+    <message>
+        <source>Date: %1
+</source>
+        <translation type="unfinished">日期: %1
+</translation>
+    </message>
+    <message>
+        <source>Amount: %1
+</source>
+        <translation type="unfinished">金額: %1
+</translation>
+    </message>
+    <message>
+        <source>Wallet: %1
+</source>
+        <translation type="unfinished">錢包: %1
+</translation>
+    </message>
+    <message>
+        <source>Type: %1
+</source>
+        <translation type="unfinished">種類: %1
+</translation>
+    </message>
+    <message>
+        <source>Label: %1
+</source>
+        <translation type="unfinished">標記: %1
+</translation>
+    </message>
+    <message>
+        <source>Address: %1
+</source>
+        <translation type="unfinished">地址: %1
+</translation>
+    </message>
+    <message>
+        <source>Sent transaction</source>
+        <translation type="unfinished">送出交易</translation>
+    </message>
+    <message>
+        <source>Incoming transaction</source>
+        <translation type="unfinished">收款交易</translation>
+    </message>
+    <message>
+        <source>Wallet is &lt;b&gt;encrypted&lt;/b&gt; and currently &lt;b&gt;unlocked&lt;/b&gt;</source>
+        <translation type="unfinished">錢包&lt;b&gt;已加密&lt;/b&gt;並且&lt;b&gt;解鎖中&lt;/b&gt;</translation>
+    </message>
+    <message>
+        <source>Wallet is &lt;b&gt;encrypted&lt;/b&gt; and currently &lt;b&gt;locked&lt;/b&gt;</source>
+        <translation type="unfinished">錢包&lt;b&gt;已加密&lt;/b&gt;並且&lt;b&gt;上鎖中&lt;/b&gt;</translation>
+    </message>
+    </context>
+<context>
+    <name>CoinControlDialog</name>
+    <message>
+        <source>Copy amount</source>
+        <translation type="unfinished">复制金额</translation>
+    </message>
+    <message>
+        <source>&amp;Copy address</source>
+        <translation type="unfinished">&amp;複製地址</translation>
+    </message>
+    <message>
+        <source>Copy &amp;label</source>
+        <translation type="unfinished">複製 &amp;label</translation>
+    </message>
+    <message>
+        <source>Copy &amp;amount</source>
+        <translation type="unfinished">複製金額 &amp;amount</translation>
+    </message>
+    <message>
+        <source>Copy transaction &amp;ID and output index</source>
+        <translation type="unfinished">複製交易&amp;ID與輸出序號</translation>
+    </message>
+    <message>
+        <source>L&amp;ock unspent</source>
+        <translation type="unfinished">锁定未花费(&amp;O)</translation>
+    </message>
+    <message>
+        <source>&amp;Unlock unspent</source>
+        <translation type="unfinished">解鎖未花費的</translation>
+    </message>
+    <message>
+        <source>Copy quantity</source>
+        <translation type="unfinished">复制数目</translation>
+    </message>
+    <message>
+        <source>Copy fee</source>
+        <translation type="unfinished">复制手续费</translation>
+    </message>
+    </context>
+<context>
+    <name>MigrateWalletActivity</name>
+    <message>
+        <source>Restore and Migrate wallet</source>
+        <translation type="unfinished">恢復及遷移錢包</translation>
+    </message>
+    <message>
+        <source>Are you sure you wish to restore the wallet file &lt;i&gt;%1&lt;/i&gt; to &lt;i&gt;%2&lt;/i&gt; and migrate it?</source>
+        <translation type="unfinished">您確定要恢復錢包檔案&lt;i&gt;%1&lt;/i&gt;到&lt;i&gt;%2&lt;/i&gt;及遷移它嗎？</translation>
+    </message>
+    </context>
+<context>
+    <name>CreateWalletDialog</name>
+    <message>
+        <source>Compiled without external signing support (required for external signing)</source>
+        <extracomment>"External signing" means using devices such as hardware wallets.</extracomment>
+        <translation type="unfinished">軟體未編譯外接簽證功能所需的軟體庫(外接簽證必須有此功能)</translation>
+    </message>
+</context>
+<context>
+    <name>EditAddressDialog</name>
+    <message>
+        <source>Edit Address</source>
+        <translation type="unfinished">编辑地址</translation>
+    </message>
+    <message>
+        <source>&amp;Label</source>
+        <translation type="unfinished">标签(&amp;L)</translation>
+    </message>
+    <message>
+        <source>The label associated with this address list entry</source>
+        <translation type="unfinished">与此地址关联的标签</translation>
+    </message>
+    <message>
+        <source>The address associated with this address list entry. This can only be modified for sending addresses.</source>
+        <translation type="unfinished">跟這個地址清單關聯的地址。只有發送地址能被修改。</translation>
+    </message>
+    <message>
+        <source>&amp;Address</source>
+        <translation type="unfinished">地址(&amp;A)</translation>
+    </message>
+    <message>
+        <source>New sending address</source>
+        <translation type="unfinished">新建付款地址</translation>
+    </message>
+    <message>
+        <source>Edit receiving address</source>
+        <translation type="unfinished">编辑收款地址</translation>
+    </message>
+    <message>
+        <source>Edit sending address</source>
+        <translation type="unfinished">编辑付款地址</translation>
+    </message>
+    <message>
+        <source>The entered address "%1" is not a valid Bitcoin address.</source>
+        <translation type="unfinished">输入的地址 %1 并不是有效的比特币地址。</translation>
+    </message>
+    <message>
+        <source>Address "%1" already exists as a receiving address with label "%2" and so cannot be added as a sending address.</source>
+        <translation type="unfinished">地址“%1”為已登記存在“%2”的地址，因此無法新增為發送地址。</translation>
+    </message>
+    <message>
+        <source>The entered address "%1" is already in the address book with label "%2".</source>
+        <translation type="unfinished">输入的地址“%1”已经存在于地址簿中，标签为“%2”。</translation>
+    </message>
+    <message>
+        <source>Could not unlock wallet.</source>
+        <translation type="unfinished">无法解锁钱包。</translation>
+    </message>
+    <message>
+        <source>New key generation failed.</source>
+        <translation type="unfinished">生成新密钥失败。</translation>
+    </message>
+</context>
+<context>
+    <name>Intro</name>
+    <message numerus="yes">
+        <source>%n GB of space available</source>
+        <translation type="unfinished">
+            <numerusform>%n GB of space available</numerusform>
+        </translation>
+    </message>
+    <message numerus="yes">
+        <source>(of %n GB needed)</source>
+        <translation type="unfinished">
+            <numerusform>(of %n GB needed)</numerusform>
+        </translation>
+    </message>
+    <message numerus="yes">
+        <source>(%n GB needed for full chain)</source>
+        <translation type="unfinished">
+            <numerusform>(%n GB needed for full chain)</numerusform>
+        </translation>
+    </message>
+    <message numerus="yes">
+        <source>(sufficient to restore backups %n day(s) old)</source>
+        <extracomment>Explanatory text on the capability of the current prune target.</extracomment>
+        <translation type="unfinished">
+            <numerusform>(sufficient to restore backups %n day(s) old)</numerusform>
+        </translation>
+    </message>
+    <message>
+        <source>Error</source>
+        <translation type="unfinished">错误</translation>
+    </message>
+</context>
+<context>
+    <name>OptionsDialog</name>
+    <message>
+        <source>Maximum database cache size. Make sure you have enough RAM. A larger cache can contribute to faster sync, after which the benefit is less pronounced for most use cases. Lowering the cache size will reduce memory usage. Unused mempool memory is shared for this cache.</source>
+        <extracomment>Tooltip text for Options window setting that sets the size of the database cache. Explains the corresponding effects of increasing/decreasing this value.</extracomment>
+        <translation type="unfinished">最大数据库缓存大小。确保您的系统有足够的RAM。较大的缓存可以帮助加快同步速度，但在大多数使用场景中，同步完成后其优势不再显著。减少缓存大小将降低内存使用。未使用的内存池内存将共享给此缓存。</translation>
+    </message>
+    <message>
+        <source>Automatically open the Bitcoin client port on the router. This only works when your router supports PCP or NAT-PMP and it is enabled. The external port could be random.</source>
+        <translation type="unfinished">自动在路由器上打开比特币客户端端口。仅当您的路由器支持PCP或NAT-PMP并且已启用时才有效。外部端口可能是随机的。</translation>
+    </message>
+    <message>
+        <source>Map port using PCP or NA&amp;T-PMP</source>
+        <translation type="unfinished">通过PCP或NA&amp;T-PMP映射端口。</translation>
+    </message>
+    <message>
+        <source>Compiled without external signing support (required for external signing)</source>
+        <extracomment>"External signing" means using devices such as hardware wallets.</extracomment>
+        <translation type="unfinished">軟體未編譯外接簽證功能所需的軟體庫(外接簽證必須有此功能)</translation>
+    </message>
+    </context>
+<context>
+    <name>PSBTOperationsDialog</name>
+    <message numerus="yes">
+        <source>Signed %n input(s), but more signatures are still required.</source>
+        <translation type="unfinished">
+            <numerusform />
+        </translation>
+    </message>
+    <message numerus="yes">
+        <source>Transaction has %n unsigned input(s).</source>
+        <translation type="unfinished">
+            <numerusform />
+        </translation>
+    </message>
+    </context>
+<context>
+    <name>QRImageWidget</name>
+    <message>
+        <source>&amp;Save Image…</source>
+        <translation type="unfinished">儲存圖片(&amp;S)...</translation>
+    </message>
+    <message>
+        <source>&amp;Copy Image</source>
+        <translation type="unfinished">复制图像(&amp;C)</translation>
+    </message>
+    <message>
+        <source>Resulting URI too long, try to reduce the text for label / message.</source>
+        <translation type="unfinished">URI 太長，請縮短標籤或訊息文字。</translation>
+    </message>
+    <message>
+        <source>Error encoding URI into QR Code.</source>
+        <translation type="unfinished">把 URI 编码成二维码时发生错误。</translation>
+    </message>
+    <message>
+        <source>QR code support not available.</source>
+        <translation type="unfinished">不支持二维码。</translation>
+    </message>
+    <message>
+        <source>Save QR Code</source>
+        <translation type="unfinished">保存二维码</translation>
+    </message>
+    <message>
+        <source>PNG Image</source>
+        <extracomment>Expanded name of the PNG file format. See: https://en.wikipedia.org/wiki/Portable_Network_Graphics.</extracomment>
+        <translation type="unfinished">PNG 圖</translation>
+    </message>
+</context>
+<context>
+    <name>RPCConsole</name>
+    <message>
+        <source>N/A</source>
+        <translation type="unfinished">不可用</translation>
+    </message>
+    <message>
+        <source>Client version</source>
+        <translation type="unfinished">客户端版本</translation>
+    </message>
+    <message>
+        <source>&amp;Information</source>
+        <translation type="unfinished">信息(&amp;I)</translation>
+    </message>
+    <message>
+        <source>General</source>
+        <translation type="unfinished">常规</translation>
+    </message>
+    <message>
+        <source>Datadir</source>
+        <translation type="unfinished">数据目录</translation>
+    </message>
+    <message>
+        <source>To specify a non-default location of the data directory use the '%1' option.</source>
+        <translation type="unfinished">如果不想用預設的資料目錄位置，請使用'%1' 這個選項來指定新的位置。</translation>
+    </message>
+    <message>
+        <source>Blocksdir</source>
+        <translation type="unfinished">區塊儲存目錄</translation>
+    </message>
+    <message>
+        <source>To specify a non-default location of the blocks directory use the '%1' option.</source>
+        <translation type="unfinished">如果要自訂區塊儲存目錄的位置，請使用 '%1' 這個選項來指定新的位置。</translation>
+    </message>
+    <message>
+        <source>Startup time</source>
+        <translation type="unfinished">启动时间</translation>
+    </message>
+    <message>
+        <source>Network</source>
+        <translation type="unfinished">网络</translation>
+    </message>
+    <message>
+        <source>Name</source>
+        <translation type="unfinished">名称</translation>
+    </message>
+    <message>
+        <source>Number of connections</source>
+        <translation type="unfinished">连接数</translation>
+    </message>
+    </context>
+<context>
+    <name>SendCoinsDialog</name>
+    <message>
+        <source>Copy amount</source>
+        <translation type="unfinished">复制金额</translation>
+    </message>
+    <message>
+        <source>Copy fee</source>
+        <translation type="unfinished">复制手续费</translation>
+    </message>
+    <message numerus="yes">
+        <source>Estimated to begin confirmation within %n block(s).</source>
+        <translation type="unfinished">
+            <numerusform>Estimated to begin confirmation within %n block(s).</numerusform>
+        </translation>
+    </message>
+    </context>
+<context>
+    <name>SignVerifyMessageDialog</name>
+    <message>
+        <source>Copy the current signature to the clipboard</source>
+        <translation type="unfinished">复制当前签名至剪贴板</translation>
+    </message>
+    </context>
+<context>
+    <name>TransactionDesc</name>
+    <message>
+        <source>Date</source>
+        <translation type="unfinished">日期</translation>
+    </message>
+    <message>
+        <source>label</source>
+        <translation type="unfinished">标签</translation>
+    </message>
+    <message>
+        <source>Credit</source>
+        <translation type="unfinished">收入</translation>
+    </message>
+    <message numerus="yes">
+        <source>matures in %n more block(s)</source>
+        <translation type="unfinished">
+            <numerusform>在%n个区块内成熟</numerusform>
+        </translation>
+    </message>
+    <message>
+        <source>not accepted</source>
+        <translation type="unfinished">未被接受</translation>
+    </message>
+    <message>
+        <source>Debit</source>
+        <translation type="unfinished">支出</translation>
+    </message>
+    <message>
+        <source>Total debit</source>
+        <translation type="unfinished">总支出</translation>
+    </message>
+    <message>
+        <source>Total credit</source>
+        <translation type="unfinished">总收入</translation>
+    </message>
+    <message>
+        <source>Transaction fee</source>
+        <translation type="unfinished">交易手续费</translation>
+    </message>
+    <message>
+        <source>Net amount</source>
+        <translation type="unfinished">净额</translation>
+    </message>
+    <message>
+        <source>Message</source>
+        <translation type="unfinished">消息</translation>
+    </message>
+    <message>
+        <source>Comment</source>
+        <translation type="unfinished">备注</translation>
+    </message>
+    <message>
+        <source>Transaction ID</source>
+        <translation type="unfinished">交易 ID</translation>
+    </message>
+    <message>
+        <source>Transaction total size</source>
+        <translation type="unfinished">交易总大小</translation>
+    </message>
+    <message>
+        <source>Transaction virtual size</source>
+        <translation type="unfinished">交易虚拟大小</translation>
+    </message>
+    <message>
+        <source>Output index</source>
+        <translation type="unfinished">输出索引</translation>
+    </message>
+    <message>
+        <source>%1 (Certificate was not verified)</source>
+        <translation type="unfinished">%1（证书未被验证）</translation>
+    </message>
+    <message>
+        <source>Merchant</source>
+        <translation type="unfinished">商家</translation>
+    </message>
+    <message>
+        <source>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.</source>
+        <translation type="unfinished">新挖出的比特币在可以使用前必须经过 %1 个区块确认的成熟过程。当您挖出此区块后，它将被广播到网络中以加入区块链。如果它未成功进入区块链，其状态将变更为“不接受”并且不可使用。这可能偶尔会发生，在另一个节点比你早几秒钟成功挖出一个区块时就会这样。</translation>
+    </message>
+    <message>
+        <source>Debug information</source>
+        <translation type="unfinished">调试信息</translation>
+    </message>
+    <message>
+        <source>Transaction</source>
+        <translation type="unfinished">交易</translation>
+    </message>
+    <message>
+        <source>Inputs</source>
+        <translation type="unfinished">输入</translation>
+    </message>
+    <message>
+        <source>Amount</source>
+        <translation type="unfinished">金额</translation>
+    </message>
+    <message>
+        <source>true</source>
+        <translation type="unfinished">是</translation>
+    </message>
+    <message>
+        <source>false</source>
+        <translation type="unfinished">否</translation>
+    </message>
+</context>
+<context>
+    <name>TransactionDescDialog</name>
+    <message>
+        <source>This pane shows a detailed description of the transaction</source>
+        <translation type="unfinished">当前面板显示了交易的详细信息</translation>
+    </message>
+    <message>
+        <source>Details for %1</source>
+        <translation type="unfinished">%1 详情</translation>
+    </message>
+</context>
+<context>
+    <name>TransactionTableModel</name>
+    <message>
+        <source>Date</source>
+        <translation type="unfinished">日期</translation>
+    </message>
+    <message>
+        <source>Type</source>
+        <translation type="unfinished">类型</translation>
+    </message>
+    <message>
+        <source>Label</source>
+        <translation type="unfinished">标签</translation>
+    </message>
+    <message>
+        <source>Unconfirmed</source>
+        <translation type="unfinished">未确认</translation>
+    </message>
+    <message>
+        <source>Abandoned</source>
+        <translation type="unfinished">已丢弃</translation>
+    </message>
+    <message>
+        <source>Confirming (%1 of %2 recommended confirmations)</source>
+        <translation type="unfinished">确认中 (推荐 %2个确认，已经有 %1个确认)</translation>
+    </message>
+    <message>
+        <source>Confirmed (%1 confirmations)</source>
+        <translation type="unfinished">已确认 (%1 个确认)</translation>
+    </message>
+    <message>
+        <source>Conflicted</source>
+        <translation type="unfinished">有冲突</translation>
+    </message>
+    <message>
+        <source>Immature (%1 confirmations, will be available after %2)</source>
+        <translation type="unfinished">未成熟 (%1 个确认，将在 %2 个后可用)</translation>
+    </message>
+    <message>
+        <source>Generated but not accepted</source>
+        <translation type="unfinished">已生成但未被接受</translation>
+    </message>
+    <message>
+        <source>Received with</source>
+        <translation type="unfinished">接收到</translation>
+    </message>
+    <message>
+        <source>Received from</source>
+        <translation type="unfinished">接收自</translation>
+    </message>
+    <message>
+        <source>Sent to</source>
+        <translation type="unfinished">发送到</translation>
+    </message>
+    <message>
+        <source>Mined</source>
+        <translation type="unfinished">挖矿所得</translation>
+    </message>
+    <message>
+        <source>(n/a)</source>
+        <translation type="unfinished">(不可用)</translation>
+    </message>
+    <message>
+        <source>Transaction status. Hover over this field to show number of confirmations.</source>
+        <translation type="unfinished">交易状态。 鼠标移到此区域可显示确认数。</translation>
+    </message>
+    <message>
+        <source>Date and time that the transaction was received.</source>
+        <translation type="unfinished">交易被接收的时间和日期。</translation>
+    </message>
+    <message>
+        <source>Type of transaction.</source>
+        <translation type="unfinished">交易类型。</translation>
+    </message>
+    <message>
+        <source>User-defined intent/purpose of the transaction.</source>
+        <translation type="unfinished">用户自定义的该交易的意图/目的。</translation>
+    </message>
+    <message>
+        <source>Amount removed from or added to balance.</source>
+        <translation type="unfinished">从余额增加或移除的金额。</translation>
+    </message>
+</context>
+<context>
+    <name>TransactionView</name>
+    <message>
+        <source>All</source>
+        <translation type="unfinished">全部</translation>
+    </message>
+    <message>
+        <source>Today</source>
+        <translation type="unfinished">今天</translation>
+    </message>
+    <message>
+        <source>This week</source>
+        <translation type="unfinished">本周</translation>
+    </message>
+    <message>
+        <source>This month</source>
+        <translation type="unfinished">本月</translation>
+    </message>
+    <message>
+        <source>Last month</source>
+        <translation type="unfinished">上个月</translation>
+    </message>
+    <message>
+        <source>This year</source>
+        <translation type="unfinished">今年</translation>
+    </message>
+    <message>
+        <source>Received with</source>
+        <translation type="unfinished">接收到</translation>
+    </message>
+    <message>
+        <source>Sent to</source>
+        <translation type="unfinished">发送到</translation>
+    </message>
+    <message>
+        <source>Mined</source>
+        <translation type="unfinished">挖矿所得</translation>
+    </message>
+    <message>
+        <source>Other</source>
+        <translation type="unfinished">其它</translation>
+    </message>
+    <message>
+        <source>Enter address, transaction id, or label to search</source>
+        <translation type="unfinished">输入地址、交易ID或标签进行搜索</translation>
+    </message>
+    <message>
+        <source>Min amount</source>
+        <translation type="unfinished">最小金额</translation>
+    </message>
+    <message>
+        <source>Range…</source>
+        <translation type="unfinished">范围...</translation>
+    </message>
+    <message>
+        <source>&amp;Copy address</source>
+        <translation type="unfinished">&amp;複製地址</translation>
+    </message>
+    <message>
+        <source>Copy &amp;label</source>
+        <translation type="unfinished">複製 &amp;label</translation>
+    </message>
+    <message>
+        <source>Copy &amp;amount</source>
+        <translation type="unfinished">複製金額 &amp;amount</translation>
+    </message>
+    <message>
+        <source>Copy transaction &amp;ID</source>
+        <translation type="unfinished">复制交易 &amp;ID</translation>
+    </message>
+    <message>
+        <source>Copy &amp;raw transaction</source>
+        <translation type="unfinished">複製交易(原始)</translation>
+    </message>
+    <message>
+        <source>Copy full transaction &amp;details</source>
+        <translation type="unfinished">複製完整交易明細</translation>
+    </message>
+    <message>
+        <source>&amp;Show transaction details</source>
+        <translation type="unfinished">顯示交易明細</translation>
+    </message>
+    <message>
+        <source>Increase transaction &amp;fee</source>
+        <translation type="unfinished">增加礦工費(&amp;fee)</translation>
+    </message>
+    <message>
+        <source>A&amp;bandon transaction</source>
+        <translation type="unfinished">放棄交易(&amp;b)</translation>
+    </message>
+    <message>
+        <source>&amp;Edit address label</source>
+        <translation type="unfinished">編輯地址標籤(&amp;E)</translation>
+    </message>
+    <message>
+        <source>Show in %1</source>
+        <extracomment>Transactions table context menu action to show the selected transaction in a third-party block explorer. %1 is a stand-in argument for the URL of the explorer.</extracomment>
+        <translation type="unfinished">在 %1中显示</translation>
+    </message>
+    <message>
+        <source>Export Transaction History</source>
+        <translation type="unfinished">导出交易历史</translation>
+    </message>
+    <message>
+        <source>Comma separated file</source>
+        <extracomment>Expanded name of the CSV file format. See: https://en.wikipedia.org/wiki/Comma-separated_values.</extracomment>
+        <translation type="unfinished">逗号分隔文件</translation>
+    </message>
+    <message>
+        <source>Confirmed</source>
+        <translation type="unfinished">已確認</translation>
+    </message>
+    <message>
+        <source>Date</source>
+        <translation type="unfinished">日期</translation>
+    </message>
+    <message>
+        <source>Type</source>
+        <translation type="unfinished">类型</translation>
+    </message>
+    <message>
+        <source>ID</source>
+        <translation type="unfinished">識別碼</translation>
+    </message>
+    <message>
+        <source>Exporting Failed</source>
+        <translation type="unfinished">导出失败</translation>
+    </message>
+    <message>
+        <source>There was an error trying to save the transaction history to %1.</source>
+        <translation type="unfinished">尝试把交易历史保存到 %1 时发生了错误。</translation>
+    </message>
+    <message>
+        <source>Exporting Successful</source>
+        <translation type="unfinished">导出成功</translation>
+    </message>
+    <message>
+        <source>The transaction history was successfully saved to %1.</source>
+        <translation type="unfinished">已成功将交易历史保存到 %1。</translation>
+    </message>
+    <message>
+        <source>Range:</source>
+        <translation type="unfinished">范围:</translation>
+    </message>
+    <message>
+        <source>to</source>
+        <translation type="unfinished">到</translation>
+    </message>
+</context>
+<context>
+    <name>WalletFrame</name>
+    <message>
+        <source>No wallet has been loaded.
+Go to File &gt; Open Wallet to load a wallet.
+- OR -</source>
+        <translation type="unfinished">未加载钱包。
+请转到“文件”菜单 &gt; “打开钱包”来加载一个钱包。
+- 或者 -</translation>
+    </message>
+    <message>
+        <source>Error</source>
+        <translation type="unfinished">错误</translation>
+    </message>
+    <message>
+        <source>Unable to decode PSBT from clipboard (invalid base64)</source>
+        <translation type="unfinished">无法从剪贴板解码PSBT(Base64值无效)</translation>
+    </message>
+    <message>
+        <source>Load Transaction Data</source>
+        <translation type="unfinished">加载交易数据</translation>
+    </message>
+    <message>
+        <source>Partially Signed Transaction (*.psbt)</source>
+        <translation type="unfinished">部分签名交易 (*.psbt)</translation>
+    </message>
+    <message>
+        <source>PSBT file must be smaller than 100 MiB</source>
+        <translation type="unfinished">PSBT文件必须小于100MiB</translation>
+    </message>
+    <message>
+        <source>Unable to decode PSBT</source>
+        <translation type="unfinished">无法解码PSBT</translation>
+    </message>
+</context>
+<context>
+    <name>WalletModel</name>
+    <message>
+        <source>Fee bump error</source>
+        <translation type="unfinished">追加手续费出错</translation>
+    </message>
+    <message>
+        <source>Increasing transaction fee failed</source>
+        <translation type="unfinished">追加交易手续费失败</translation>
+    </message>
+    <message>
+        <source>Do you want to increase the fee?</source>
+        <extracomment>Asks a user if they would like to manually increase the fee of a transaction that has already been created.</extracomment>
+        <translation type="unfinished">您想追加手续费吗？</translation>
+    </message>
+    <message>
+        <source>Current fee:</source>
+        <translation type="unfinished">当前手续费:</translation>
+    </message>
+    <message>
+        <source>Increase:</source>
+        <translation type="unfinished">增加量:</translation>
+    </message>
+    <message>
+        <source>New fee:</source>
+        <translation type="unfinished">新交易费:</translation>
+    </message>
+    <message>
+        <source>Warning: This may pay the additional fee by reducing change outputs or adding inputs, when necessary. It may add a new change output if one does not already exist. These changes may potentially leak privacy.</source>
+        <translation type="unfinished">警告: 因為在必要的時候會減少找零輸出個數或增加輸入個數，這可能要付出額外的費用。 在沒有找零輸出的情況下可能會新增一個。 這些變更可能會導致潛在的隱私洩漏。</translation>
+    </message>
+    <message>
+        <source>Confirm fee bump</source>
+        <translation type="unfinished">确认手续费追加</translation>
+    </message>
+    <message>
+        <source>Can't draft transaction.</source>
+        <translation type="unfinished">无法起草交易。</translation>
+    </message>
+    <message>
+        <source>PSBT copied</source>
+        <translation type="unfinished">PSBT已複製</translation>
+    </message>
+    <message>
+        <source>Can't sign transaction.</source>
+        <translation type="unfinished">无法签名交易</translation>
+    </message>
+    <message>
+        <source>Could not commit transaction</source>
+        <translation type="unfinished">无法提交交易</translation>
+    </message>
+    <message>
+        <source>Can't display address</source>
+        <translation type="unfinished">無法顯示錢包位址</translation>
+    </message>
+</context>
+<context>
+    <name>bitcoin-core</name>
+    <message>
+        <source>%s failed to validate the -assumeutxo snapshot state. This indicates a hardware problem, or a bug in the software, or a bad software modification that allowed an invalid snapshot to be loaded. As a result of this, the node will shut down and stop using any state that was built on the snapshot, resetting the chain height from %d to %d. On the next restart, the node will resume syncing from %d without using any snapshot data. Please report this incident to %s, including how you obtained the snapshot. The invalid snapshot chainstate will be left on disk in case it is helpful in diagnosing the issue that caused this error.</source>
+        <translation type="unfinished">%s 验证 -assumeutxo 快照状态失败。这表明硬件可能有问题，也可能是软件bug，或者还可能是软件被不当修改、从而让非法快照也能够被加载。因此，将关闭节点并停止使用从这个快照构建出的任何状态，并将链高度从 %d 重置到 %d 。下次启动时，节点将会不使用快照数据从 %d 继续同步。请将这个事件报告给 %s 并在报告中包括您是如何获得这份快照的。无效的链状态快照仍被保存至磁盘上，以供诊断问题的原因。</translation>
+    </message>
+    <message>
+        <source>%s request to listen on port %u. This port is considered "bad" and thus it is unlikely that any peer will connect to it. See doc/p2p-bad-ports.md for details and a full list.</source>
+        <translation type="unfinished">%s请求监听端口%u。此端口被认为是“坏的”，所以不太可能有其他节点会连接过来。详情以及完整的端口列表请参见 doc/p2p-bad-ports.md 。</translation>
+    </message>
+    <message>
+        <source>Disk space for %s may not accommodate the block files. Approximately %u GB of data will be stored in this directory.</source>
+        <translation type="unfinished">%s的磁盘空间可能无法容纳区块文件。大约要在这个目录中储存 %uGB 的数据。</translation>
+    </message>
+    <message>
+        <source>Distributed under the MIT software license, see the accompanying file %s or %s</source>
+        <translation type="unfinished">在MIT协议下分发，参见附带的 %s 或 %s 文件</translation>
+    </message>
+    <message>
+        <source>Error loading wallet. Wallet requires blocks to be downloaded, and software does not currently support loading wallets while blocks are being downloaded out of order when using assumeutxo snapshots. Wallet should be able to load successfully after node sync reaches height %s</source>
+        <translation type="unfinished">加载钱包时出错。需要下载区块才能加载钱包，而且在使用assumeutxo快照时，下载区块是不按顺序的，这个时候软件不支持加载钱包。在节点同步至高度%s之后就应该可以加载钱包了。</translation>
+    </message>
+    <message>
+        <source>Error reading %s! Transaction data may be missing or incorrect. Rescanning wallet.</source>
+        <translation type="unfinished">读取%s出错！交易数据可能丢失或有误。重新扫描钱包中。</translation>
+    </message>
+    <message>
+        <source>Error starting/committing db txn for wallet transactions removal process</source>
+        <translation type="unfinished">错误：启动/提交数据库事务时出错，导致钱包交易移除过程失败。</translation>
+    </message>
+    <message>
+        <source>Error: Dumpfile format record is incorrect. Got "%s", expected "format".</source>
+        <translation type="unfinished">錯誤: 轉儲文件格式不正確。 得到是"%s"，而預期本應得到的是 "format"。</translation>
+    </message>
+    <message>
+        <source>Error: Dumpfile identifier record is incorrect. Got "%s", expected "%s".</source>
+        <translation type="unfinished">
+錯誤：轉存檔案識別記錄不正確。獲得%s，預期
+%s。</translation>
+    </message>
+    <message>
+        <source>Error: Dumpfile version is not supported. This version of bitcoin-wallet only supports version 1 dumpfiles. Got dumpfile with version %s</source>
+        <translation type="unfinished">錯誤: 轉儲文件版本不支援。 這個版本的 bitcoin-wallet 只支援版本為 1 的轉儲檔案。 得到的轉儲文件版本是%s</translation>
+    </message>
+    <message>
+        <source>Error: Unable to produce descriptors for this legacy wallet. Make sure to provide the wallet's passphrase if it is encrypted.</source>
+        <translation type="unfinished">错误: 无法为该旧式钱包生成描述符。如果钱包已被加密，请确保提供的钱包加密密码正确。</translation>
+    </message>
+    <message>
+        <source>File %s already exists. If you are sure this is what you want, move it out of the way first.</source>
+        <translation type="unfinished">檔案%s已經存在。 如果你確定這就是你想做的，先把這份檔案移開。</translation>
+    </message>
+    <message>
+        <source>Invalid or corrupt peers.dat (%s). If you believe this is a bug, please report it to %s. As a workaround, you can move the file (%s) out of the way (rename, move, or delete) to have a new one created on the next start.</source>
+        <translation type="unfinished">无效或损坏的peers.dat (%s)。如果你确信这是一个bug，请反馈到%s。作为变通办法，你可以把现有文件 (%s) 移开(重命名、移动或删除)，这样就可以在下次启动时创建一个新文件了。</translation>
+    </message>
+    <message>
+        <source>Invalid value detected for '-wallet' or '-nowallet'. '-wallet' requires a string value, while '-nowallet' accepts only '1' to disable all wallets</source>
+        <translation type="unfinished">检测到‘-wallet’或‘-nowallet’的无效值。‘-wallet’需要一个字符串值，而‘-nowallet’只能接受‘1’来禁用所有钱包。</translation>
+    </message>
+    <message>
+        <source>More than one onion bind address is provided. Using %s for the automatically created Tor onion service.</source>
+        <translation type="unfinished">提供多數TOR路由綁定位址。 對自動建立的Tor服務用%s</translation>
+    </message>
+    <message>
+        <source>No dump file provided. To use createfromdump, -dumpfile=&lt;filename&gt; must be provided.</source>
+        <translation type="unfinished">沒有提供轉儲文件。 要使用 createfromdump ，必須提供 -dumpfile=&lt;filename&gt;。</translation>
+    </message>
+    <message>
+        <source>No dump file provided. To use dump, -dumpfile=&lt;filename&gt; must be provided.</source>
+        <translation type="unfinished">沒有提供轉儲文件。 要使用 dump ，必須提供 -dumpfile=&lt;filename&gt;。</translation>
+    </message>
+    <message>
+        <source>Prune mode is incompatible with -reindex-chainstate. Use full -reindex instead.</source>
+        <translation type="unfinished">修剪模式与 -reindex-chainstate 不兼容。请进行一次完整的 -reindex 。</translation>
+    </message>
+    <message>
+        <source>Cannot obtain a lock on directory %s. %s is probably already running.</source>
+        <translation type="unfinished">无法锁定目录 %s。%s 可能已经在运行。</translation>
+    </message>
+    <message>
+        <source>Cannot provide specific connections and have addrman find outgoing connections at the same time.</source>
+        <translation type="unfinished">在使用地址管理器(addrman)寻找出站连接时，无法同时提供特定的连接。</translation>
+    </message>
+    <message>
+        <source>Error loading %s: External signer wallet being loaded without external signer support compiled</source>
+        <translation type="unfinished">加载%s时出错: 编译时未启用外部签名器支持，却仍然试图加载外部签名器钱包</translation>
+    </message>
+    <message>
+        <source>Error: Address book data in wallet cannot be identified to belong to migrated wallets</source>
+        <translation type="unfinished">错误：钱包中的地址簿数据无法被识别为属于迁移后的钱包</translation>
+    </message>
+    <message>
+        <source>Error: Duplicate descriptors created during migration. Your wallet may be corrupted.</source>
+        <translation type="unfinished">错误：迁移过程中创建了重复的输出描述符。你的钱包可能已损坏。</translation>
+    </message>
+    <message>
+        <source>Error: Transaction %s in wallet cannot be identified to belong to migrated wallets</source>
+        <translation type="unfinished">错误：钱包中的交易%s无法被识别为属于迁移后的钱包</translation>
+    </message>
+    <message>
+        <source>Incompatible options: -dnsseed=1 was explicitly specified, but -onlynet forbids connections to IPv4/IPv6</source>
+        <translation type="unfinished">互不兼容的选项：-dnsseed=1 已被显式指定，但 -onlynet 禁止了IPv4/IPv6 连接</translation>
+    </message>
+    <message>
+        <source>Invalid amount for %s=&lt;amount&gt;: '%s' (must be at least the minrelay fee of %s to prevent stuck transactions)</source>
+        <translation type="unfinished">%s=&lt;amount&gt;: '%s' 中指定了非法的金额 (手续费必须至少达到最小转发费率(minrelay fee) %s 以避免交易卡着发不出去)</translation>
+    </message>
+    <message>
+        <source>Option '-checkpoints' is set but checkpoints were removed. This option has no effect.</source>
+        <translation type="unfinished">选项“-checkpoints”已设置，但检查点已被移除。该选项不再生效。 </translation>
+    </message>
+    <message>
+        <source>Prune: last wallet synchronisation goes beyond pruned data. You need to -reindex (download the whole blockchain again in case of a pruned node)</source>
+        <translation type="unfinished">修剪：上次钱包同步超出了已修剪的数据范围。您需要执行“-reindex”（对于已修剪节点，需要重新下载整个区块链）。 </translation>
+    </message>
+    <message>
+        <source>The inputs size exceeds the maximum weight. Please try sending a smaller amount or manually consolidating your wallet's UTXOs</source>
+        <translation type="unfinished">输入大小超出了最大重量。请尝试减少发出的金额，或者手动整合一下钱包UTXO</translation>
+    </message>
+    <message>
+        <source>The preselected coins total amount does not cover the transaction target. Please allow other inputs to be automatically selected or include more coins manually</source>
+        <translation type="unfinished">预先选择的币总金额不能覆盖交易目标。请允许自动选择其他输入，或者手动加入更多的币</translation>
+    </message>
+    <message>
+        <source>UTXO snapshot failed to validate. Restart to resume normal initial block download, or try loading a different snapshot.</source>
+        <translation type="unfinished">验证UTXO快照失败。重启后，可以普通方式继续初始区块下载，或者也可以加载一个不同的快照。</translation>
+    </message>
+    <message>
+        <source>Unconfirmed UTXOs are available, but spending them creates a chain of transactions that will be rejected by the mempool</source>
+        <translation type="unfinished">未确认UTXO可用，但花掉它们将会创建一条会被内存池拒绝的交易链</translation>
+    </message>
+    <message>
+        <source>Unexpected legacy entry in descriptor wallet found. Loading wallet %s
+
+The wallet might have been tampered with or created with malicious intent.
+</source>
+        <translation type="unfinished">在描述符钱包中意料之外地找到了旧式条目。加载钱包%s
+
+钱包可能被篡改过，或者是出于恶意而被构建的。
+</translation>
+    </message>
+    <message>
+        <source>
+Unable to cleanup failed migration</source>
+        <translation type="unfinished">
+无法清理失败的迁移</translation>
+    </message>
+    <message>
+        <source>
+Unable to restore backup of wallet.</source>
+        <translation type="unfinished">
+无法还原钱包备份</translation>
+    </message>
+    <message>
+        <source>Can't spend unconfirmed version %d pre-selected input with a version 3 tx</source>
+        <translation type="unfinished">无法使用版本3交易花费未确认版本1%d的预选输入。</translation>
+    </message>
+    <message>
+        <source>Can't spend unconfirmed version 3 pre-selected input with a version %d tx</source>
+        <translation type="unfinished">无法使用版本1%d交易花费未确认版本3的预选输入。</translation>
+    </message>
+    <message>
+        <source>Cannot write to directory '%s'; check permissions.</source>
+        <translation type="unfinished">无法写入目录“%s”；请检查权限。</translation>
+    </message>
+    <message>
+        <source>Config setting for %s only applied on %s network when in [%s] section.</source>
+        <translation type="unfinished">對 %s 的配置設定只對 %s 網路生效，如果它位於配置的 [%s] 章節的話</translation>
+    </message>
+    <message>
+        <source>Copyright (C) %i-%i</source>
+        <translation type="unfinished">版权所有 (C) %i-%i</translation>
+    </message>
+    <message>
+        <source>Corrupted block database detected</source>
+        <translation type="unfinished">检测到区块数据库损坏</translation>
+    </message>
+    <message>
+        <source>Could not find asmap file %s</source>
+        <translation type="unfinished">找不到asmap 檔案 %s</translation>
+    </message>
+    <message>
+        <source>Could not generate scriptPubKeys (cache is empty)</source>
+        <translation type="unfinished">无法生成脚本公钥（缓存为空）</translation>
+    </message>
+    <message>
+        <source>Could not top up scriptPubKeys</source>
+        <translation type="unfinished">无法补充脚本公钥</translation>
+    </message>
+    <message>
+        <source>Disk space is too low!</source>
+        <translation type="unfinished">磁盘空间太低!</translation>
+    </message>
+    <message>
+        <source>Error loading databases</source>
+        <translation type="unfinished">错误：加载数据库失败。</translation>
+    </message>
+    <message>
+        <source>Error opening coins database</source>
+        <translation type="unfinished">错误：打开币数据库失败。</translation>
+    </message>
+    <message>
+        <source>Error reading configuration file: %s</source>
+        <translation type="unfinished">读取配置文件失败: %s</translation>
+    </message>
+    <message>
+        <source>Error reading from database, shutting down.</source>
+        <translation type="unfinished">读取数据库出错，关闭中。</translation>
+    </message>
+    <message>
+        <source>Error reading next record from wallet database</source>
+        <translation type="unfinished">從錢包資料庫讀取下一筆記錄時出錯</translation>
+    </message>
+    <message>
+        <source>Error: Not all address book records were migrated</source>
+        <translation type="unfinished">错误：并非所有地址簿记录都已迁移</translation>
+    </message>
+    <message>
+        <source>Error: Not all transaction records were migrated</source>
+        <translation type="unfinished">错误：并非所有交易记录都已迁移</translation>
+    </message>
+    <message>
+        <source>Error: Unable to write data to disk for wallet %s</source>
+        <translation type="unfinished">错误：无法将数据写入钱包的磁盘%s。</translation>
+    </message>
+    <message>
+        <source>Failed to acquire rescan reserver during wallet initialization</source>
+        <translation type="unfinished">在钱包初始化期间未能获取重扫预留器</translation>
+    </message>
+    <message>
+        <source>Failed to close block undo file.</source>
+        <translation type="unfinished">关闭区块撤销文件失败。</translation>
+    </message>
+    <message>
+        <source>Failed to close file when writing block.</source>
+        <translation type="unfinished">写入区块时关闭文件失败。</translation>
+    </message>
+    <message>
+        <source>Creating wallet…</source>
+        <translation type="unfinished">創建錢包...</translation>
+    </message>
+    <message>
+        <source>Specified data directory "%s" does not exist.</source>
+        <translation type="unfinished">指定的数据目录 "%s" 不存在。</translation>
+    </message>
+    <message>
+        <source>The %s path uses exFAT, which is known to have intermittent corruption problems on macOS. Move this directory to a different filesystem to avoid data loss.</source>
+        <translation type="unfinished">%s路径使用exFAT，该格式在macOS上已知会出现间歇性损坏问题。请将此目录移动到其他文件系统以避免数据丢失。</translation>
+    </message>
+    <message>
+        <source>The transactions removal process can only be executed within a db txn</source>
+        <translation type="unfinished">交易移除过程只能在数据库事务内执行。</translation>
+    </message>
+    <message>
+        <source>Unable to parse -maxuploadtarget: '%s'</source>
+        <translation type="unfinished">無法解析-最大上傳目標:'%s'</translation>
+    </message>
+    <message>
+        <source>acceptstalefeeestimates is not supported on %s chain.</source>
+        <translation type="unfinished">%s链上acceptstalefeeestimates 不受支持。</translation>
+    </message>
+    <message>
+        <source>Error loading %s: Wallet is a legacy wallet. Please migrate to a descriptor wallet using the migration tool (migratewallet RPC).</source>
+        <translation type="unfinished">加载 %s时出错：钱包为传统钱包。请使用迁移工具（migratewallet RPC）迁移到描述符钱包。</translation>
+    </message>
+    <message>
+        <source>Error: Dumpfile specifies an unsupported database format (%s). Only sqlite database dumps are supported</source>
+        <translation type="unfinished">错误：转储文件指定了不受支持的数据库格式 %s。仅支持 sqlite 数据库转储。</translation>
+    </message>
+    <message>
+        <source>Failed to calculate bump fees, because unconfirmed UTXOs depend on an enormous cluster of unconfirmed transactions.</source>
+        <translation type="unfinished">由于未确认的 UTXO 依赖于庞大的未确认交易集群，无法计算提高手续费。</translation>
+    </message>
+    <message>
+        <source>Transaction requires one destination of non-zero value, a non-zero feerate, or a pre-selected input</source>
+        <translation type="unfinished">交易需要至少满足以下之一：一个非零金额的收款地址、非零费率，或预先选择的输入。</translation>
+    </message>
+    <message>
+        <source>Unrecognized descriptor found. Loading wallet %s
+
+The wallet might have been created on a newer version.
+Please try running the latest software version.
+</source>
+        <translation type="unfinished">发现无法识别的描述符。正在加载钱包 %s 
+
+该钱包可能是在较新版本中创建的。 
+请尝试运行最新的软件版本。
+</translation>
+    </message>
+    <message>
+        <source>Do you want to rebuild the databases now?</source>
+        <translation type="unfinished">你想现在重建数据库吗？</translation>
+    </message>
+    <message>
+        <source>Error: Could not add watchonly tx %s to watchonly wallet</source>
+        <translation type="unfinished">错误：无法添加仅观察交易%s到仅观察钱包</translation>
+    </message>
+    <message>
+        <source>Error: Could not delete watchonly transactions. </source>
+        <translation type="unfinished">错误: 无法删除仅观察交易。</translation>
+    </message>
+    <message>
+        <source>Error: Wallet does not exist</source>
+        <translation type="unfinished">错误：钱包不存在。</translation>
+    </message>
+    <message>
+        <source>Error: cannot remove legacy wallet records</source>
+        <translation type="unfinished">错误：无法删除遗留钱包的记录。</translation>
+    </message>
+    <message>
+        <source>Failed to start indexes, shutting down…</source>
+        <translation type="unfinished">索引启动失败，正在关闭……</translation>
+    </message>
+    <message>
+        <source>Invalid -proxy address or hostname, ends with '=': '%s'</source>
+        <translation type="unfinished">无效的 -proxy 地址或主机名，以“=”结尾：“%s”。</translation>
+    </message>
+    <message>
+        <source>Not enough file descriptors available. %d available, %d required.</source>
+        <translation type="unfinished">没有足够的文件描述符可用。%d可用，%d需要。</translation>
+    </message>
+    <message>
+        <source>Unrecognized network in -proxy='%s': '%s'</source>
+        <translation type="unfinished">无法识别 -proxy=“%s” 中的网络：“%s”。</translation>
+    </message>
+    </context>
+</TS>
\ No newline at end of file
diff --git a/src/qt/locale/bitcoin_zh_CN.ts b/src/qt/locale/bitcoin_zh_CN.ts
index 8f7e129864b4..d5255cff78dd 100644
--- a/src/qt/locale/bitcoin_zh_CN.ts
+++ b/src/qt/locale/bitcoin_zh_CN.ts
@@ -322,6 +322,57 @@ Signing is only possible with addresses of the type 'legacy'.</source>
         <source>Custom…</source>
         <translation type="unfinished">自定义...</translation>
     </message>
+    <message>
+        <source>Amount</source>
+        <translation type="unfinished">金额</translation>
+    </message>
+    <message>
+        <source>Enter a Bitcoin address (e.g. %1)</source>
+        <translation type="unfinished">请输入一个比特币地址 (例如 %1)</translation>
+    </message>
+    <message>
+        <source>Unroutable</source>
+        <translation type="unfinished">不可路由</translation>
+    </message>
+    <message>
+        <source>Inbound</source>
+        <extracomment>An inbound connection from a peer. An inbound connection is a connection initiated by a peer.</extracomment>
+        <translation type="unfinished">传入</translation>
+    </message>
+    <message>
+        <source>Outbound</source>
+        <extracomment>An outbound connection to a peer. An outbound connection is a connection initiated by us.</extracomment>
+        <translation type="unfinished">传出</translation>
+    </message>
+    <message>
+        <source>Full Relay</source>
+        <extracomment>Peer connection type that relays all network information.</extracomment>
+        <translation type="unfinished">完整转发</translation>
+    </message>
+    <message>
+        <source>Block Relay</source>
+        <extracomment>Peer connection type that relays network information about blocks and not transactions or addresses.</extracomment>
+        <translation type="unfinished">区块转发</translation>
+    </message>
+    <message>
+        <source>Manual</source>
+        <extracomment>Peer connection type established manually through one of several methods.</extracomment>
+        <translation type="unfinished">手册</translation>
+    </message>
+    <message>
+        <source>Feeler</source>
+        <extracomment>Short-lived peer connection type that tests the aliveness of known addresses.</extracomment>
+        <translation type="unfinished">触须</translation>
+    </message>
+    <message>
+        <source>Address Fetch</source>
+        <extracomment>Short-lived peer connection type that solicits known addresses from a peer.</extracomment>
+        <translation type="unfinished">地址取回</translation>
+    </message>
+    <message>
+        <source>N/A</source>
+        <translation type="unfinished">不可用</translation>
+    </message>
     <message numerus="yes">
         <source>%n second(s)</source>
         <translation type="unfinished">
@@ -698,6 +749,23 @@ Signing is only possible with addresses of the type 'legacy'.</source>
         <extracomment>Label of the input field where the name of the wallet is entered.</extracomment>
         <translation type="unfinished">钱包名称</translation>
     </message>
+    <message>
+        <source>Invalid Wallet Name</source>
+        <translation type="unfinished">無效的錢包名稱</translation>
+    </message>
+    <message>
+        <source>Wallet name cannot be empty</source>
+        <translation type="unfinished">錢包名稱不能為空白</translation>
+    </message>
+    <message>
+        <source>Restore and Migrate Wallet Backup</source>
+        <translation type="unfinished">恢復及遷移錢包備份</translation>
+    </message>
+    <message>
+        <source>Restore and Migrate Wallet</source>
+        <extracomment>Title of pop-up window shown when the user is attempting to restore a wallet.</extracomment>
+        <translation type="unfinished">恢復及遷移錢包</translation>
+    </message>
     <message>
         <source>&amp;Window</source>
         <translation type="unfinished">窗口(&amp;W)</translation>
@@ -1014,6 +1082,24 @@ The migration process will create a backup of the wallet before migrating. This
         <source>Solvable but not watched scripts have been migrated to a new wallet named '%1'.</source>
         <translation type="unfinished">可解决但未被观察到的脚本已经被迁移到被命名为“%1”的新钱包。</translation>
     </message>
+    <message>
+        <source>Restore and Migrate wallet</source>
+        <translation type="unfinished">恢復及遷移錢包</translation>
+    </message>
+    <message>
+        <source>Are you sure you wish to restore the wallet file &lt;i&gt;%1&lt;/i&gt; to &lt;i&gt;%2&lt;/i&gt; and migrate it?</source>
+        <translation type="unfinished">您確定要恢復錢包檔案&lt;i&gt;%1&lt;/i&gt;到&lt;i&gt;%2&lt;/i&gt;及遷移它嗎？</translation>
+    </message>
+    <message>
+        <source>Restore Wallet</source>
+        <extracomment>Title of progress window which is displayed when wallets are being restored.</extracomment>
+        <translation type="unfinished">恢复钱包</translation>
+    </message>
+    <message>
+        <source>Restoring Wallet &lt;b&gt;%1&lt;/b&gt;…</source>
+        <extracomment>Descriptive text of the restore wallets progress window which indicates to the user that wallets are currently being restored.</extracomment>
+        <translation type="unfinished">恢复钱包&lt;b&gt;%1&lt;/b&gt;…</translation>
+    </message>
     <message>
         <source>Migration failed</source>
         <translation type="unfinished">迁移失败</translation>
@@ -1133,10 +1219,6 @@ The migration process will create a backup of the wallet before migrating. This
         <source>Disable Private Keys</source>
         <translation type="unfinished">禁用私钥</translation>
     </message>
-    <message>
-        <source>Make a blank wallet. Blank wallets do not initially have private keys or scripts. Private keys and addresses can be imported, or an HD seed can be set, at a later time.</source>
-        <translation type="unfinished">创建一个空白的钱包。空白钱包最初不含有任何私钥或脚本。可以以后再导入私钥和地址，或设置HD种子。</translation>
-    </message>
     <message>
         <source>Make Blank Wallet</source>
         <translation type="unfinished">创建空白钱包</translation>
@@ -1872,9 +1954,11 @@ The migration process will create a backup of the wallet before migrating. This
         <source>Could not sign any more inputs.</source>
         <translation type="unfinished">没有交易输入项可供签名了。</translation>
     </message>
-    <message>
-        <source>Signed %1 inputs, but more signatures are still required.</source>
-        <translation type="unfinished">已签名 %1 个交易输入项，但是仍然还有余下的项目需要签名。</translation>
+    <message numerus="yes">
+        <source>Signed %n input(s), but more signatures are still required.</source>
+        <translation type="unfinished">
+            <numerusform />
+        </translation>
     </message>
     <message>
         <source>Signed transaction successfully. Transaction is ready to broadcast.</source>
@@ -1917,13 +2001,104 @@ The migration process will create a backup of the wallet before migrating. This
         <source>own address</source>
         <translation type="unfinished">自己的地址</translation>
     </message>
+    <message>
+        <source>Unable to calculate transaction fee or total transaction amount.</source>
+        <translation type="unfinished">无法计算交易费用或总交易金额。</translation>
+    </message>
+    <message>
+        <source>Pays transaction fee: </source>
+        <translation type="unfinished">支付交易费用:</translation>
+    </message>
+    <message>
+        <source>Total Amount</source>
+        <translation type="unfinished">总额</translation>
+    </message>
+    <message>
+        <source>or</source>
+        <translation type="unfinished">或</translation>
+    </message>
+    <message numerus="yes">
+        <source>Transaction has %n unsigned input(s).</source>
+        <translation type="unfinished">
+            <numerusform />
+        </translation>
+    </message>
+    <message>
+        <source>Transaction is missing some information about inputs.</source>
+        <translation type="unfinished">交易中有输入项缺失某些信息。</translation>
+    </message>
+    <message>
+        <source>Transaction still needs signature(s).</source>
+        <translation type="unfinished">交易仍然需要签名。</translation>
+    </message>
     <message>
         <source>(But no wallet is loaded.)</source>
         <translation type="unfinished">(但没有加载钱包。)</translation>
     </message>
-    </context>
+    <message>
+        <source>(But this wallet cannot sign transactions.)</source>
+        <translation type="unfinished">(但这个钱包不能签名交易)</translation>
+    </message>
+    <message>
+        <source>(But this wallet does not have the right keys.)</source>
+        <translation type="unfinished">(但这个钱包没有正确的密钥)</translation>
+    </message>
+    <message>
+        <source>Transaction is fully signed and ready for broadcast.</source>
+        <translation type="unfinished">交易已经完全签名，可以广播。</translation>
+    </message>
+    <message>
+        <source>Transaction status is unknown.</source>
+        <translation type="unfinished">交易状态未知。</translation>
+    </message>
+</context>
+<context>
+    <name>PaymentServer</name>
+    <message>
+        <source>Payment request error</source>
+        <translation type="unfinished">支付请求出错</translation>
+    </message>
+    <message>
+        <source>Cannot start bitcoin: click-to-pay handler</source>
+        <translation type="unfinished">无法启动 bitcoin: 协议的“一键支付”处理程序</translation>
+    </message>
+    <message>
+        <source>URI handling</source>
+        <translation type="unfinished">URI 处理</translation>
+    </message>
+    <message>
+        <source>'bitcoin://' is not a valid URI. Use 'bitcoin:' instead.</source>
+        <translation type="unfinished">‘bitcoin://’不是合法的URI。请改用'bitcoin:'。</translation>
+    </message>
+    <message>
+        <source>Cannot process payment request because BIP70 is not supported.
+Due to widespread security flaws in BIP70 it's strongly recommended that any merchant instructions to switch wallets be ignored.
+If you are receiving this error you should request the merchant provide a BIP21 compatible URI.</source>
+        <translation type="unfinished">因为不支持BIP70，无法处理付款请求。
+由于BIP70具有广泛的安全缺陷，无论哪个商家指引要求您更换钱包，我们都强烈建议您不要听信。
+如果您看到了这个错误，您应该要求商家提供兼容BIP21的URI。</translation>
+    </message>
+    <message>
+        <source>URI cannot be parsed! This can be caused by an invalid Bitcoin address or malformed URI parameters.</source>
+        <translation type="unfinished">无法解析 URI 地址！可能是因为比特币地址无效，或是 URI 参数格式错误。</translation>
+    </message>
+    <message>
+        <source>Payment request file handling</source>
+        <translation type="unfinished">支付请求文件处理</translation>
+    </message>
+</context>
 <context>
     <name>PeerTableModel</name>
+    <message>
+        <source>User Agent</source>
+        <extracomment>Title of Peers Table column which contains the peer's User Agent string.</extracomment>
+        <translation type="unfinished">用户代理</translation>
+    </message>
+    <message>
+        <source>Peer</source>
+        <extracomment>Title of Peers Table column which contains a unique number used to identify a connection.</extracomment>
+        <translation type="unfinished">节点</translation>
+    </message>
     <message>
         <source>Age</source>
         <extracomment>Title of Peers Table column which indicates the duration (length of time) since the peer connection started.</extracomment>
@@ -1934,12 +2109,42 @@ The migration process will create a backup of the wallet before migrating. This
         <extracomment>Title of Peers Table column which indicates the direction the peer connection was initiated from.</extracomment>
         <translation type="unfinished">方向</translation>
     </message>
+    <message>
+        <source>Sent</source>
+        <extracomment>Title of Peers Table column which indicates the total amount of network information we have sent to the peer.</extracomment>
+        <translation type="unfinished">已发送</translation>
+    </message>
+    <message>
+        <source>Received</source>
+        <extracomment>Title of Peers Table column which indicates the total amount of network information we have received from the peer.</extracomment>
+        <translation type="unfinished">已接收</translation>
+    </message>
     <message>
         <source>Address</source>
         <extracomment>Title of Peers Table column which contains the IP/Onion/I2P address of the connected peer.</extracomment>
         <translation type="unfinished">地址</translation>
     </message>
-    </context>
+    <message>
+        <source>Type</source>
+        <extracomment>Title of Peers Table column which describes the type of peer connection. The "type" describes why the connection exists.</extracomment>
+        <translation type="unfinished">类型</translation>
+    </message>
+    <message>
+        <source>Network</source>
+        <extracomment>Title of Peers Table column which states the network the peer connected through.</extracomment>
+        <translation type="unfinished">网络</translation>
+    </message>
+    <message>
+        <source>Inbound</source>
+        <extracomment>An Inbound Connection from a Peer.</extracomment>
+        <translation type="unfinished">传入</translation>
+    </message>
+    <message>
+        <source>Outbound</source>
+        <extracomment>An Outbound Connection to a Peer.</extracomment>
+        <translation type="unfinished">传出</translation>
+    </message>
+</context>
 <context>
     <name>QRImageWidget</name>
     <message>
@@ -2010,6 +2215,10 @@ The migration process will create a backup of the wallet before migrating. This
         <source>Startup time</source>
         <translation type="unfinished">启动时间</translation>
     </message>
+    <message>
+        <source>Network</source>
+        <translation type="unfinished">网络</translation>
+    </message>
     <message>
         <source>Name</source>
         <translation type="unfinished">名称</translation>
@@ -2098,10 +2307,6 @@ The migration process will create a backup of the wallet before migrating. This
         <source>Transaction Relay</source>
         <translation type="unfinished">交易转发</translation>
     </message>
-    <message>
-        <source>Starting Block</source>
-        <translation type="unfinished">起步区块</translation>
-    </message>
     <message>
         <source>Synced Headers</source>
         <translation type="unfinished">已同步区块头</translation>
@@ -2152,6 +2357,10 @@ The migration process will create a backup of the wallet before migrating. This
         <extracomment>Text title for the Addresses Rate-Limited field in the peer details area, which displays the total number of addresses received from this peer that were dropped (not processed) due to rate-limiting.</extracomment>
         <translation type="unfinished">被频率限制丢弃的地址</translation>
     </message>
+    <message>
+        <source>User Agent</source>
+        <translation type="unfinished">用户代理</translation>
+    </message>
     <message>
         <source>Node window</source>
         <translation type="unfinished">节点窗口</translation>
@@ -2380,10 +2589,6 @@ The migration process will create a backup of the wallet before migrating. This
         <source>Network activity disabled</source>
         <translation type="unfinished">网络活动已禁用</translation>
     </message>
-    <message>
-        <source>None</source>
-        <translation type="unfinished">无</translation>
-    </message>
     <message>
         <source>Executing command without any wallet</source>
         <translation type="unfinished">不使用任何钱包执行命令</translation>
@@ -2974,10 +3179,6 @@ Note:  Since the fee is calculated on a per-byte basis, a fee rate of "100 satos
         <source>The amount exceeds your balance.</source>
         <translation type="unfinished">金额超出您的余额。</translation>
     </message>
-    <message>
-        <source>The total exceeds your balance when the %1 transaction fee is included.</source>
-        <translation type="unfinished">计入 %1 手续费后，金额超出了您的余额。</translation>
-    </message>
     <message>
         <source>Duplicate address found: addresses should only be used once each.</source>
         <translation type="unfinished">发现重复地址:每个地址应该只使用一次。</translation>
@@ -3099,7 +3300,7 @@ Note:  Since the fee is calculated on a per-byte basis, a fee rate of "100 satos
     </message>
     <message>
         <source>You can sign messages/agreements with your legacy (P2PKH) 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.</source>
-        <translation type="unfinished">您可以使用您的 (P2PKH)格式 地址签署消息 / 协议，以证明您对这个地址有发送或接收比特币的权限。钓鱼攻击可能试图欺骗您签署您的身份，所以请仔细分辨，不要签署任何含混不清的协议。只签署你完全认同并理解的协议 。</translation>
+        <translation type="unfinished">您可以与您的 (P2PKH)格式 地址签署消息 / 协议，以证明您可以接收发送给它们的比特币。钓鱼攻击可能试图欺骗您签署您的身份，所以请仔细分辨，不要签署任何含混不清的协议。只签署你完全认同并理解的协议 / 消息。</translation>
     </message>
     <message>
         <source>The Bitcoin address to sign the message with</source>
@@ -3912,10 +4113,6 @@ Go to File &gt; Open Wallet to load a wallet.
         <source>Warning: Private keys detected in wallet {%s} with disabled private keys</source>
         <translation type="unfinished">警告：在已经禁用私钥的钱包 {%s} 中仍然检测到私钥</translation>
     </message>
-    <message>
-        <source>Warning: We do not appear to fully agree with our peers! You may need to upgrade, or other nodes may need to upgrade.</source>
-        <translation type="unfinished">警告：我们和其他节点似乎没达成共识！您可能需要升级，或者就是其他节点可能需要升级。</translation>
-    </message>
     <message>
         <source>Witness data for blocks after height %d requires validation. Please restart with -reindex.</source>
         <translation type="unfinished">需要验证高度在%d之后的区块见证数据。请使用 -reindex 重新启动。</translation>
@@ -3996,14 +4193,6 @@ Go to File &gt; Open Wallet to load a wallet.
         <source>Option '-checkpoints' is set but checkpoints were removed. This option has no effect.</source>
         <translation type="unfinished">选项“-checkpoints”已设置，但检查点已被移除。该选项不再生效。 </translation>
     </message>
-    <message>
-        <source>Option '-maxorphantx' is set but no longer has any effect (see release notes). Please remove it from your configuration.</source>
-        <translation type="unfinished">选项“-maxorphantx”已设置，但已不再生效（参见发行说明）。请从您的配置中移除该选项。 </translation>
-    </message>
-    <message>
-        <source>Options '-datacarrier' or '-datacarriersize' are set but are marked as deprecated. They will be removed in a future version.</source>
-        <translation type="unfinished">选项“-datacarrier”或“-datacarriersize”已设置，但已标记为弃用。它们将在未来版本中移除。 </translation>
-    </message>
     <message>
         <source>Outbound connections restricted to CJDNS (-onlynet=cjdns) but -cjdnsreachable is not provided</source>
         <translation type="unfinished">传出连接被限制为仅使用CJDNS (-onlynet=cjdns) ，但却未提供 -cjdnsreachable 参数。</translation>
@@ -4066,10 +4255,6 @@ Unable to restore backup of wallet.</source>
         <source>default wallet</source>
         <translation type="unfinished">默认钱包</translation>
     </message>
-    <message>
-        <source>-paytxfee is deprecated and will be fully removed in v31.0.</source>
-        <translation type="unfinished">“-paytxfee”已弃用，并将在 v31.0 中完全移除。 </translation>
-    </message>
     <message>
         <source>A fatal internal error occurred, see debug.log for details: </source>
         <translation type="unfinished">發生致命的內部錯誤，有關詳情請查看 debug.log：</translation>
@@ -4079,8 +4264,12 @@ Unable to restore backup of wallet.</source>
         <translation type="unfinished">区块验证已中断</translation>
     </message>
     <message>
-        <source>Cannot add WalletDescriptor to a non-descriptor wallet</source>
-        <translation type="unfinished">无法将钱包描述符添加到非描述符钱包</translation>
+        <source>Can't spend unconfirmed version %d pre-selected input with a version 3 tx</source>
+        <translation type="unfinished">无法使用版本3交易花费未确认版本1%d的预选输入。</translation>
+    </message>
+    <message>
+        <source>Can't spend unconfirmed version 3 pre-selected input with a version %d tx</source>
+        <translation type="unfinished">无法使用版本1%d交易花费未确认版本3的预选输入。</translation>
     </message>
     <message>
         <source>Cannot write to directory '%s'; check permissions.</source>
@@ -4126,10 +4315,6 @@ Unable to restore backup of wallet.</source>
         <source>Dump file %s does not exist.</source>
         <translation type="unfinished">转储文件 %s 不存在</translation>
     </message>
-    <message>
-        <source>Error creating %s</source>
-        <translation type="unfinished">创建%s时出错</translation>
-    </message>
     <message>
         <source>Error initializing block database</source>
         <translation type="unfinished">初始化区块数据库时出错</translation>
@@ -4138,10 +4323,6 @@ Unable to restore backup of wallet.</source>
         <source>Error loading %s</source>
         <translation type="unfinished">载入 %s 时发生错误</translation>
     </message>
-    <message>
-        <source>Error loading %s: Private keys can only be disabled during creation</source>
-        <translation type="unfinished">加载 %s 时出错：只能在创建钱包时禁用私钥。</translation>
-    </message>
     <message>
         <source>Error loading %s: Wallet corrupted</source>
         <translation type="unfinished">%s 加载出错:钱包损坏</translation>
@@ -4310,10 +4491,6 @@ Unable to restore backup of wallet.</source>
         <source>Failed to write block.</source>
         <translation type="unfinished">寫入區塊失敗。</translation>
     </message>
-    <message>
-        <source>Failed to write to block index database.</source>
-        <translation type="unfinished">寫入區塊索引資料庫失敗。</translation>
-    </message>
     <message>
         <source>Failure removing transaction: %s</source>
         <translation type="unfinished">%s删除交易时失败: </translation>
@@ -4362,14 +4539,14 @@ Unable to restore backup of wallet.</source>
         <source>Invalid P2P permission: '%s'</source>
         <translation type="unfinished">无效的 P2P 权限：'%s'</translation>
     </message>
-    <message>
-        <source>Invalid amount for %s=&lt;amount&gt;: '%s' (must be at least %s)</source>
-        <translation type="unfinished">%s=&lt;amount&gt;: '%s' 中指定了非法的金额 (必须至少达到 %s)</translation>
-    </message>
     <message>
         <source>Invalid amount for %s=&lt;amount&gt;: '%s'</source>
         <translation type="unfinished">%s=&lt;amount&gt;: '%s' 中指定了非法的金额</translation>
     </message>
+    <message>
+        <source>Creating wallet…</source>
+        <translation type="unfinished">創建錢包...</translation>
+    </message>
     <message>
         <source>Invalid amount for -%s=&lt;amount&gt;: '%s'</source>
         <translation type="unfinished">参数 -%s=&lt;amount&gt;: '%s' 指定了无效的金额</translation>
@@ -4498,6 +4675,10 @@ Unable to restore backup of wallet.</source>
         <source>Starting network threads…</source>
         <translation type="unfinished">启动网络线程...</translation>
     </message>
+    <message>
+        <source>The %s path uses exFAT, which is known to have intermittent corruption problems on macOS. Move this directory to a different filesystem to avoid data loss.</source>
+        <translation type="unfinished">%s路径使用exFAT，该格式在macOS上已知会出现间歇性损坏问题。请将此目录移动到其他文件系统以避免数据丢失。</translation>
+    </message>
     <message>
         <source>The source code is available from %s.</source>
         <translation type="unfinished">可以从 %s 获取源代码。</translation>
@@ -4526,10 +4707,6 @@ Unable to restore backup of wallet.</source>
         <source>This is the minimum transaction fee you pay on every transaction.</source>
         <translation type="unfinished">这是你每次交易付款时最少要付的手续费。</translation>
     </message>
-    <message>
-        <source>This is the transaction fee you will pay if you send a transaction.</source>
-        <translation type="unfinished">如果发送交易，这将是你要支付的手续费。</translation>
-    </message>
     <message>
         <source>Transaction %s does not belong to this wallet</source>
         <translation type="unfinished">交易%s不属于这个钱包</translation>
diff --git a/src/qt/locale/bitcoin_zh_HK.ts b/src/qt/locale/bitcoin_zh_HK.ts
index 37d1d6c657d9..ace1756daab7 100644
--- a/src/qt/locale/bitcoin_zh_HK.ts
+++ b/src/qt/locale/bitcoin_zh_HK.ts
@@ -329,11 +329,25 @@ Signing is only possible with addresses of the type 'legacy'.</source>
         <source>Enter a Bitcoin address (e.g. %1)</source>
         <translation type="unfinished">輸入一個 Bitcoin 位址 (例如 %1)</translation>
     </message>
+    <message>
+        <source>Unroutable</source>
+        <translation type="unfinished">不可路由</translation>
+    </message>
     <message>
         <source>Inbound</source>
         <extracomment>An inbound connection from a peer. An inbound connection is a connection initiated by a peer.</extracomment>
         <translation type="unfinished">進來</translation>
     </message>
+    <message>
+        <source>Outbound</source>
+        <extracomment>An outbound connection to a peer. An outbound connection is a connection initiated by us.</extracomment>
+        <translation type="unfinished">傳出</translation>
+    </message>
+    <message>
+        <source>Full Relay</source>
+        <extracomment>Peer connection type that relays all network information.</extracomment>
+        <translation type="unfinished">完整转发</translation>
+    </message>
     <message>
         <source>Block Relay</source>
         <extracomment>Peer connection type that relays network information about blocks and not transactions or addresses.</extracomment>
@@ -344,6 +358,16 @@ Signing is only possible with addresses of the type 'legacy'.</source>
         <extracomment>Peer connection type established manually through one of several methods.</extracomment>
         <translation type="unfinished">手册</translation>
     </message>
+    <message>
+        <source>Feeler</source>
+        <extracomment>Short-lived peer connection type that tests the aliveness of known addresses.</extracomment>
+        <translation type="unfinished">触须</translation>
+    </message>
+    <message>
+        <source>Address Fetch</source>
+        <extracomment>Short-lived peer connection type that solicits known addresses from a peer.</extracomment>
+        <translation type="unfinished">地址取回</translation>
+    </message>
     <message>
         <source>%1 d</source>
         <translation type="unfinished">%1 日</translation>
@@ -568,10 +592,6 @@ Signing is only possible with addresses of the type 'legacy'.</source>
         <source>Processing blocks on disk…</source>
         <translation type="unfinished">处理磁盘上的区块...</translation>
     </message>
-    <message>
-        <source>Connecting to peers…</source>
-        <translation type="unfinished">连接到节点...</translation>
-    </message>
     <message>
         <source>Request payments (generates QR codes and bitcoin: URIs)</source>
         <translation type="unfinished">要求付款 (產生QR碼 bitcoin: URIs)</translation>
@@ -582,7 +602,7 @@ Signing is only possible with addresses of the type 'legacy'.</source>
     </message>
     <message>
         <source>Show the list of used receiving addresses and labels</source>
-        <translation type="unfinished">显示用过的收款地址和标签的列表</translation>
+        <translation type="unfinished">顯示已使用過的接收地址和標籤清單</translation>
     </message>
     <message>
         <source>&amp;Command-line options</source>
@@ -602,10 +622,6 @@ Signing is only possible with addresses of the type 'legacy'.</source>
         <source>Catching up…</source>
         <translation type="unfinished">正在追上进度...</translation>
     </message>
-    <message>
-        <source>Last received block was generated %1 ago.</source>
-        <translation type="unfinished">最新收到的区块产生于 %1 之前。</translation>
-    </message>
     <message>
         <source>Transactions after this will not yet be visible.</source>
         <translation type="unfinished">在此之后的交易尚不可见</translation>
@@ -728,6 +744,23 @@ Signing is only possible with addresses of the type 'legacy'.</source>
         <extracomment>Label of the input field where the name of the wallet is entered.</extracomment>
         <translation type="unfinished">錢包名稱</translation>
     </message>
+    <message>
+        <source>Invalid Wallet Name</source>
+        <translation type="unfinished">無效的錢包名稱</translation>
+    </message>
+    <message>
+        <source>Wallet name cannot be empty</source>
+        <translation type="unfinished">錢包名稱不能為空白</translation>
+    </message>
+    <message>
+        <source>Restore and Migrate Wallet Backup</source>
+        <translation type="unfinished">恢復及遷移錢包備份</translation>
+    </message>
+    <message>
+        <source>Restore and Migrate Wallet</source>
+        <extracomment>Title of pop-up window shown when the user is attempting to restore a wallet.</extracomment>
+        <translation type="unfinished">恢復及遷移錢包</translation>
+    </message>
     <message>
         <source>&amp;Window</source>
         <translation type="unfinished">窗口(&amp;W)</translation>
@@ -899,6 +932,10 @@ Signing is only possible with addresses of the type 'legacy'.</source>
         <source>Received with address</source>
         <translation type="unfinished">收款地址</translation>
     </message>
+    <message>
+        <source>Date</source>
+        <translation type="unfinished">日期</translation>
+    </message>
     <message>
         <source>Confirmed</source>
         <translation type="unfinished">已確認</translation>
@@ -927,6 +964,10 @@ Signing is only possible with addresses of the type 'legacy'.</source>
         <source>L&amp;ock unspent</source>
         <translation type="unfinished">锁定未花费(&amp;O)</translation>
     </message>
+    <message>
+        <source>&amp;Unlock unspent</source>
+        <translation type="unfinished">解鎖未花費的</translation>
+    </message>
     <message>
         <source>Copy quantity</source>
         <translation type="unfinished">复制数目</translation>
@@ -1035,6 +1076,24 @@ The migration process will create a backup of the wallet before migrating. This
         <source>Solvable but not watched scripts have been migrated to a new wallet named '%1'.</source>
         <translation type="unfinished">可解决但未被观察到的脚本已经被迁移到被命名为“%1”的新钱包。</translation>
     </message>
+    <message>
+        <source>Restore and Migrate wallet</source>
+        <translation type="unfinished">恢復及遷移錢包</translation>
+    </message>
+    <message>
+        <source>Are you sure you wish to restore the wallet file &lt;i&gt;%1&lt;/i&gt; to &lt;i&gt;%2&lt;/i&gt; and migrate it?</source>
+        <translation type="unfinished">您是否確定要恢復錢包檔案&lt;i&gt;%1&lt;/i&gt;到&lt;i&gt;%2&lt;/i&gt;及遷移它？</translation>
+    </message>
+    <message>
+        <source>Restore Wallet</source>
+        <extracomment>Title of progress window which is displayed when wallets are being restored.</extracomment>
+        <translation type="unfinished">恢復錢包</translation>
+    </message>
+    <message>
+        <source>Restoring Wallet &lt;b&gt;%1&lt;/b&gt;…</source>
+        <extracomment>Descriptive text of the restore wallets progress window which indicates to the user that wallets are currently being restored.</extracomment>
+        <translation type="unfinished">正在恢復錢包&lt;b&gt;%1&lt;/b&gt;...</translation>
+    </message>
     <message>
         <source>Migration failed</source>
         <translation type="unfinished">迁移失败</translation>
@@ -1145,10 +1204,6 @@ The migration process will create a backup of the wallet before migrating. This
         <source>Disable Private Keys</source>
         <translation type="unfinished">禁用私钥</translation>
     </message>
-    <message>
-        <source>Make a blank wallet. Blank wallets do not initially have private keys or scripts. Private keys and addresses can be imported, or an HD seed can be set, at a later time.</source>
-        <translation type="unfinished">製作一個空白的錢包。空白錢包最初沒有私鑰或腳本。以後可以匯入私鑰和地址，或者可以設定HD種子。</translation>
-    </message>
     <message>
         <source>Make Blank Wallet</source>
         <translation type="unfinished">製作空白錢包</translation>
@@ -1820,7 +1875,7 @@ The migration process will create a backup of the wallet before migrating. This
     </message>
     <message>
         <source>Sign Tx</source>
-        <translation type="unfinished">签名交易</translation>
+        <translation type="unfinished">簽名交易</translation>
     </message>
     <message>
         <source>Broadcast Tx</source>
@@ -1828,15 +1883,15 @@ The migration process will create a backup of the wallet before migrating. This
     </message>
     <message>
         <source>Copy to Clipboard</source>
-        <translation type="unfinished">复制到剪贴板</translation>
+        <translation type="unfinished">複製到剪貼簿</translation>
     </message>
     <message>
         <source>Save…</source>
-        <translation type="unfinished">保存...</translation>
+        <translation type="unfinished">拯救...</translation>
     </message>
     <message>
         <source>Close</source>
-        <translation type="unfinished">关闭</translation>
+        <translation type="unfinished">關閉</translation>
     </message>
     <message>
         <source>Failed to load transaction: %1</source>
@@ -1854,9 +1909,11 @@ The migration process will create a backup of the wallet before migrating. This
         <source>Could not sign any more inputs.</source>
         <translation type="unfinished">没有交易输入项可供签名了。</translation>
     </message>
-    <message>
-        <source>Signed %1 inputs, but more signatures are still required.</source>
-        <translation type="unfinished">已签名 %1 个交易输入项，但是仍然还有余下的项目需要签名。</translation>
+    <message numerus="yes">
+        <source>Signed %n input(s), but more signatures are still required.</source>
+        <translation type="unfinished">
+            <numerusform />
+        </translation>
     </message>
     <message>
         <source>Signed transaction successfully. Transaction is ready to broadcast.</source>
@@ -1866,14 +1923,6 @@ The migration process will create a backup of the wallet before migrating. This
         <source>Unknown error processing transaction.</source>
         <translation type="unfinished">处理交易时遇到未知错误。</translation>
     </message>
-    <message>
-        <source>Transaction broadcast successfully! Transaction ID: %1</source>
-        <translation type="unfinished">已成功广播交易！交易ID: %1</translation>
-    </message>
-    <message>
-        <source>Transaction broadcast failed: %1</source>
-        <translation type="unfinished">交易广播失败: %1</translation>
-    </message>
     <message>
         <source>PSBT copied to clipboard.</source>
         <translation type="unfinished">已复制PSBT到剪贴板</translation>
@@ -1899,6 +1948,10 @@ The migration process will create a backup of the wallet before migrating. This
         <source>own address</source>
         <translation type="unfinished">自己的地址</translation>
     </message>
+    <message>
+        <source>Unable to calculate transaction fee or total transaction amount.</source>
+        <translation type="unfinished">无法计算交易费用或总交易金额。</translation>
+    </message>
     <message>
         <source>Pays transaction fee: </source>
         <translation type="unfinished">支付交易费用:</translation>
@@ -1911,6 +1964,12 @@ The migration process will create a backup of the wallet before migrating. This
         <source>or</source>
         <translation type="unfinished">或</translation>
     </message>
+    <message numerus="yes">
+        <source>Transaction has %n unsigned input(s).</source>
+        <translation type="unfinished">
+            <numerusform />
+        </translation>
+    </message>
     <message>
         <source>Transaction is missing some information about inputs.</source>
         <translation type="unfinished">交易中有输入项缺失某些信息。</translation>
@@ -1927,6 +1986,14 @@ The migration process will create a backup of the wallet before migrating. This
         <source>(But this wallet cannot sign transactions.)</source>
         <translation type="unfinished">(但这个钱包不能签名交易)</translation>
     </message>
+    <message>
+        <source>(But this wallet does not have the right keys.)</source>
+        <translation type="unfinished">(但这个钱包没有正确的密钥)</translation>
+    </message>
+    <message>
+        <source>Transaction is fully signed and ready for broadcast.</source>
+        <translation type="unfinished">交易已经完全签名，可以广播。</translation>
+    </message>
     <message>
         <source>Transaction status is unknown.</source>
         <translation type="unfinished">交易状态未知。</translation>
@@ -1938,6 +2005,10 @@ The migration process will create a backup of the wallet before migrating. This
         <source>Payment request error</source>
         <translation type="unfinished">支付请求出错</translation>
     </message>
+    <message>
+        <source>Cannot start bitcoin: click-to-pay handler</source>
+        <translation type="unfinished">无法启动 bitcoin: 协议的“一键支付”处理程序</translation>
+    </message>
     <message>
         <source>URI handling</source>
         <translation type="unfinished">URI 處理</translation>
@@ -2015,7 +2086,12 @@ If you are receiving this error you should request the merchant provide a BIP21
         <extracomment>An Inbound Connection from a Peer.</extracomment>
         <translation type="unfinished">進來</translation>
     </message>
-    </context>
+    <message>
+        <source>Outbound</source>
+        <extracomment>An Outbound Connection to a Peer.</extracomment>
+        <translation type="unfinished">傳出</translation>
+    </message>
+</context>
 <context>
     <name>QRImageWidget</name>
     <message>
@@ -2178,10 +2254,6 @@ If you are receiving this error you should request the merchant provide a BIP21
         <source>Transaction Relay</source>
         <translation type="unfinished">交易转发</translation>
     </message>
-    <message>
-        <source>Starting Block</source>
-        <translation type="unfinished">起步区块</translation>
-    </message>
     <message>
         <source>Synced Headers</source>
         <translation type="unfinished">已同步前導資料</translation>
@@ -2715,10 +2787,6 @@ For more information on using this console, type %6.
 </context>
 <context>
     <name>RecentRequestsTableModel</name>
-    <message>
-        <source>Date</source>
-        <translation type="unfinished">日期</translation>
-    </message>
     <message>
         <source>Label</source>
         <translation type="unfinished">標記</translation>
@@ -3040,10 +3108,6 @@ Note:  Since the fee is calculated on a per-byte basis, a fee rate of "100 satos
         <source>The amount exceeds your balance.</source>
         <translation type="unfinished">金额超出您的余额。</translation>
     </message>
-    <message>
-        <source>The total exceeds your balance when the %1 transaction fee is included.</source>
-        <translation type="unfinished">计入 %1 手续费后，金额超出了您的余额。</translation>
-    </message>
     <message>
         <source>Duplicate address found: addresses should only be used once each.</source>
         <translation type="unfinished">发现重复地址:每个地址应该只使用一次。</translation>
@@ -3991,10 +4055,6 @@ Go to File &gt; Open Wallet to load a wallet.
         <source>Warning: Private keys detected in wallet {%s} with disabled private keys</source>
         <translation type="unfinished">警告：在已经禁用私钥的钱包 {%s} 中仍然检测到私钥</translation>
     </message>
-    <message>
-        <source>Warning: We do not appear to fully agree with our peers! You may need to upgrade, or other nodes may need to upgrade.</source>
-        <translation type="unfinished">警告：我们和其他节点似乎没达成共识！您可能需要升级，或者就是其他节点可能需要升级。</translation>
-    </message>
     <message>
         <source>Witness data for blocks after height %d requires validation. Please restart with -reindex.</source>
         <translation type="unfinished">需要验证高度在%d之后的区块见证数据。请使用 -reindex 重新启动。</translation>
@@ -4075,14 +4135,6 @@ Go to File &gt; Open Wallet to load a wallet.
         <source>Option '-checkpoints' is set but checkpoints were removed. This option has no effect.</source>
         <translation type="unfinished">选项“-checkpoints”已设置，但检查点已被移除。该选项不再生效。 </translation>
     </message>
-    <message>
-        <source>Option '-maxorphantx' is set but no longer has any effect (see release notes). Please remove it from your configuration.</source>
-        <translation type="unfinished">选项“-maxorphantx”已设置，但已不再生效（参见发行说明）。请从您的配置中移除该选项。 </translation>
-    </message>
-    <message>
-        <source>Options '-datacarrier' or '-datacarriersize' are set but are marked as deprecated. They will be removed in a future version.</source>
-        <translation type="unfinished">选项“-datacarrier”或“-datacarriersize”已设置，但已标记为弃用。它们将在未来版本中移除。 </translation>
-    </message>
     <message>
         <source>Outbound connections restricted to CJDNS (-onlynet=cjdns) but -cjdnsreachable is not provided</source>
         <translation type="unfinished">传出连接被限制为仅使用CJDNS (-onlynet=cjdns) ，但却未提供 -cjdnsreachable 参数。</translation>
@@ -4145,10 +4197,6 @@ Unable to restore backup of wallet.</source>
         <source>default wallet</source>
         <translation type="unfinished">預設錢包</translation>
     </message>
-    <message>
-        <source>-paytxfee is deprecated and will be fully removed in v31.0.</source>
-        <translation type="unfinished">“-paytxfee”已弃用，并将在 v31.0 中完全移除。 </translation>
-    </message>
     <message>
         <source>A fatal internal error occurred, see debug.log for details: </source>
         <translation type="unfinished">發生致命的內部錯誤，有關詳情請查看 debug.log：</translation>
@@ -4158,8 +4206,12 @@ Unable to restore backup of wallet.</source>
         <translation type="unfinished">区块验证已中断</translation>
     </message>
     <message>
-        <source>Cannot add WalletDescriptor to a non-descriptor wallet</source>
-        <translation type="unfinished">无法将钱包描述符添加到非描述符钱包。</translation>
+        <source>Can't spend unconfirmed version %d pre-selected input with a version 3 tx</source>
+        <translation type="unfinished">无法使用版本3交易花费未确认版本1%d的预选输入。</translation>
+    </message>
+    <message>
+        <source>Can't spend unconfirmed version 3 pre-selected input with a version %d tx</source>
+        <translation type="unfinished">无法使用版本1%d交易花费未确认版本3的预选输入。</translation>
     </message>
     <message>
         <source>Cannot write to directory '%s'; check permissions.</source>
@@ -4205,10 +4257,6 @@ Unable to restore backup of wallet.</source>
         <source>Dump file %s does not exist.</source>
         <translation type="unfinished">转储文件 %s 不存在</translation>
     </message>
-    <message>
-        <source>Error creating %s</source>
-        <translation type="unfinished">创建%s时出错</translation>
-    </message>
     <message>
         <source>Error initializing block database</source>
         <translation type="unfinished">初始化区块数据库时出错</translation>
@@ -4217,10 +4265,6 @@ Unable to restore backup of wallet.</source>
         <source>Error loading %s</source>
         <translation type="unfinished">載入檔案 %s 時發生錯誤</translation>
     </message>
-    <message>
-        <source>Error loading %s: Private keys can only be disabled during creation</source>
-        <translation type="unfinished">載入 %s 時發生錯誤: 只有在造新錢包時能夠指定不允許私鑰</translation>
-    </message>
     <message>
         <source>Error loading %s: Wallet corrupted</source>
         <translation type="unfinished">載入檔案 %s 時發生錯誤: 錢包損毀了</translation>
@@ -4381,10 +4425,6 @@ Unable to restore backup of wallet.</source>
         <source>Failed to write block.</source>
         <translation type="unfinished">寫入區塊失敗。</translation>
     </message>
-    <message>
-        <source>Failed to write to block index database.</source>
-        <translation type="unfinished">寫入區塊索引資料庫失敗。</translation>
-    </message>
     <message>
         <source>Failure removing transaction: %s</source>
         <translation type="unfinished">%s删除交易时失败: </translation>
@@ -4425,14 +4465,14 @@ Unable to restore backup of wallet.</source>
         <source>Invalid P2P permission: '%s'</source>
         <translation type="unfinished">无效的 P2P 权限：'%s'</translation>
     </message>
-    <message>
-        <source>Invalid amount for %s=&lt;amount&gt;: '%s' (must be at least %s)</source>
-        <translation type="unfinished">%s=&lt;amount&gt;: '%s' 中指定了非法的金额 (必须至少达到 %s)</translation>
-    </message>
     <message>
         <source>Invalid amount for %s=&lt;amount&gt;: '%s'</source>
         <translation type="unfinished">%s=&lt;amount&gt;: '%s' 中指定了非法的金额</translation>
     </message>
+    <message>
+        <source>Creating wallet…</source>
+        <translation type="unfinished">創建錢包...</translation>
+    </message>
     <message>
         <source>Invalid amount for -%s=&lt;amount&gt;: '%s'</source>
         <translation type="unfinished">参数 -%s=&lt;amount&gt;: '%s' 指定了无效的金额</translation>
@@ -4533,6 +4573,10 @@ Unable to restore backup of wallet.</source>
         <source>Starting network threads…</source>
         <translation type="unfinished">正在開始網路線程...</translation>
     </message>
+    <message>
+        <source>The %s path uses exFAT, which is known to have intermittent corruption problems on macOS. Move this directory to a different filesystem to avoid data loss.</source>
+        <translation type="unfinished">%s路径使用exFAT，该格式在macOS上已知会出现间歇性损坏问题。请将此目录移动到其他文件系统以避免数据丢失。</translation>
+    </message>
     <message>
         <source>The source code is available from %s.</source>
         <translation type="unfinished">可以从 %s 获取源代码。</translation>
diff --git a/src/qt/locale/bitcoin_zh_TW.ts b/src/qt/locale/bitcoin_zh_TW.ts
index d689dd0aa921..b2c3e1fe56c9 100644
--- a/src/qt/locale/bitcoin_zh_TW.ts
+++ b/src/qt/locale/bitcoin_zh_TW.ts
@@ -332,22 +332,37 @@ Signing is only possible with addresses of the type 'legacy'.</source>
     <message>
         <source>Inbound</source>
         <extracomment>An inbound connection from a peer. An inbound connection is a connection initiated by a peer.</extracomment>
-        <translation type="unfinished">進來</translation>
+        <translation type="unfinished">傳入</translation>
     </message>
     <message>
         <source>Outbound</source>
         <extracomment>An outbound connection to a peer. An outbound connection is a connection initiated by us.</extracomment>
-        <translation type="unfinished">出去</translation>
+        <translation type="unfinished">傳出</translation>
+    </message>
+    <message>
+        <source>Full Relay</source>
+        <extracomment>Peer connection type that relays all network information.</extracomment>
+        <translation type="unfinished">完整转发</translation>
     </message>
     <message>
         <source>Block Relay</source>
         <extracomment>Peer connection type that relays network information about blocks and not transactions or addresses.</extracomment>
-        <translation type="unfinished">区块转发</translation>
+        <translation type="unfinished">區塊轉發</translation>
     </message>
     <message>
         <source>Manual</source>
         <extracomment>Peer connection type established manually through one of several methods.</extracomment>
-        <translation type="unfinished">手册</translation>
+        <translation type="unfinished">手冊</translation>
+    </message>
+    <message>
+        <source>Feeler</source>
+        <extracomment>Short-lived peer connection type that tests the aliveness of known addresses.</extracomment>
+        <translation type="unfinished">触须</translation>
+    </message>
+    <message>
+        <source>Address Fetch</source>
+        <extracomment>Short-lived peer connection type that solicits known addresses from a peer.</extracomment>
+        <translation type="unfinished">地址取回</translation>
     </message>
     <message>
         <source>%1 d</source>
@@ -581,10 +596,6 @@ Signing is only possible with addresses of the type 'legacy'.</source>
         <source>Processing blocks on disk…</source>
         <translation type="unfinished">处理磁盘上的区块...</translation>
     </message>
-    <message>
-        <source>Connecting to peers…</source>
-        <translation type="unfinished">连到同行...</translation>
-    </message>
     <message>
         <source>Request payments (generates QR codes and bitcoin: URIs)</source>
         <translation type="unfinished">要求付款(產生 QR Code 和 bitcoin 付款協議的資源識別碼: URI)</translation>
@@ -613,7 +624,7 @@ Signing is only possible with addresses of the type 'legacy'.</source>
     </message>
     <message>
         <source>Catching up…</source>
-        <translation type="unfinished">赶上...</translation>
+        <translation type="unfinished">正在追上进度...</translation>
     </message>
     <message>
         <source>Last received block was generated %1 ago.</source>
@@ -741,6 +752,23 @@ Signing is only possible with addresses of the type 'legacy'.</source>
         <extracomment>Label of the input field where the name of the wallet is entered.</extracomment>
         <translation type="unfinished">錢包名稱</translation>
     </message>
+    <message>
+        <source>Invalid Wallet Name</source>
+        <translation type="unfinished">無效的錢包名稱</translation>
+    </message>
+    <message>
+        <source>Wallet name cannot be empty</source>
+        <translation type="unfinished">錢包名稱不能為空白</translation>
+    </message>
+    <message>
+        <source>Restore and Migrate Wallet Backup</source>
+        <translation type="unfinished">恢復及遷移錢包備份</translation>
+    </message>
+    <message>
+        <source>Restore and Migrate Wallet</source>
+        <extracomment>Title of pop-up window shown when the user is attempting to restore a wallet.</extracomment>
+        <translation type="unfinished">恢復及遷移錢包</translation>
+    </message>
     <message>
         <source>&amp;Window</source>
         <translation type="unfinished">&amp;視窗</translation>
@@ -952,15 +980,15 @@ Signing is only possible with addresses of the type 'legacy'.</source>
     </message>
     <message>
         <source>&amp;Copy address</source>
-        <translation type="unfinished">&amp;复制地址</translation>
+        <translation type="unfinished">&amp;複製地址</translation>
     </message>
     <message>
         <source>Copy &amp;label</source>
-        <translation type="unfinished">复制和标签</translation>
+        <translation type="unfinished">複製 &amp;label</translation>
     </message>
     <message>
         <source>Copy &amp;amount</source>
-        <translation type="unfinished">复制和数量</translation>
+        <translation type="unfinished">複製金額 &amp;amount</translation>
     </message>
     <message>
         <source>Copy transaction &amp;ID and output index</source>
@@ -1086,6 +1114,24 @@ The migration process will create a backup of the wallet before migrating. This
         <source>Solvable but not watched scripts have been migrated to a new wallet named '%1'.</source>
         <translation type="unfinished">可解决但未被观察到的脚本已经被迁移到被命名为“%1”的新钱包。</translation>
     </message>
+    <message>
+        <source>Restore and Migrate wallet</source>
+        <translation type="unfinished">恢復及遷移錢包</translation>
+    </message>
+    <message>
+        <source>Are you sure you wish to restore the wallet file &lt;i&gt;%1&lt;/i&gt; to &lt;i&gt;%2&lt;/i&gt; and migrate it?</source>
+        <translation type="unfinished">您確定要恢復錢包檔案&lt;i&gt;%1&lt;/i&gt;到&lt;i&gt;%2&lt;/i&gt;及遷移它嗎？</translation>
+    </message>
+    <message>
+        <source>Restore Wallet</source>
+        <extracomment>Title of progress window which is displayed when wallets are being restored.</extracomment>
+        <translation type="unfinished">恢復錢包</translation>
+    </message>
+    <message>
+        <source>Restoring Wallet &lt;b&gt;%1&lt;/b&gt;…</source>
+        <extracomment>Descriptive text of the restore wallets progress window which indicates to the user that wallets are currently being restored.</extracomment>
+        <translation type="unfinished">正在恢復錢包&lt;b&gt;%1&lt;/b&gt;...</translation>
+    </message>
     <message>
         <source>Migration failed</source>
         <translation type="unfinished">遷移失敗</translation>
@@ -1204,10 +1250,6 @@ The migration process will create a backup of the wallet before migrating. This
         <source>Disable Private Keys</source>
         <translation type="unfinished">禁用私鑰</translation>
     </message>
-    <message>
-        <source>Make a blank wallet. Blank wallets do not initially have private keys or scripts. Private keys and addresses can be imported, or an HD seed can be set, at a later time.</source>
-        <translation type="unfinished">製作一個空白的錢包。空白錢包最初沒有私鑰或腳本。以後可以匯入私鑰和地址，或者可以設定HD種子。</translation>
-    </message>
     <message>
         <source>Make Blank Wallet</source>
         <translation type="unfinished">製作空白錢包</translation>
@@ -1917,28 +1959,26 @@ The migration process will create a backup of the wallet before migrating. This
     </message>
     <message>
         <source>Save…</source>
-        <translation type="unfinished">拯救...</translation>
+        <translation type="unfinished">儲存...</translation>
     </message>
     <message>
         <source>Close</source>
         <translation type="unfinished">關閉</translation>
     </message>
-    <message>
-        <source>Failed to load transaction: %1</source>
-        <translation type="unfinished">無法載入交易：%1</translation>
-    </message>
-    <message>
-        <source>Failed to sign transaction: %1</source>
-        <translation type="unfinished">無法簽名交易：%1</translation>
-    </message>
     <message>
         <source>Cannot sign inputs while wallet is locked.</source>
-        <translation type="unfinished">钱包已锁定，无法签名交易输入项。</translation>
+        <translation type="unfinished">錢包已鎖定，無法簽署交易輸入項。</translation>
     </message>
     <message>
         <source>Could not sign any more inputs.</source>
         <translation type="unfinished">無法再簽名 input</translation>
     </message>
+    <message numerus="yes">
+        <source>Signed %n input(s), but more signatures are still required.</source>
+        <translation type="unfinished">
+            <numerusform />
+        </translation>
+    </message>
     <message>
         <source>Signed transaction successfully. Transaction is ready to broadcast.</source>
         <translation type="unfinished">成功簽名交易。交易已準備好廣播。</translation>
@@ -1947,14 +1987,6 @@ The migration process will create a backup of the wallet before migrating. This
         <source>Unknown error processing transaction.</source>
         <translation type="unfinished">處理交易有未知的錯誤</translation>
     </message>
-    <message>
-        <source>Transaction broadcast successfully! Transaction ID: %1</source>
-        <translation type="unfinished">交易成功廣播！交易 ID：%1</translation>
-    </message>
-    <message>
-        <source>Transaction broadcast failed: %1</source>
-        <translation type="unfinished">交易廣播失敗：%1</translation>
-    </message>
     <message>
         <source>PSBT copied to clipboard.</source>
         <translation type="unfinished">PSBT已復製到剪貼簿</translation>
@@ -1966,7 +1998,7 @@ The migration process will create a backup of the wallet before migrating. This
     <message>
         <source>Partially Signed Transaction (Binary)</source>
         <extracomment>Expanded name of the binary PSBT file format. See: BIP 174.</extracomment>
-        <translation type="unfinished">部分签名交易(二进制)</translation>
+        <translation type="unfinished">部分簽名交易(二進位)</translation>
     </message>
     <message>
         <source>PSBT saved to disk.</source>
@@ -1996,6 +2028,12 @@ The migration process will create a backup of the wallet before migrating. This
         <source>or</source>
         <translation type="unfinished">或</translation>
     </message>
+    <message numerus="yes">
+        <source>Transaction has %n unsigned input(s).</source>
+        <translation type="unfinished">
+            <numerusform />
+        </translation>
+    </message>
     <message>
         <source>Transaction is missing some information about inputs.</source>
         <translation type="unfinished">交易缺少有關 input 的一些訊息。</translation>
@@ -2047,9 +2085,9 @@ The migration process will create a backup of the wallet before migrating. This
         <source>Cannot process payment request because BIP70 is not supported.
 Due to widespread security flaws in BIP70 it's strongly recommended that any merchant instructions to switch wallets be ignored.
 If you are receiving this error you should request the merchant provide a BIP21 compatible URI.</source>
-        <translation type="unfinished">因为不支持BIP70，无法处理付款请求。
-由于BIP70具有广泛的安全缺陷，无论哪个商家指引要求您更换钱包，我们都强烈建议您不要听信。
-如果您看到了这个错误，您应该要求商家提供兼容BIP21的URI。</translation>
+        <translation type="unfinished">因為不支援BIP70，無法處理付款請求。
+由於BIP70具有廣泛的安全缺陷，無論哪個商家指引要求更換錢包，強烈建議不要更換。
+如果您看到了這個錯誤，您應該要求商家提供與BIP21相容的URI。</translation>
     </message>
     <message>
         <source>URI cannot be parsed! This can be caused by an invalid Bitcoin address or malformed URI parameters.</source>
@@ -2075,12 +2113,12 @@ If you are receiving this error you should request the merchant provide a BIP21
     <message>
         <source>Peer</source>
         <extracomment>Title of Peers Table column which contains a unique number used to identify a connection.</extracomment>
-        <translation type="unfinished">同行</translation>
+        <translation type="unfinished">節點</translation>
     </message>
     <message>
         <source>Age</source>
         <extracomment>Title of Peers Table column which indicates the duration (length of time) since the peer connection started.</extracomment>
-        <translation type="unfinished">连接时间</translation>
+        <translation type="unfinished">連接時間</translation>
     </message>
     <message>
         <source>Direction</source>
@@ -2115,19 +2153,19 @@ If you are receiving this error you should request the merchant provide a BIP21
     <message>
         <source>Inbound</source>
         <extracomment>An Inbound Connection from a Peer.</extracomment>
-        <translation type="unfinished">進來</translation>
+        <translation type="unfinished">傳入</translation>
     </message>
     <message>
         <source>Outbound</source>
         <extracomment>An Outbound Connection to a Peer.</extracomment>
-        <translation type="unfinished">出去</translation>
+        <translation type="unfinished">傳出</translation>
     </message>
 </context>
 <context>
     <name>QRImageWidget</name>
     <message>
         <source>&amp;Save Image…</source>
-        <translation type="unfinished">保存圖片(&amp;S)...</translation>
+        <translation type="unfinished">儲存圖片(&amp;S)...</translation>
     </message>
     <message>
         <source>&amp;Copy Image</source>
@@ -2285,10 +2323,6 @@ If you are receiving this error you should request the merchant provide a BIP21
         <source>Transaction Relay</source>
         <translation type="unfinished">交易轉發</translation>
     </message>
-    <message>
-        <source>Starting Block</source>
-        <translation type="unfinished">起始區塊</translation>
-    </message>
     <message>
         <source>Synced Headers</source>
         <translation type="unfinished">已同步區塊頭標</translation>
@@ -2726,7 +2760,7 @@ For more information on using this console, type %6.
     </message>
     <message>
         <source>Copy &amp;label</source>
-        <translation type="unfinished">複製 &amp;label</translation>
+        <translation type="unfinished">复制和标签</translation>
     </message>
     <message>
         <source>Copy &amp;message</source>
@@ -3084,7 +3118,7 @@ Note:  Since the fee is calculated on a per-byte basis, a fee rate of "100 satos
     <message>
         <source>Partially Signed Transaction (Binary)</source>
         <extracomment>Expanded name of the binary PSBT file format. See: BIP 174.</extracomment>
-        <translation type="unfinished">部分簽名交易(二進位)</translation>
+        <translation type="unfinished">部分签名交易(二进制)</translation>
     </message>
     <message>
         <source>PSBT saved</source>
@@ -3169,10 +3203,6 @@ Note:  Since the fee is calculated on a per-byte basis, a fee rate of "100 satos
         <source>The amount exceeds your balance.</source>
         <translation type="unfinished">金額超過餘額了。</translation>
     </message>
-    <message>
-        <source>The total exceeds your balance when the %1 transaction fee is included.</source>
-        <translation type="unfinished">包含 %1 的交易手續費後，總金額超過你的餘額了。</translation>
-    </message>
     <message>
         <source>Duplicate address found: addresses should only be used once each.</source>
         <translation type="unfinished">發現有重複的地址: 每個地址只能出現一次。</translation>
@@ -3760,7 +3790,7 @@ Note:  Since the fee is calculated on a per-byte basis, a fee rate of "100 satos
     </message>
     <message>
         <source>Copy &amp;amount</source>
-        <translation type="unfinished">复制和数量</translation>
+        <translation type="unfinished">複製金額 &amp;amount</translation>
     </message>
     <message>
         <source>Copy transaction &amp;ID</source>
@@ -4126,10 +4156,6 @@ Go to File &gt; Open Wallet to load a wallet.
         <source>Warning: Private keys detected in wallet {%s} with disabled private keys</source>
         <translation type="unfinished">警告: 在不允許私鑰的錢包 {%s} 中發現有私鑰</translation>
     </message>
-    <message>
-        <source>Warning: We do not appear to fully agree with our peers! You may need to upgrade, or other nodes may need to upgrade.</source>
-        <translation type="unfinished">警告: 我們和某些連線的節點對於區塊鏈結的決定不同！你可能需要升級，或是需要等其它的節點升級。</translation>
-    </message>
     <message>
         <source>Witness data for blocks after height %d requires validation. Please restart with -reindex.</source>
         <translation type="unfinished">需要驗證高度在%d之後的區塊見證數據。 請使用 -reindex 重新啟動。</translation>
@@ -4168,11 +4194,11 @@ Go to File &gt; Open Wallet to load a wallet.
     </message>
     <message>
         <source>Cannot provide specific connections and have addrman find outgoing connections at the same time.</source>
-        <translation type="unfinished">在使用位址管理器(addrman)尋找出站連線時，無法同時提供特定的連線。</translation>
+        <translation type="unfinished">在使用地址管理器(addrman)寻找出站连接时，无法同时提供特定的连接。</translation>
     </message>
     <message>
         <source>Error loading %s: External signer wallet being loaded without external signer support compiled</source>
-        <translation type="unfinished">載入%s時出錯: 編譯時未啟用外部簽章器支持，卻仍試圖載入外部簽章器錢包</translation>
+        <translation type="unfinished">加载%s时出错: 编译时未启用外部签名器支持，却仍然试图加载外部签名器钱包</translation>
     </message>
     <message>
         <source>Error reading %s! All keys read correctly, but transaction data or address metadata may be missing or incorrect.</source>
@@ -4180,15 +4206,15 @@ Go to File &gt; Open Wallet to load a wallet.
     </message>
     <message>
         <source>Error: Address book data in wallet cannot be identified to belong to migrated wallets</source>
-        <translation type="unfinished">錯誤：錢包中的通訊錄資料無法被辨識為屬於遷移後的錢包</translation>
+        <translation type="unfinished">错误：钱包中的地址簿数据无法被识别为属于迁移后的钱包</translation>
     </message>
     <message>
         <source>Error: Duplicate descriptors created during migration. Your wallet may be corrupted.</source>
-        <translation type="unfinished">錯誤：遷移過程中創建了重複的輸出描述符。 你的錢包可能已損壞。</translation>
+        <translation type="unfinished">错误：迁移过程中创建了重复的输出描述符。你的钱包可能已损坏。</translation>
     </message>
     <message>
         <source>Error: Transaction %s in wallet cannot be identified to belong to migrated wallets</source>
-        <translation type="unfinished">錯誤：錢包中的交易%s無法被辨識為屬於遷移後的錢包</translation>
+        <translation type="unfinished">错误：钱包中的交易%s无法被识别为属于迁移后的钱包</translation>
     </message>
     <message>
         <source>Failed to rename invalid peers.dat file. Please move or delete it and try again.</source>
@@ -4210,14 +4236,6 @@ Go to File &gt; Open Wallet to load a wallet.
         <source>Option '-checkpoints' is set but checkpoints were removed. This option has no effect.</source>
         <translation type="unfinished">选项“-checkpoints”已设置，但检查点已被移除。该选项不再生效。 </translation>
     </message>
-    <message>
-        <source>Option '-maxorphantx' is set but no longer has any effect (see release notes). Please remove it from your configuration.</source>
-        <translation type="unfinished">选项“-maxorphantx”已设置，但已不再生效（参见发行说明）。请从您的配置中移除该选项。 </translation>
-    </message>
-    <message>
-        <source>Options '-datacarrier' or '-datacarriersize' are set but are marked as deprecated. They will be removed in a future version.</source>
-        <translation type="unfinished">选项“-datacarrier”或“-datacarriersize”已设置，但已标记为弃用。它们将在未来版本中移除。 </translation>
-    </message>
     <message>
         <source>Outbound connections restricted to CJDNS (-onlynet=cjdns) but -cjdnsreachable is not provided</source>
         <translation type="unfinished">傳出連線被限制為僅使用CJDNS (-onlynet=cjdns) ，但卻未提供 -cjdnsreachable 參數。</translation>
@@ -4280,10 +4298,6 @@ Unable to restore backup of wallet.</source>
         <source>default wallet</source>
         <translation type="unfinished">默认钱包</translation>
     </message>
-    <message>
-        <source>-paytxfee is deprecated and will be fully removed in v31.0.</source>
-        <translation type="unfinished">“-paytxfee”已弃用，并将在 v31.0 中完全移除。 </translation>
-    </message>
     <message>
         <source>A fatal internal error occurred, see debug.log for details: </source>
         <translation type="unfinished">發生致命的內部錯誤，有關詳情請查看 debug.log：</translation>
@@ -4293,8 +4307,12 @@ Unable to restore backup of wallet.</source>
         <translation type="unfinished">區塊驗證已中斷</translation>
     </message>
     <message>
-        <source>Cannot add WalletDescriptor to a non-descriptor wallet</source>
-        <translation type="unfinished">无法将钱包描述符添加到非描述符钱包。</translation>
+        <source>Can't spend unconfirmed version %d pre-selected input with a version 3 tx</source>
+        <translation type="unfinished">无法使用版本3交易花费未确认版本1%d的预选输入。</translation>
+    </message>
+    <message>
+        <source>Can't spend unconfirmed version 3 pre-selected input with a version %d tx</source>
+        <translation type="unfinished">无法使用版本1%d交易花费未确认版本3的预选输入。</translation>
     </message>
     <message>
         <source>Cannot write to directory '%s'; check permissions.</source>
@@ -4340,10 +4358,6 @@ Unable to restore backup of wallet.</source>
         <source>Dump file %s does not exist.</source>
         <translation type="unfinished">轉儲文件 %s 不存在</translation>
     </message>
-    <message>
-        <source>Error creating %s</source>
-        <translation type="unfinished">創建%s時出錯</translation>
-    </message>
     <message>
         <source>Error initializing block database</source>
         <translation type="unfinished">初始化區塊資料庫時發生錯誤</translation>
@@ -4352,10 +4366,6 @@ Unable to restore backup of wallet.</source>
         <source>Error loading %s</source>
         <translation type="unfinished">載入檔案 %s 時發生錯誤</translation>
     </message>
-    <message>
-        <source>Error loading %s: Private keys can only be disabled during creation</source>
-        <translation type="unfinished">載入 %s 時發生錯誤: 只有在造新錢包時能夠指定不允許私鑰</translation>
-    </message>
     <message>
         <source>Error loading %s: Wallet corrupted</source>
         <translation type="unfinished">載入檔案 %s 時發生錯誤: 錢包損毀了</translation>
@@ -4524,10 +4534,6 @@ Unable to restore backup of wallet.</source>
         <source>Failed to write block.</source>
         <translation type="unfinished">寫入區塊失敗。</translation>
     </message>
-    <message>
-        <source>Failed to write to block index database.</source>
-        <translation type="unfinished">寫入區塊索引資料庫失敗。</translation>
-    </message>
     <message>
         <source>Failure removing transaction: %s</source>
         <translation type="unfinished">%s删除交易时失败: </translation>
@@ -4572,14 +4578,14 @@ Unable to restore backup of wallet.</source>
         <source>Invalid P2P permission: '%s'</source>
         <translation type="unfinished">無效的 P2P 權限: '%s'</translation>
     </message>
-    <message>
-        <source>Invalid amount for %s=&lt;amount&gt;: '%s' (must be at least %s)</source>
-        <translation type="unfinished">%s=&lt;amount&gt;: '%s' 中指定了非法的金额 (必须至少达到 %s)</translation>
-    </message>
     <message>
         <source>Invalid amount for %s=&lt;amount&gt;: '%s'</source>
         <translation type="unfinished">%s=&lt;amount&gt;: '%s' 中指定了非法的金额</translation>
     </message>
+    <message>
+        <source>Creating wallet…</source>
+        <translation type="unfinished">創建錢包...</translation>
+    </message>
     <message>
         <source>Invalid amount for -%s=&lt;amount&gt;: '%s'</source>
         <translation type="unfinished">無效金額給 -%s=&lt;amount&gt;:'%s'</translation>
@@ -4692,6 +4698,10 @@ Unable to restore backup of wallet.</source>
         <source>Starting network threads…</source>
         <translation type="unfinished">正在開始網路線程...</translation>
     </message>
+    <message>
+        <source>The %s path uses exFAT, which is known to have intermittent corruption problems on macOS. Move this directory to a different filesystem to avoid data loss.</source>
+        <translation type="unfinished">%s路径使用exFAT，该格式在macOS上已知会出现间歇性损坏问题。请将此目录移动到其他文件系统以避免数据丢失。</translation>
+    </message>
     <message>
         <source>The source code is available from %s.</source>
         <translation type="unfinished">原始碼可以在 %s 取得。</translation>
@@ -4720,10 +4730,6 @@ Unable to restore backup of wallet.</source>
         <source>This is the minimum transaction fee you pay on every transaction.</source>
         <translation type="unfinished">這是你每次交易付款時最少要付的手續費。</translation>
     </message>
-    <message>
-        <source>This is the transaction fee you will pay if you send a transaction.</source>
-        <translation type="unfinished">這是你交易付款時所要付的手續費。</translation>
-    </message>
     <message>
         <source>Transaction %s does not belong to this wallet</source>
         <translation type="unfinished">交易%s不属于这个钱包</translation>
@@ -4846,7 +4852,7 @@ Please try running the latest software version.
     </message>
     <message>
         <source>Do you want to rebuild the databases now?</source>
-        <translation type="unfinished">你想现在重建数据库吗？</translation>
+        <translation type="unfinished">你想要現在重建資料庫嗎？</translation>
     </message>
     <message>
         <source>Error: Could not add watchonly tx %s to watchonly wallet</source>
@@ -4854,11 +4860,11 @@ Please try running the latest software version.
     </message>
     <message>
         <source>Error: Could not delete watchonly transactions. </source>
-        <translation type="unfinished">错误: 无法删除仅观察交易。</translation>
+        <translation type="unfinished">錯誤：無法刪除僅觀察交易。</translation>
     </message>
     <message>
         <source>Error: Wallet does not exist</source>
-        <translation type="unfinished">错误：钱包不存在。</translation>
+        <translation type="unfinished">錯誤：錢包不存˙在。</translation>
     </message>
     <message>
         <source>Error: cannot remove legacy wallet records</source>
diff --git a/src/qt/locale/ts_files.cmake b/src/qt/locale/ts_files.cmake
index ecc833b577e2..23dce043f289 100644
--- a/src/qt/locale/ts_files.cmake
+++ b/src/qt/locale/ts_files.cmake
@@ -91,9 +91,11 @@ set(ts_files
   bitcoin_uz@Latn.ts
   bitcoin_ve.ts
   bitcoin_yi.ts
+  bitcoin_yo.ts
   bitcoin_yue.ts
   bitcoin_zh-Hans.ts
   bitcoin_zh-Hant.ts
+  bitcoin_zh.ts
   bitcoin_zh_CN.ts
   bitcoin_zh_HK.ts
   bitcoin_zh_TW.ts
diff --git a/src/qt/notificator.cpp b/src/qt/notificator.cpp
index 397d3ad88afa..215ffa52ea1c 100644
--- a/src/qt/notificator.cpp
+++ b/src/qt/notificator.cpp
@@ -176,8 +176,7 @@ void Notificator::notifyDBus(Class cls, const QString &title, const QString &tex
         case Information: sicon = QStyle::SP_MessageBoxInformation; break;
         case Warning: sicon = QStyle::SP_MessageBoxWarning; break;
         case Critical: sicon = QStyle::SP_MessageBoxCritical; break;
-        default: break;
-        }
+        } // no default case, so the compiler can warn about missing cases
         tmpicon = QApplication::style()->standardIcon(sicon);
     }
     else
diff --git a/src/qt/optionsdialog.cpp b/src/qt/optionsdialog.cpp
index 124462060234..f68e5825baba 100644
--- a/src/qt/optionsdialog.cpp
+++ b/src/qt/optionsdialog.cpp
@@ -456,17 +456,14 @@ void OptionsDialog::updateDefaultProxyNets()
         proxyIpText = ui_proxy.ToStringAddrPort();
     }
 
-    Proxy proxy;
-    bool has_proxy;
+    const auto proxy_ipv4 = model->node().getProxy(NET_IPV4);
+    ui->proxyReachIPv4->setChecked(proxy_ipv4 && proxy_ipv4->ToString() == proxyIpText);
 
-    has_proxy = model->node().getProxy(NET_IPV4, proxy);
-    ui->proxyReachIPv4->setChecked(has_proxy && proxy.ToString() == proxyIpText);
+    const auto proxy_ipv6 = model->node().getProxy(NET_IPV6);
+    ui->proxyReachIPv6->setChecked(proxy_ipv6 && proxy_ipv6->ToString() == proxyIpText);
 
-    has_proxy = model->node().getProxy(NET_IPV6, proxy);
-    ui->proxyReachIPv6->setChecked(has_proxy && proxy.ToString() == proxyIpText);
-
-    has_proxy = model->node().getProxy(NET_ONION, proxy);
-    ui->proxyReachTor->setChecked(has_proxy && proxy.ToString() == proxyIpText);
+    const auto proxy_onion = model->node().getProxy(NET_ONION);
+    ui->proxyReachTor->setChecked(proxy_onion && proxy_onion->ToString() == proxyIpText);
 }
 
 ProxyAddressValidator::ProxyAddressValidator(QObject *parent) :
diff --git a/src/qt/sendcoinsdialog.cpp b/src/qt/sendcoinsdialog.cpp
index d4a63987f47b..493b4fb7b3ed 100644
--- a/src/qt/sendcoinsdialog.cpp
+++ b/src/qt/sendcoinsdialog.cpp
@@ -749,12 +749,9 @@ void SendCoinsDialog::processSendCoinsReturn(const WalletModel::SendCoinsReturn
     case WalletModel::AbsurdFee:
         msgParams.first = tr("A fee higher than %1 is considered an absurdly high fee.").arg(BitcoinUnits::formatWithUnit(model->getOptionsModel()->getDisplayUnit(), model->wallet().getDefaultMaxTxFee()));
         break;
-    // included to prevent a compiler warning.
     case WalletModel::OK:
-    default:
         return;
-    }
-
+    } // no default case, so the compiler can warn about missing cases
     Q_EMIT message(tr("Send Coins"), msgParams.first, msgParams.second);
 }
 
diff --git a/src/qt/signverifymessagedialog.cpp b/src/qt/signverifymessagedialog.cpp
index e87f1b84f67c..cb14192f4d41 100644
--- a/src/qt/signverifymessagedialog.cpp
+++ b/src/qt/signverifymessagedialog.cpp
@@ -153,8 +153,7 @@ void SignVerifyMessageDialog::on_signMessageButton_SM_clicked()
         case SigningResult::SIGNING_FAILED:
             error = tr("Message signing failed.");
             break;
-        // no default case, so the compiler can warn about missing cases
-    }
+    } // no default case, so the compiler can warn about missing cases
 
     if (res != SigningResult::OK) {
         ui->statusLabel_SM->setStyleSheet("QLabel { color: red; }");
diff --git a/src/qt/splashscreen.cpp b/src/qt/splashscreen.cpp
index 553f6789435b..5a89ce0813d2 100644
--- a/src/qt/splashscreen.cpp
+++ b/src/qt/splashscreen.cpp
@@ -7,6 +7,7 @@
 #include <qt/splashscreen.h>
 
 #include <clientversion.h>
+#include <common/license_info.h>
 #include <common/system.h>
 #include <interfaces/handler.h>
 #include <interfaces/node.h>
diff --git a/src/qt/test/rpcnestedtests.cpp b/src/qt/test/rpcnestedtests.cpp
index 18f4fc1eef56..68130df88aac 100644
--- a/src/qt/test/rpcnestedtests.cpp
+++ b/src/qt/test/rpcnestedtests.cpp
@@ -16,9 +16,9 @@
 #include <string>
 #include <stdexcept>
 
-static RPCHelpMan rpcNestedTest_rpc()
+static RPCMethod rpcNestedTest_rpc()
 {
-    return RPCHelpMan{
+    return RPCMethod{
         "rpcNestedTest",
         "echo the passed string(s)",
         {
@@ -28,7 +28,7 @@ static RPCHelpMan rpcNestedTest_rpc()
         },
         RPCResult{RPCResult::Type::ANY, "", ""},
         RPCExamples{""},
-        [&](const RPCHelpMan& self, const JSONRPCRequest& request) -> UniValue {
+        [](const RPCMethod& self, const JSONRPCRequest& request) -> UniValue {
             return request.params.write(0, 0);
         },
     };
diff --git a/src/qt/test/test_main.cpp b/src/qt/test/test_main.cpp
index a8015fb582f0..5e91b0723ba4 100644
--- a/src/qt/test/test_main.cpp
+++ b/src/qt/test/test_main.cpp
@@ -28,8 +28,6 @@
 
 #include <functional>
 
-const std::function<void(const std::string&)> G_TEST_LOG_FUN{};
-
 const std::function<std::vector<const char*>()> G_TEST_COMMAND_LINE_ARGUMENTS{};
 
 const std::function<std::string()> G_TEST_GET_FULL_NAME{};
diff --git a/src/qt/test/wallettests.cpp b/src/qt/test/wallettests.cpp
index 19b25650b788..bb9e061851b9 100644
--- a/src/qt/test/wallettests.cpp
+++ b/src/qt/test/wallettests.cpp
@@ -87,7 +87,7 @@ Txid SendCoins(CWallet& wallet, SendCoinsDialog& sendCoinsDialog, const CTxDesti
         ->findChild<QCheckBox*>("optInRBF")
         ->setCheckState(rbf ? Qt::Checked : Qt::Unchecked);
     Txid txid;
-    boost::signals2::scoped_connection c(wallet.NotifyTransactionChanged.connect([&txid](const Txid& hash, ChangeType status) {
+    btcsignals::scoped_connection c(wallet.NotifyTransactionChanged.connect([&txid](const Txid& hash, ChangeType status) {
         if (status == CT_NEW) txid = hash;
     }));
     ConfirmSend(/*text=*/nullptr, confirm_type);
diff --git a/src/qt/transactiontablemodel.cpp b/src/qt/transactiontablemodel.cpp
index 6c09c4d7a891..0eff47ee9272 100644
--- a/src/qt/transactiontablemodel.cpp
+++ b/src/qt/transactiontablemodel.cpp
@@ -477,9 +477,8 @@ QVariant TransactionTableModel::txStatusDecoration(const TransactionRecord *wtx)
         }
     case TransactionStatus::NotAccepted:
         return QIcon(":/icons/transaction_0");
-    default:
-        return COLOR_BLACK;
-    }
+    } // no default case, so the compiler can warn about missing cases
+    assert(false);
 }
 
 QString TransactionTableModel::formatTooltip(const TransactionRecord *rec) const
diff --git a/src/qt/utilitydialog.cpp b/src/qt/utilitydialog.cpp
index 99a3a837b994..5784b3176016 100644
--- a/src/qt/utilitydialog.cpp
+++ b/src/qt/utilitydialog.cpp
@@ -12,6 +12,7 @@
 
 #include <clientversion.h>
 #include <common/args.h>
+#include <common/license_info.h>
 #include <init.h>
 #include <util/strencodings.h>
 
diff --git a/src/rest.cpp b/src/rest.cpp
index f59dc1cba236..53dd3d16119f 100644
--- a/src/rest.cpp
+++ b/src/rest.cpp
@@ -28,6 +28,7 @@
 #include <undo.h>
 #include <util/any.h>
 #include <util/check.h>
+#include <util/overflow.h>
 #include <util/strencodings.h>
 #include <validation.h>
 
@@ -710,7 +711,7 @@ static bool rest_block_filter(const std::any& context, HTTPRequest* req, const s
 }
 
 // A bit of a hack - dependency on a function defined in rpc/blockchain.cpp
-RPCHelpMan getblockchaininfo();
+RPCMethod getblockchaininfo();
 
 static bool rest_chaininfo(const std::any& context, HTTPRequest* req, const std::string& uri_part)
 {
@@ -737,7 +738,7 @@ static bool rest_chaininfo(const std::any& context, HTTPRequest* req, const std:
 }
 
 
-RPCHelpMan getdeploymentinfo();
+RPCMethod getdeploymentinfo();
 
 static bool rest_deploymentinfo(const std::any& context, HTTPRequest* req, const std::string& str_uri_part)
 {
@@ -993,7 +994,7 @@ static bool rest_getutxos(const std::any& context, HTTPRequest* req, const std::
     std::vector<CCoin> outs;
     std::string bitmapStringRepresentation;
     std::vector<bool> hits;
-    bitmap.resize((vOutPoints.size() + 7) / 8);
+    bitmap.resize(CeilDiv(vOutPoints.size(), 8u));
     ChainstateManager* maybe_chainman = GetChainman(context, req);
     if (!maybe_chainman) return false;
     ChainstateManager& chainman = *maybe_chainman;
diff --git a/src/rpc/blockchain.cpp b/src/rpc/blockchain.cpp
index d97b7c6c15c6..8d588b9e29fd 100644
--- a/src/rpc/blockchain.cpp
+++ b/src/rpc/blockchain.cpp
@@ -244,9 +244,9 @@ UniValue blockToJSON(BlockManager& blockman, const CBlock& block, const CBlockIn
     return result;
 }
 
-static RPCHelpMan getblockcount()
+static RPCMethod getblockcount()
 {
-    return RPCHelpMan{
+    return RPCMethod{
         "getblockcount",
         "Returns the height of the most-work fully-validated chain.\n"
                 "The genesis block has height 0.\n",
@@ -257,7 +257,7 @@ static RPCHelpMan getblockcount()
                     HelpExampleCli("getblockcount", "")
             + HelpExampleRpc("getblockcount", "")
                 },
-        [&](const RPCHelpMan& self, const JSONRPCRequest& request) -> UniValue
+        [](const RPCMethod& self, const JSONRPCRequest& request) -> UniValue
 {
     ChainstateManager& chainman = EnsureAnyChainman(request.context);
     LOCK(cs_main);
@@ -266,9 +266,9 @@ static RPCHelpMan getblockcount()
     };
 }
 
-static RPCHelpMan getbestblockhash()
+static RPCMethod getbestblockhash()
 {
-    return RPCHelpMan{
+    return RPCMethod{
         "getbestblockhash",
         "Returns the hash of the best (tip) block in the most-work fully-validated chain.\n",
                 {},
@@ -278,7 +278,7 @@ static RPCHelpMan getbestblockhash()
                     HelpExampleCli("getbestblockhash", "")
             + HelpExampleRpc("getbestblockhash", "")
                 },
-        [&](const RPCHelpMan& self, const JSONRPCRequest& request) -> UniValue
+        [](const RPCMethod& self, const JSONRPCRequest& request) -> UniValue
 {
     ChainstateManager& chainman = EnsureAnyChainman(request.context);
     LOCK(cs_main);
@@ -287,9 +287,9 @@ static RPCHelpMan getbestblockhash()
     };
 }
 
-static RPCHelpMan waitfornewblock()
+static RPCMethod waitfornewblock()
 {
-    return RPCHelpMan{
+    return RPCMethod{
         "waitfornewblock",
         "Waits for any new block and returns useful info about it.\n"
                 "\nReturns the current block on timeout or exit.\n"
@@ -308,7 +308,7 @@ static RPCHelpMan waitfornewblock()
                     HelpExampleCli("waitfornewblock", "1000")
             + HelpExampleRpc("waitfornewblock", "1000")
                 },
-        [&](const RPCHelpMan& self, const JSONRPCRequest& request) -> UniValue
+        [](const RPCMethod& self, const JSONRPCRequest& request) -> UniValue
 {
     int timeout = 0;
     if (!request.params[0].isNull())
@@ -346,9 +346,9 @@ static RPCHelpMan waitfornewblock()
     };
 }
 
-static RPCHelpMan waitforblock()
+static RPCMethod waitforblock()
 {
-    return RPCHelpMan{
+    return RPCMethod{
         "waitforblock",
         "Waits for a specific new block and returns useful info about it.\n"
                 "\nReturns the current block on timeout or exit.\n"
@@ -367,7 +367,7 @@ static RPCHelpMan waitforblock()
                     HelpExampleCli("waitforblock", "\"0000000000079f8ef3d2c688c244eb7a4570b24c9ed7b4a8c619eb02596f8862\" 1000")
             + HelpExampleRpc("waitforblock", "\"0000000000079f8ef3d2c688c244eb7a4570b24c9ed7b4a8c619eb02596f8862\", 1000")
                 },
-        [&](const RPCHelpMan& self, const JSONRPCRequest& request) -> UniValue
+        [](const RPCMethod& self, const JSONRPCRequest& request) -> UniValue
 {
     int timeout = 0;
 
@@ -407,9 +407,9 @@ static RPCHelpMan waitforblock()
     };
 }
 
-static RPCHelpMan waitforblockheight()
+static RPCMethod waitforblockheight()
 {
-    return RPCHelpMan{
+    return RPCMethod{
         "waitforblockheight",
         "Waits for (at least) block height and returns the height and hash\n"
                 "of the current tip.\n"
@@ -429,7 +429,7 @@ static RPCHelpMan waitforblockheight()
                     HelpExampleCli("waitforblockheight", "100 1000")
             + HelpExampleRpc("waitforblockheight", "100, 1000")
                 },
-        [&](const RPCHelpMan& self, const JSONRPCRequest& request) -> UniValue
+        [](const RPCMethod& self, const JSONRPCRequest& request) -> UniValue
 {
     int timeout = 0;
 
@@ -470,9 +470,9 @@ static RPCHelpMan waitforblockheight()
     };
 }
 
-static RPCHelpMan syncwithvalidationinterfacequeue()
+static RPCMethod syncwithvalidationinterfacequeue()
 {
-    return RPCHelpMan{
+    return RPCMethod{
         "syncwithvalidationinterfacequeue",
         "Waits for the validation interface queue to catch up on everything that was there when we entered this function.\n",
                 {},
@@ -481,7 +481,7 @@ static RPCHelpMan syncwithvalidationinterfacequeue()
                     HelpExampleCli("syncwithvalidationinterfacequeue","")
             + HelpExampleRpc("syncwithvalidationinterfacequeue","")
                 },
-        [&](const RPCHelpMan& self, const JSONRPCRequest& request) -> UniValue
+        [](const RPCMethod& self, const JSONRPCRequest& request) -> UniValue
 {
     NodeContext& node = EnsureAnyNodeContext(request.context);
     CHECK_NONFATAL(node.validation_signals)->SyncWithValidationInterfaceQueue();
@@ -490,9 +490,9 @@ static RPCHelpMan syncwithvalidationinterfacequeue()
     };
 }
 
-static RPCHelpMan getdifficulty()
+static RPCMethod getdifficulty()
 {
-    return RPCHelpMan{
+    return RPCMethod{
         "getdifficulty",
         "Returns the proof-of-work difficulty as a multiple of the minimum difficulty.\n",
                 {},
@@ -502,7 +502,7 @@ static RPCHelpMan getdifficulty()
                     HelpExampleCli("getdifficulty", "")
             + HelpExampleRpc("getdifficulty", "")
                 },
-        [&](const RPCHelpMan& self, const JSONRPCRequest& request) -> UniValue
+        [](const RPCMethod& self, const JSONRPCRequest& request) -> UniValue
 {
     ChainstateManager& chainman = EnsureAnyChainman(request.context);
     LOCK(cs_main);
@@ -511,9 +511,9 @@ static RPCHelpMan getdifficulty()
     };
 }
 
-static RPCHelpMan getblockfrompeer()
+static RPCMethod getblockfrompeer()
 {
-    return RPCHelpMan{
+    return RPCMethod{
         "getblockfrompeer",
         "Attempt to fetch block from a given peer.\n\n"
         "We must have the header for this block, e.g. using submitheader.\n"
@@ -532,7 +532,7 @@ static RPCHelpMan getblockfrompeer()
             HelpExampleCli("getblockfrompeer", "\"00000000c937983704a73af28acdec37b049d214adbda81d7e2a3dd146f6ed09\" 0")
             + HelpExampleRpc("getblockfrompeer", "\"00000000c937983704a73af28acdec37b049d214adbda81d7e2a3dd146f6ed09\" 0")
         },
-        [&](const RPCHelpMan& self, const JSONRPCRequest& request) -> UniValue
+        [](const RPCMethod& self, const JSONRPCRequest& request) -> UniValue
 {
     const NodeContext& node = EnsureAnyNodeContext(request.context);
     ChainstateManager& chainman = EnsureChainman(node);
@@ -566,9 +566,9 @@ static RPCHelpMan getblockfrompeer()
     };
 }
 
-static RPCHelpMan getblockhash()
+static RPCMethod getblockhash()
 {
-    return RPCHelpMan{
+    return RPCMethod{
         "getblockhash",
         "Returns hash of block in best-block-chain at height provided.\n",
                 {
@@ -580,7 +580,7 @@ static RPCHelpMan getblockhash()
                     HelpExampleCli("getblockhash", "1000")
             + HelpExampleRpc("getblockhash", "1000")
                 },
-        [&](const RPCHelpMan& self, const JSONRPCRequest& request) -> UniValue
+        [](const RPCMethod& self, const JSONRPCRequest& request) -> UniValue
 {
     ChainstateManager& chainman = EnsureAnyChainman(request.context);
     LOCK(cs_main);
@@ -596,9 +596,9 @@ static RPCHelpMan getblockhash()
     };
 }
 
-static RPCHelpMan getblockheader()
+static RPCMethod getblockheader()
 {
-    return RPCHelpMan{
+    return RPCMethod{
         "getblockheader",
         "If verbose is false, returns a string that is serialized, hex-encoded data for blockheader 'hash'.\n"
                 "If verbose is true, returns an Object with information about blockheader <hash>.\n",
@@ -634,7 +634,7 @@ static RPCHelpMan getblockheader()
                     HelpExampleCli("getblockheader", "\"00000000c937983704a73af28acdec37b049d214adbda81d7e2a3dd146f6ed09\"")
             + HelpExampleRpc("getblockheader", "\"00000000c937983704a73af28acdec37b049d214adbda81d7e2a3dd146f6ed09\"")
                 },
-        [&](const RPCHelpMan& self, const JSONRPCRequest& request) -> UniValue
+        [](const RPCMethod& self, const JSONRPCRequest& request) -> UniValue
 {
     uint256 hash(ParseHashV(request.params[0], "hash"));
 
@@ -734,33 +734,37 @@ static CBlockUndo GetUndoChecked(BlockManager& blockman, const CBlockIndex& bloc
     return blockUndo;
 }
 
-const RPCResult getblock_vin{
-    RPCResult::Type::ARR, "vin", "",
-    {
-        {RPCResult::Type::OBJ, "", "",
+const RPCResult& GetBlockVin()
+{
+    static const RPCResult getblock_vin{
+        RPCResult::Type::ARR, "vin", "",
         {
-            {RPCResult::Type::ELISION, "", "The same output as verbosity = 2"},
-            {RPCResult::Type::OBJ, "prevout", "(Only if undo information is available)",
+            {RPCResult::Type::OBJ, "", "",
             {
-                {RPCResult::Type::BOOL, "generated", "Coinbase or not"},
-                {RPCResult::Type::NUM, "height", "The height of the prevout"},
-                {RPCResult::Type::STR_AMOUNT, "value", "The value in " + CURRENCY_UNIT},
-                {RPCResult::Type::OBJ, "scriptPubKey", "",
+                {RPCResult::Type::ELISION, "", "The same output as verbosity = 2"},
+                {RPCResult::Type::OBJ, "prevout", "(Only if undo information is available)",
                 {
-                    {RPCResult::Type::STR, "asm", "Disassembly of the output script"},
-                    {RPCResult::Type::STR, "desc", "Inferred descriptor for the output"},
-                    {RPCResult::Type::STR_HEX, "hex", "The raw output script bytes, hex-encoded"},
-                    {RPCResult::Type::STR, "address", /*optional=*/true, "The Bitcoin address (only if a well-defined address exists)"},
-                    {RPCResult::Type::STR, "type", "The type (one of: " + GetAllOutputTypes() + ")"},
+                    {RPCResult::Type::BOOL, "generated", "Coinbase or not"},
+                    {RPCResult::Type::NUM, "height", "The height of the prevout"},
+                    {RPCResult::Type::STR_AMOUNT, "value", "The value in " + CURRENCY_UNIT},
+                    {RPCResult::Type::OBJ, "scriptPubKey", "",
+                    {
+                        {RPCResult::Type::STR, "asm", "Disassembly of the output script"},
+                        {RPCResult::Type::STR, "desc", "Inferred descriptor for the output"},
+                        {RPCResult::Type::STR_HEX, "hex", "The raw output script bytes, hex-encoded"},
+                        {RPCResult::Type::STR, "address", /*optional=*/true, "The Bitcoin address (only if a well-defined address exists)"},
+                        {RPCResult::Type::STR, "type", "The type (one of: " + GetAllOutputTypes() + ")"},
+                    }},
                 }},
             }},
-        }},
-    }
-};
+        }
+    };
+    return getblock_vin;
+}
 
-static RPCHelpMan getblock()
+static RPCMethod getblock()
 {
-    return RPCHelpMan{
+    return RPCMethod{
         "getblock",
         "If verbosity is 0, returns a string that is serialized, hex-encoded data for block 'hash'.\n"
                 "If verbosity is 1, returns an Object with information about block <hash>.\n"
@@ -828,7 +832,7 @@ static RPCHelpMan getblock()
                     {
                         {RPCResult::Type::OBJ, "", "",
                         {
-                            getblock_vin,
+                            GetBlockVin(),
                         }},
                     }},
                 }},
@@ -837,7 +841,7 @@ static RPCHelpMan getblock()
                     HelpExampleCli("getblock", "\"00000000c937983704a73af28acdec37b049d214adbda81d7e2a3dd146f6ed09\"")
             + HelpExampleRpc("getblock", "\"00000000c937983704a73af28acdec37b049d214adbda81d7e2a3dd146f6ed09\"")
                 },
-        [&](const RPCHelpMan& self, const JSONRPCRequest& request) -> UniValue
+        [](const RPCMethod& self, const JSONRPCRequest& request) -> UniValue
 {
     uint256 hash(ParseHashV(request.params[0], "blockhash"));
 
@@ -905,9 +909,9 @@ std::optional<int> GetPruneHeight(const BlockManager& blockman, const CChain& ch
     return CHECK_NONFATAL(first_unpruned.pprev)->nHeight;
 }
 
-static RPCHelpMan pruneblockchain()
+static RPCMethod pruneblockchain()
 {
-    return RPCHelpMan{"pruneblockchain",
+    return RPCMethod{"pruneblockchain",
                 "Attempts to delete block and undo data up to a specified height or timestamp, if eligible for pruning.\n"
                 "Requires `-prune` to be enabled at startup. While pruned data may be re-fetched in some cases (e.g., via `getblockfrompeer`), local deletion is irreversible.\n",
                 {
@@ -920,7 +924,7 @@ static RPCHelpMan pruneblockchain()
                     HelpExampleCli("pruneblockchain", "1000")
             + HelpExampleRpc("pruneblockchain", "1000")
                 },
-        [&](const RPCHelpMan& self, const JSONRPCRequest& request) -> UniValue
+        [](const RPCMethod& self, const JSONRPCRequest& request) -> UniValue
 {
     ChainstateManager& chainman = EnsureAnyChainman(request.context);
     if (!chainman.m_blockman.IsPruneMode()) {
@@ -1007,9 +1011,9 @@ static std::optional<kernel::CCoinsStats> GetUTXOStats(CCoinsView* view, node::B
     return kernel::ComputeUTXOStats(hash_type, view, blockman, interruption_point);
 }
 
-static RPCHelpMan gettxoutsetinfo()
+static RPCMethod gettxoutsetinfo()
 {
-    return RPCHelpMan{
+    return RPCMethod{
         "gettxoutsetinfo",
         "Returns statistics about the unspent transaction output set.\n"
                 "Note this call may take some time if you are not using coinstatsindex.\n",
@@ -1061,7 +1065,7 @@ static RPCHelpMan gettxoutsetinfo()
                     HelpExampleRpc("gettxoutsetinfo", R"("none", 1000)") +
                     HelpExampleRpc("gettxoutsetinfo", R"("none", "00000000c937983704a73af28acdec37b049d214adbda81d7e2a3dd146f6ed09")")
                 },
-        [&](const RPCHelpMan& self, const JSONRPCRequest& request) -> UniValue
+        [](const RPCMethod& self, const JSONRPCRequest& request) -> UniValue
 {
     UniValue ret(UniValue::VOBJ);
 
@@ -1080,7 +1084,6 @@ static RPCHelpMan gettxoutsetinfo()
         LOCK(::cs_main);
         coins_view = &active_chainstate.CoinsDB();
         blockman = &active_chainstate.m_blockman;
-        pindex = blockman->LookupBlockIndex(coins_view->GetBestBlock());
     }
 
     if (!request.params[1].isNull()) {
@@ -1104,7 +1107,7 @@ static RPCHelpMan gettxoutsetinfo()
 
             // If a specific block was requested and the index has already synced past that height, we can return the
             // data already even though the index is not fully synced yet.
-            if (pindex->nHeight > summary.best_block_height) {
+            if (pindex && pindex->nHeight > summary.best_block_height) {
                 throw JSONRPCError(RPC_INTERNAL_ERROR, strprintf("Unable to get data because coinstatsindex is still syncing. Current height: %d", summary.best_block_height));
             }
         }
@@ -1130,8 +1133,9 @@ static RPCHelpMan gettxoutsetinfo()
             ret.pushKV("disk_size", stats.nDiskSize);
         } else {
             CCoinsStats prev_stats{};
-            if (pindex->nHeight > 0) {
-                const std::optional<CCoinsStats> maybe_prev_stats = GetUTXOStats(coins_view, *blockman, hash_type, node.rpc_interruption_point, pindex->pprev, index_requested);
+            if (stats.nHeight > 0) {
+                const CBlockIndex& block_index = *CHECK_NONFATAL(WITH_LOCK(::cs_main, return blockman->LookupBlockIndex(stats.hashBlock)));
+                const std::optional<CCoinsStats> maybe_prev_stats = GetUTXOStats(coins_view, *blockman, hash_type, node.rpc_interruption_point, block_index.pprev, index_requested);
                 if (!maybe_prev_stats) {
                     throw JSONRPCError(RPC_INTERNAL_ERROR, "Unable to read UTXO set");
                 }
@@ -1179,9 +1183,9 @@ static RPCHelpMan gettxoutsetinfo()
     };
 }
 
-static RPCHelpMan gettxout()
+static RPCMethod gettxout()
 {
-    return RPCHelpMan{
+    return RPCMethod{
         "gettxout",
         "Returns details about an unspent transaction output.\n",
         {
@@ -1213,7 +1217,7 @@ static RPCHelpMan gettxout()
             "\nAs a JSON-RPC call\n"
             + HelpExampleRpc("gettxout", "\"txid\", 1")
                 },
-        [&](const RPCHelpMan& self, const JSONRPCRequest& request) -> UniValue
+        [](const RPCMethod& self, const JSONRPCRequest& request) -> UniValue
 {
     NodeContext& node = EnsureAnyNodeContext(request.context);
     ChainstateManager& chainman = EnsureChainman(node);
@@ -1259,9 +1263,9 @@ static RPCHelpMan gettxout()
     };
 }
 
-static RPCHelpMan verifychain()
+static RPCMethod verifychain()
 {
-    return RPCHelpMan{
+    return RPCMethod{
         "verifychain",
         "Verifies blockchain database.\n",
                 {
@@ -1270,12 +1274,12 @@ static RPCHelpMan verifychain()
                     {"nblocks", RPCArg::Type::NUM, RPCArg::DefaultHint{strprintf("%d, 0=all", DEFAULT_CHECKBLOCKS)}, "The number of blocks to check."},
                 },
                 RPCResult{
-                    RPCResult::Type::BOOL, "", "Verification finished successfully. If false, check debug.log for reason."},
+                    RPCResult::Type::BOOL, "", "Verification finished successfully. If false, check debug log for reason."},
                 RPCExamples{
                     HelpExampleCli("verifychain", "")
             + HelpExampleRpc("verifychain", "")
                 },
-        [&](const RPCHelpMan& self, const JSONRPCRequest& request) -> UniValue
+        [](const RPCMethod& self, const JSONRPCRequest& request) -> UniValue
 {
     const int check_level{request.params[0].isNull() ? DEFAULT_CHECKLEVEL : request.params[0].getInt<int>()};
     const int check_depth{request.params[1].isNull() ? DEFAULT_CHECKBLOCKS : request.params[1].getInt<int>()};
@@ -1361,9 +1365,9 @@ static void SoftForkDescPushBack(const CBlockIndex* blockindex, UniValue& softfo
 }
 
 // used by rest.cpp:rest_chaininfo, so cannot be static
-RPCHelpMan getblockchaininfo()
+RPCMethod getblockchaininfo()
 {
-    return RPCHelpMan{"getblockchaininfo",
+    return RPCMethod{"getblockchaininfo",
         "Returns an object containing various state info regarding blockchain processing.\n",
         {},
         RPCResult{
@@ -1374,12 +1378,21 @@ RPCHelpMan getblockchaininfo()
                 {RPCResult::Type::NUM, "headers", "the current number of headers we have validated"},
                 {RPCResult::Type::STR, "bestblockhash", "the hash of the currently best block"},
                 {RPCResult::Type::STR_HEX, "bits", "nBits: compact representation of the block difficulty target"},
-                {RPCResult::Type::STR_HEX, "target", "The difficulty target"},
+                {RPCResult::Type::STR_HEX, "target", "the difficulty target"},
                 {RPCResult::Type::NUM, "difficulty", "the current difficulty"},
-                {RPCResult::Type::NUM_TIME, "time", "The block time expressed in " + UNIX_EPOCH_TIME},
-                {RPCResult::Type::NUM_TIME, "mediantime", "The median block time expressed in " + UNIX_EPOCH_TIME},
+                {RPCResult::Type::NUM_TIME, "time", "the block time expressed in " + UNIX_EPOCH_TIME},
+                {RPCResult::Type::NUM_TIME, "mediantime", "the median block time expressed in " + UNIX_EPOCH_TIME},
                 {RPCResult::Type::NUM, "verificationprogress", "estimate of verification progress [0..1]"},
                 {RPCResult::Type::BOOL, "initialblockdownload", "(debug information) estimate of whether this node is in Initial Block Download mode"},
+                {RPCResult::Type::OBJ, "backgroundvalidation", /*optional=*/true, "state info regarding background validation process",
+                {
+                    {RPCResult::Type::NUM, "snapshotheight", "the height of the snapshot block. Background validation verifies the chain from genesis up to this height"},
+                    {RPCResult::Type::NUM, "blocks", "the height of the most-work background fully-validated chain. The genesis block has height 0"},
+                    {RPCResult::Type::STR, "bestblockhash", "the hash of the currently best block validated in the background"},
+                    {RPCResult::Type::NUM_TIME, "mediantime", "the median block time expressed in " + UNIX_EPOCH_TIME},
+                    {RPCResult::Type::NUM, "verificationprogress", "estimate of background verification progress [0..1]"},
+                    {RPCResult::Type::STR_HEX, "chainwork", "total amount of work in background validated chain, in hexadecimal"},
+                }},
                 {RPCResult::Type::STR_HEX, "chainwork", "total amount of work in active chain, in hexadecimal"},
                 {RPCResult::Type::NUM, "size_on_disk", "the estimated size of the block and undo files on disk"},
                 {RPCResult::Type::BOOL, "pruned", "if the blocks are subject to pruning"},
@@ -1400,7 +1413,7 @@ RPCHelpMan getblockchaininfo()
             HelpExampleCli("getblockchaininfo", "")
             + HelpExampleRpc("getblockchaininfo", "")
         },
-        [&](const RPCHelpMan& self, const JSONRPCRequest& request) -> UniValue
+        [](const RPCMethod& self, const JSONRPCRequest& request) -> UniValue
 {
     ChainstateManager& chainman = EnsureAnyChainman(request.context);
     LOCK(cs_main);
@@ -1420,6 +1433,19 @@ RPCHelpMan getblockchaininfo()
     obj.pushKV("mediantime", tip.GetMedianTimePast());
     obj.pushKV("verificationprogress", chainman.GuessVerificationProgress(&tip));
     obj.pushKV("initialblockdownload", chainman.IsInitialBlockDownload());
+    auto historical_blocks{chainman.GetHistoricalBlockRange()};
+    if (historical_blocks) {
+        UniValue background_validation(UniValue::VOBJ);
+        const CBlockIndex& btip{*CHECK_NONFATAL(historical_blocks->first)};
+        const CBlockIndex& btarget{*CHECK_NONFATAL(historical_blocks->second)};
+        background_validation.pushKV("snapshotheight", btarget.nHeight);
+        background_validation.pushKV("blocks", btip.nHeight);
+        background_validation.pushKV("bestblockhash", btip.GetBlockHash().GetHex());
+        background_validation.pushKV("mediantime", btip.GetMedianTimePast());
+        background_validation.pushKV("chainwork", btip.nChainWork.GetHex());
+        background_validation.pushKV("verificationprogress", chainman.GetBackgroundVerificationProgress(btip));
+        obj.pushKV("backgroundvalidation", std::move(background_validation));
+    }
     obj.pushKV("chainwork", tip.nChainWork.GetHex());
     obj.pushKV("size_on_disk", chainman.m_blockman.CalculateCurrentUsage());
     obj.pushKV("pruned", chainman.m_blockman.IsPruneMode());
@@ -1481,15 +1507,15 @@ UniValue DeploymentInfo(const CBlockIndex* blockindex, const ChainstateManager&
     SoftForkDescPushBack(blockindex, softforks, chainman, Consensus::DEPLOYMENT_CSV);
     SoftForkDescPushBack(blockindex, softforks, chainman, Consensus::DEPLOYMENT_SEGWIT);
     SoftForkDescPushBack(blockindex, softforks, chainman, Consensus::DEPLOYMENT_TESTDUMMY);
-    SoftForkDescPushBack(blockindex, softforks, chainman, Consensus::DEPLOYMENT_TAPROOT);
     return softforks;
 }
 } // anon namespace
 
-RPCHelpMan getdeploymentinfo()
+RPCMethod getdeploymentinfo()
 {
-    return RPCHelpMan{"getdeploymentinfo",
-        "Returns an object containing various state info regarding deployments of consensus changes.",
+    return RPCMethod{"getdeploymentinfo",
+        "Returns an object containing various state info regarding deployments of consensus changes.\n"
+        "Consensus changes for which the new rules are enforced from genesis are not listed in \"deployments\".",
         {
             {"blockhash", RPCArg::Type::STR_HEX, RPCArg::Default{"hash of current chain tip"}, "The block hash at which to query deployment state"},
         },
@@ -1506,7 +1532,7 @@ RPCHelpMan getdeploymentinfo()
             }
         },
         RPCExamples{ HelpExampleCli("getdeploymentinfo", "") + HelpExampleRpc("getdeploymentinfo", "") },
-        [&](const RPCHelpMan& self, const JSONRPCRequest& request) -> UniValue
+        [](const RPCMethod& self, const JSONRPCRequest& request) -> UniValue
         {
             const ChainstateManager& chainman = EnsureAnyChainman(request.context);
             LOCK(cs_main);
@@ -1553,9 +1579,9 @@ struct CompareBlocksByHeight
     }
 };
 
-static RPCHelpMan getchaintips()
+static RPCMethod getchaintips()
 {
-    return RPCHelpMan{"getchaintips",
+    return RPCMethod{"getchaintips",
                 "Return information about all known tips in the block tree,"
                 " including the main chain as well as orphaned branches.\n",
                 {},
@@ -1578,7 +1604,7 @@ static RPCHelpMan getchaintips()
                     HelpExampleCli("getchaintips", "")
             + HelpExampleRpc("getchaintips", "")
                 },
-        [&](const RPCHelpMan& self, const JSONRPCRequest& request) -> UniValue
+        [](const RPCMethod& self, const JSONRPCRequest& request) -> UniValue
 {
     ChainstateManager& chainman = EnsureAnyChainman(request.context);
     LOCK(cs_main);
@@ -1651,9 +1677,9 @@ static RPCHelpMan getchaintips()
     };
 }
 
-static RPCHelpMan preciousblock()
+static RPCMethod preciousblock()
 {
-    return RPCHelpMan{
+    return RPCMethod{
         "preciousblock",
         "Treats a block as if it were received before others with the same work.\n"
                 "\nA later preciousblock call can override the effect of an earlier one.\n"
@@ -1666,7 +1692,7 @@ static RPCHelpMan preciousblock()
                     HelpExampleCli("preciousblock", "\"blockhash\"")
             + HelpExampleRpc("preciousblock", "\"blockhash\"")
                 },
-        [&](const RPCHelpMan& self, const JSONRPCRequest& request) -> UniValue
+        [](const RPCMethod& self, const JSONRPCRequest& request) -> UniValue
 {
     uint256 hash(ParseHashV(request.params[0], "blockhash"));
     CBlockIndex* pblockindex;
@@ -1713,9 +1739,9 @@ void InvalidateBlock(ChainstateManager& chainman, const uint256 block_hash) {
     }
 }
 
-static RPCHelpMan invalidateblock()
+static RPCMethod invalidateblock()
 {
-    return RPCHelpMan{
+    return RPCMethod{
         "invalidateblock",
         "Permanently marks a block as invalid, as if it violated a consensus rule.\n",
                 {
@@ -1726,7 +1752,7 @@ static RPCHelpMan invalidateblock()
                     HelpExampleCli("invalidateblock", "\"blockhash\"")
             + HelpExampleRpc("invalidateblock", "\"blockhash\"")
                 },
-        [&](const RPCHelpMan& self, const JSONRPCRequest& request) -> UniValue
+        [](const RPCMethod& self, const JSONRPCRequest& request) -> UniValue
 {
     ChainstateManager& chainman = EnsureAnyChainman(request.context);
     uint256 hash(ParseHashV(request.params[0], "blockhash"));
@@ -1758,9 +1784,9 @@ void ReconsiderBlock(ChainstateManager& chainman, uint256 block_hash) {
     }
 }
 
-static RPCHelpMan reconsiderblock()
+static RPCMethod reconsiderblock()
 {
-    return RPCHelpMan{
+    return RPCMethod{
         "reconsiderblock",
         "Removes invalidity status of a block, its ancestors and its descendants, reconsider them for activation.\n"
                 "This can be used to undo the effects of invalidateblock.\n",
@@ -1772,7 +1798,7 @@ static RPCHelpMan reconsiderblock()
                     HelpExampleCli("reconsiderblock", "\"blockhash\"")
             + HelpExampleRpc("reconsiderblock", "\"blockhash\"")
                 },
-        [&](const RPCHelpMan& self, const JSONRPCRequest& request) -> UniValue
+        [](const RPCMethod& self, const JSONRPCRequest& request) -> UniValue
 {
     ChainstateManager& chainman = EnsureAnyChainman(request.context);
     uint256 hash(ParseHashV(request.params[0], "blockhash"));
@@ -1784,9 +1810,9 @@ static RPCHelpMan reconsiderblock()
     };
 }
 
-static RPCHelpMan getchaintxstats()
+static RPCMethod getchaintxstats()
 {
-    return RPCHelpMan{
+    return RPCMethod{
         "getchaintxstats",
         "Compute statistics about the total number and rate of transactions in the chain.\n",
                 {
@@ -1815,7 +1841,7 @@ static RPCHelpMan getchaintxstats()
                     HelpExampleCli("getchaintxstats", "")
             + HelpExampleRpc("getchaintxstats", "2016")
                 },
-        [&](const RPCHelpMan& self, const JSONRPCRequest& request) -> UniValue
+        [](const RPCMethod& self, const JSONRPCRequest& request) -> UniValue
 {
     ChainstateManager& chainman = EnsureAnyChainman(request.context);
     const CBlockIndex* pindex;
@@ -1931,9 +1957,9 @@ static inline bool SetHasKeys(const std::set<T>& set, const Tk& key, const Args&
 // outpoint (needed for the utxo index) + nHeight + fCoinBase
 static constexpr size_t PER_UTXO_OVERHEAD = sizeof(COutPoint) + sizeof(uint32_t) + sizeof(bool);
 
-static RPCHelpMan getblockstats()
+static RPCMethod getblockstats()
 {
-    return RPCHelpMan{
+    return RPCMethod{
         "getblockstats",
         "Compute per block statistics for a given window. All amounts are in satoshis.\n"
                 "It won't work for some heights with pruning.\n",
@@ -1998,7 +2024,7 @@ static RPCHelpMan getblockstats()
                     HelpExampleRpc("getblockstats", R"("00000000c937983704a73af28acdec37b049d214adbda81d7e2a3dd146f6ed09", ["minfeerate","avgfeerate"])") +
                     HelpExampleRpc("getblockstats", R"(1000, ["minfeerate","avgfeerate"])")
                 },
-        [&](const RPCHelpMan& self, const JSONRPCRequest& request) -> UniValue
+        [](const RPCMethod& self, const JSONRPCRequest& request) -> UniValue
 {
     ChainstateManager& chainman = EnsureAnyChainman(request.context);
     const CBlockIndex& pindex{*CHECK_NONFATAL(ParseHashOrHeight(request.params[0], chainman))};
@@ -2291,12 +2317,12 @@ static const auto scan_result_status_some = RPCResult{
 };
 
 
-static RPCHelpMan scantxoutset()
+static RPCMethod scantxoutset()
 {
     // raw() descriptor corresponding to mainnet address 12cbQLTFMXRnSzktFkuoG3eHoMeFtpTu3S
     const std::string EXAMPLE_DESCRIPTOR_RAW = "raw(76a91411b366edfc0a8b66feebae5c2e25a7b6a5d1cf3188ac)#fm24fxxy";
 
-    return RPCHelpMan{
+    return RPCMethod{
         "scantxoutset",
         "Scans the unspent transaction output set for entries that match certain output descriptors.\n"
         "Examples of output descriptors are:\n"
@@ -2353,7 +2379,7 @@ static RPCHelpMan scantxoutset()
             HelpExampleRpc("scantxoutset", "\"status\"") +
             HelpExampleRpc("scantxoutset", "\"abort\"")
         },
-        [&](const RPCHelpMan& self, const JSONRPCRequest& request) -> UniValue
+        [](const RPCMethod& self, const JSONRPCRequest& request) -> UniValue
 {
     UniValue result(UniValue::VOBJ);
     const auto action{self.Arg<std::string_view>("action")};
@@ -2506,9 +2532,9 @@ static bool CheckBlockFilterMatches(BlockManager& blockman, const CBlockIndex& b
     return false;
 }
 
-static RPCHelpMan scanblocks()
+static RPCMethod scanblocks()
 {
-    return RPCHelpMan{
+    return RPCMethod{
         "scanblocks",
         "Return relevant blockhashes for given descriptors (requires blockfilterindex).\n"
         "This call may take several minutes. Make sure to use no RPC timeout (bitcoin-cli -rpcclienttimeout=0)",
@@ -2549,7 +2575,7 @@ static RPCHelpMan scanblocks()
             HelpExampleRpc("scanblocks", "\"start\", [\"addr(bcrt1q4u4nsgk6ug0sqz7r3rj9tykjxrsl0yy4d0wwte)\"], 100, 150, \"basic\"") +
             HelpExampleRpc("scanblocks", "\"status\"")
         },
-        [&](const RPCHelpMan& self, const JSONRPCRequest& request) -> UniValue
+        [](const RPCMethod& self, const JSONRPCRequest& request) -> UniValue
 {
     UniValue ret(UniValue::VOBJ);
     auto action{self.Arg<std::string_view>("action")};
@@ -2695,9 +2721,9 @@ static RPCHelpMan scanblocks()
     };
 }
 
-static RPCHelpMan getdescriptoractivity()
+static RPCMethod getdescriptoractivity()
 {
-    return RPCHelpMan{
+    return RPCMethod{
         "getdescriptoractivity",
         "Get spend and receive activity associated with a set of descriptors for a set of blocks. "
         "This command pairs well with the `relevant_blocks` output of `scanblocks()`.\n"
@@ -2739,13 +2765,13 @@ static RPCHelpMan getdescriptoractivity()
                         {RPCResult::Type::OBJ, "output_spk", "", ScriptPubKeyDoc()},
                     }},
                     // TODO is the skip_type_check avoidable with a heterogeneous ARR?
-                }, /*skip_type_check=*/true},
+                }, {.skip_type_check=true}, },
             },
         },
         RPCExamples{
             HelpExampleCli("getdescriptoractivity", "'[\"000000000000000000001347062c12fded7c528943c8ce133987e2e2f5a840ee\"]' '[\"addr(bc1qzl6nsgqzu89a66l50cvwapnkw5shh23zarqkw9)\"]'")
         },
-        [&](const RPCHelpMan& self, const JSONRPCRequest& request) -> UniValue
+        [](const RPCMethod& self, const JSONRPCRequest& request) -> UniValue
 {
     UniValue ret(UniValue::VOBJ);
     UniValue activity(UniValue::VARR);
@@ -2931,9 +2957,9 @@ static RPCHelpMan getdescriptoractivity()
     };
 }
 
-static RPCHelpMan getblockfilter()
+static RPCMethod getblockfilter()
 {
-    return RPCHelpMan{
+    return RPCMethod{
         "getblockfilter",
         "Retrieve a BIP 157 content filter for a particular block.\n",
                 {
@@ -2950,7 +2976,7 @@ static RPCHelpMan getblockfilter()
                     HelpExampleCli("getblockfilter", "\"00000000c937983704a73af28acdec37b049d214adbda81d7e2a3dd146f6ed09\" \"basic\"") +
                     HelpExampleRpc("getblockfilter", "\"00000000c937983704a73af28acdec37b049d214adbda81d7e2a3dd146f6ed09\", \"basic\"")
                 },
-        [&](const RPCHelpMan& self, const JSONRPCRequest& request) -> UniValue
+        [](const RPCMethod& self, const JSONRPCRequest& request) -> UniValue
 {
     uint256 block_hash = ParseHashV(request.params[0], "blockhash");
     auto filtertype_name{self.Arg<std::string_view>("filtertype")};
@@ -3049,9 +3075,9 @@ class TemporaryRollback
  *
  * @see SnapshotMetadata
  */
-static RPCHelpMan dumptxoutset()
+static RPCMethod dumptxoutset()
 {
-    return RPCHelpMan{
+    return RPCMethod{
         "dumptxoutset",
         "Write the serialized UTXO set to a file. This can be used in loadtxoutset afterwards if this snapshot height is supported in the chainparams as well.\n\n"
         "Unless the \"latest\" type is requested, the node will roll back to the requested height and network activity will be suspended during this process. "
@@ -3084,7 +3110,7 @@ static RPCHelpMan dumptxoutset()
             HelpExampleCli("-rpcclienttimeout=0 dumptxoutset", "utxo.dat rollback") +
             HelpExampleCli("-rpcclienttimeout=0 -named dumptxoutset", R"(utxo.dat rollback=853456)")
         },
-        [&](const RPCHelpMan& self, const JSONRPCRequest& request) -> UniValue
+        [](const RPCMethod& self, const JSONRPCRequest& request) -> UniValue
 {
     NodeContext& node = EnsureAnyNodeContext(request.context);
     const CBlockIndex* tip{WITH_LOCK(::cs_main, return node.chainman->ActiveChain().Tip())};
@@ -3109,11 +3135,12 @@ static RPCHelpMan dumptxoutset()
 
     const ArgsManager& args{EnsureAnyArgsman(request.context)};
     const fs::path path = fsbridge::AbsPathJoin(args.GetDataDirNet(), fs::u8path(self.Arg<std::string_view>("path")));
+    const auto path_info{fs::status(path)};
     // Write to a temporary path and then move into `path` on completion
-    // to avoid confusion due to an interruption.
-    const fs::path temppath = path + ".incomplete";
+    // to avoid confusion due to an interruption. If a named pipe passed, write directly to it.
+    const fs::path temppath = fs::is_fifo(path_info) ? path : path + ".incomplete";
 
-    if (fs::exists(path)) {
+    if (fs::exists(path_info) && !fs::is_fifo(path_info)) {
         throw JSONRPCError(
             RPC_INVALID_PARAMETER,
             path.utf8string() + " already exists. If you are sure this is what you want, "
@@ -3197,7 +3224,9 @@ static RPCHelpMan dumptxoutset()
                                         path,
                                         temppath,
                                         node.rpc_interruption_point);
-    fs::rename(temppath, path);
+    if (!fs::is_fifo(path_info)) {
+        fs::rename(temppath, path);
+    }
 
     result.pushKV("path", path.utf8string());
     return result;
@@ -3340,9 +3369,9 @@ UniValue CreateUTXOSnapshot(
                              node.rpc_interruption_point);
 }
 
-static RPCHelpMan loadtxoutset()
+static RPCMethod loadtxoutset()
 {
-    return RPCHelpMan{
+    return RPCMethod{
         "loadtxoutset",
         "Load the serialized UTXO set from a file.\n"
         "Once this snapshot is loaded, its contents will be "
@@ -3376,7 +3405,7 @@ static RPCHelpMan loadtxoutset()
         RPCExamples{
             HelpExampleCli("-rpcclienttimeout=0 loadtxoutset", "utxo.dat")
         },
-        [&](const RPCHelpMan& self, const JSONRPCRequest& request) -> UniValue
+        [](const RPCMethod& self, const JSONRPCRequest& request) -> UniValue
 {
     NodeContext& node = EnsureAnyNodeContext(request.context);
     ChainstateManager& chainman = EnsureChainman(node);
@@ -3434,9 +3463,9 @@ const std::vector<RPCResult> RPCHelpForChainstate{
     {RPCResult::Type::BOOL, "validated", "whether the chainstate is fully validated. True if all blocks in the chainstate were validated, false if the chain is based on a snapshot and the snapshot has not yet been validated."},
 };
 
-static RPCHelpMan getchainstates()
+static RPCMethod getchainstates()
 {
-return RPCHelpMan{
+return RPCMethod{
         "getchainstates",
         "Return information about chainstates.\n",
         {},
@@ -3450,7 +3479,7 @@ return RPCHelpMan{
             HelpExampleCli("getchainstates", "")
     + HelpExampleRpc("getchainstates", "")
         },
-        [&](const RPCHelpMan& self, const JSONRPCRequest& request) -> UniValue
+        [](const RPCMethod& self, const JSONRPCRequest& request) -> UniValue
 {
     LOCK(cs_main);
     UniValue obj(UniValue::VOBJ);
diff --git a/src/rpc/blockchain.h b/src/rpc/blockchain.h
index efb06ac2d29b..53f6a804f992 100644
--- a/src/rpc/blockchain.h
+++ b/src/rpc/blockchain.h
@@ -9,7 +9,6 @@
 #include <core_io.h>
 #include <streams.h>
 #include <sync.h>
-#include <threadsafety.h>
 #include <util/fs.h>
 #include <validation.h>
 
diff --git a/src/rpc/external_signer.cpp b/src/rpc/external_signer.cpp
index d0fad1231bc9..08226ffb431a 100644
--- a/src/rpc/external_signer.cpp
+++ b/src/rpc/external_signer.cpp
@@ -17,9 +17,9 @@
 
 #ifdef ENABLE_EXTERNAL_SIGNER
 
-static RPCHelpMan enumeratesigners()
+static RPCMethod enumeratesigners()
 {
-    return RPCHelpMan{"enumeratesigners",
+    return RPCMethod{"enumeratesigners",
         "Returns a list of external signers from -signer.",
         {},
         RPCResult{
@@ -40,7 +40,7 @@ static RPCHelpMan enumeratesigners()
             HelpExampleCli("enumeratesigners", "")
             + HelpExampleRpc("enumeratesigners", "")
         },
-        [&](const RPCHelpMan& self, const JSONRPCRequest& request) -> UniValue
+        [](const RPCMethod& self, const JSONRPCRequest& request) -> UniValue
         {
             const std::string command = gArgs.GetArg("-signer", "");
             if (command == "") throw JSONRPCError(RPC_MISC_ERROR, "Error: restart bitcoind with -signer=<cmd>");
diff --git a/src/rpc/fees.cpp b/src/rpc/fees.cpp
index 9bad6f4a5977..b19826698a36 100644
--- a/src/rpc/fees.cpp
+++ b/src/rpc/fees.cpp
@@ -29,9 +29,9 @@ using common::FeeModesDetail;
 using common::InvalidEstimateModeErrorMessage;
 using node::NodeContext;
 
-static RPCHelpMan estimatesmartfee()
+static RPCMethod estimatesmartfee()
 {
-    return RPCHelpMan{
+    return RPCMethod{
         "estimatesmartfee",
         "Estimates the approximate fee per kilobyte needed for a transaction to begin\n"
         "confirmation within conf_target blocks if possible and return the number of blocks\n"
@@ -60,7 +60,7 @@ static RPCHelpMan estimatesmartfee()
             HelpExampleCli("estimatesmartfee", "6") +
             HelpExampleRpc("estimatesmartfee", "6")
         },
-        [&](const RPCHelpMan& self, const JSONRPCRequest& request) -> UniValue
+        [](const RPCMethod& self, const JSONRPCRequest& request) -> UniValue
         {
             CBlockPolicyEstimator& fee_estimator = EnsureAnyFeeEstimator(request.context);
             const NodeContext& node = EnsureAnyNodeContext(request.context);
@@ -94,9 +94,9 @@ static RPCHelpMan estimatesmartfee()
     };
 }
 
-static RPCHelpMan estimaterawfee()
+static RPCMethod estimaterawfee()
 {
-    return RPCHelpMan{
+    return RPCMethod{
         "estimaterawfee",
         "WARNING: This interface is unstable and may disappear or change!\n"
         "\nWARNING: This is an advanced API call that is tightly coupled to the specific\n"
@@ -149,7 +149,7 @@ static RPCHelpMan estimaterawfee()
         RPCExamples{
             HelpExampleCli("estimaterawfee", "6 0.9")
         },
-        [&](const RPCHelpMan& self, const JSONRPCRequest& request) -> UniValue
+        [](const RPCMethod& self, const JSONRPCRequest& request) -> UniValue
         {
             CBlockPolicyEstimator& fee_estimator = EnsureAnyFeeEstimator(request.context);
             const NodeContext& node = EnsureAnyNodeContext(request.context);
diff --git a/src/rpc/mempool.cpp b/src/rpc/mempool.cpp
index c480b5af47f2..ff7a513f98c4 100644
--- a/src/rpc/mempool.cpp
+++ b/src/rpc/mempool.cpp
@@ -44,9 +44,9 @@ using node::NodeContext;
 using node::TransactionError;
 using util::ToString;
 
-static RPCHelpMan sendrawtransaction()
+static RPCMethod sendrawtransaction()
 {
-    return RPCHelpMan{
+    return RPCMethod{
         "sendrawtransaction",
         "Submit a raw transaction (serialized, hex-encoded) to the network.\n"
 
@@ -87,7 +87,7 @@ static RPCHelpMan sendrawtransaction()
             "\nAs a JSON-RPC call\n"
             + HelpExampleRpc("sendrawtransaction", "\"signedhex\"")
                 },
-        [&](const RPCHelpMan& self, const JSONRPCRequest& request) -> UniValue
+        [](const RPCMethod& self, const JSONRPCRequest& request) -> UniValue
         {
             const CAmount max_burn_amount = request.params[2].isNull() ? 0 : AmountFromValue(request.params[2]);
 
@@ -139,9 +139,9 @@ static RPCHelpMan sendrawtransaction()
     };
 }
 
-static RPCHelpMan getprivatebroadcastinfo()
+static RPCMethod getprivatebroadcastinfo()
 {
-    return RPCHelpMan{
+    return RPCMethod{
         "getprivatebroadcastinfo",
         "Returns information about transactions that are currently being privately broadcast.\n",
         {},
@@ -155,6 +155,7 @@ static RPCHelpMan getprivatebroadcastinfo()
                                 {RPCResult::Type::STR_HEX, "txid", "The transaction hash in hex"},
                                 {RPCResult::Type::STR_HEX, "wtxid", "The transaction witness hash in hex"},
                                 {RPCResult::Type::STR_HEX, "hex", "The serialized, hex-encoded transaction data"},
+                                {RPCResult::Type::NUM_TIME, "time_added", "The time this transaction was added to the private broadcast queue (seconds since epoch)"},
                                 {RPCResult::Type::ARR, "peers", "Per-peer send and acknowledgment information for this transaction",
                                     {
                                         {RPCResult::Type::OBJ, "", "",
@@ -171,7 +172,7 @@ static RPCHelpMan getprivatebroadcastinfo()
             HelpExampleCli("getprivatebroadcastinfo", "")
             + HelpExampleRpc("getprivatebroadcastinfo", "")
         },
-        [&](const RPCHelpMan& self, const JSONRPCRequest& request) -> UniValue
+        [](const RPCMethod& self, const JSONRPCRequest& request) -> UniValue
         {
             const NodeContext& node{EnsureAnyNodeContext(request.context)};
             const PeerManager& peerman{EnsurePeerman(node)};
@@ -183,6 +184,7 @@ static RPCHelpMan getprivatebroadcastinfo()
                 o.pushKV("txid", tx_info.tx->GetHash().ToString());
                 o.pushKV("wtxid", tx_info.tx->GetWitnessHash().ToString());
                 o.pushKV("hex", EncodeHexTx(*tx_info.tx));
+                o.pushKV("time_added", TicksSinceEpoch<std::chrono::seconds>(tx_info.time_added));
                 UniValue peers(UniValue::VARR);
                 for (const auto& peer : tx_info.peers) {
                     UniValue p(UniValue::VOBJ);
@@ -204,9 +206,9 @@ static RPCHelpMan getprivatebroadcastinfo()
     };
 }
 
-static RPCHelpMan abortprivatebroadcast()
+static RPCMethod abortprivatebroadcast()
 {
-    return RPCHelpMan{
+    return RPCMethod{
         "abortprivatebroadcast",
         "Abort private broadcast attempts for a transaction currently being privately broadcast.\n"
         "The transaction will be removed from the private broadcast queue.\n",
@@ -232,7 +234,7 @@ static RPCHelpMan abortprivatebroadcast()
             HelpExampleCli("abortprivatebroadcast", "\"id\"")
             + HelpExampleRpc("abortprivatebroadcast", "\"id\"")
         },
-        [&](const RPCHelpMan& self, const JSONRPCRequest& request) -> UniValue
+        [](const RPCMethod& self, const JSONRPCRequest& request) -> UniValue
         {
             const uint256 id{ParseHashV(self.Arg<UniValue>("id"), "id")};
 
@@ -259,9 +261,9 @@ static RPCHelpMan abortprivatebroadcast()
     };
 }
 
-static RPCHelpMan testmempoolaccept()
+static RPCMethod testmempoolaccept()
 {
-    return RPCHelpMan{
+    return RPCMethod{
         "testmempoolaccept",
         "Returns result of mempool acceptance tests indicating if raw transaction(s) (serialized, hex-encoded) would be accepted by mempool.\n"
         "\nIf multiple transactions are passed in, parents must come before children and package policies apply: the transactions cannot conflict with any mempool transactions or each other.\n"
@@ -315,7 +317,7 @@ static RPCHelpMan testmempoolaccept()
             "\nAs a JSON-RPC call\n"
             + HelpExampleRpc("testmempoolaccept", "[\"signedhex\"]")
                 },
-        [&](const RPCHelpMan& self, const JSONRPCRequest& request) -> UniValue
+        [](const RPCMethod& self, const JSONRPCRequest& request) -> UniValue
         {
             const UniValue raw_transactions = request.params[0].get_array();
             if (raw_transactions.size() < 1 || raw_transactions.size() > MAX_PACKAGE_COUNT) {
@@ -606,9 +608,9 @@ UniValue MempoolToJSON(const CTxMemPool& pool, bool verbose, bool include_mempoo
     }
 }
 
-static RPCHelpMan getmempoolfeeratediagram()
+static RPCMethod getmempoolfeeratediagram()
 {
-    return RPCHelpMan{"getmempoolfeeratediagram",
+    return RPCMethod{"getmempoolfeeratediagram",
         "Returns the feerate diagram for the whole mempool.",
         {},
         {
@@ -629,7 +631,7 @@ static RPCHelpMan getmempoolfeeratediagram()
             HelpExampleCli("getmempoolfeeratediagram", "")
             + HelpExampleRpc("getmempoolfeeratediagram", "")
         },
-        [&](const RPCHelpMan& self, const JSONRPCRequest& request) -> UniValue
+        [](const RPCMethod& self, const JSONRPCRequest& request) -> UniValue
         {
             const CTxMemPool& mempool = EnsureAnyMemPool(request.context);
             LOCK(mempool.cs);
@@ -649,9 +651,9 @@ static RPCHelpMan getmempoolfeeratediagram()
     };
 }
 
-static RPCHelpMan getrawmempool()
+static RPCMethod getrawmempool()
 {
-    return RPCHelpMan{
+    return RPCMethod{
         "getrawmempool",
         "Returns all transaction ids in memory pool as a json array of string transaction ids.\n"
         "\nHint: use getmempoolentry to fetch a specific transaction from the mempool.\n",
@@ -684,7 +686,7 @@ static RPCHelpMan getrawmempool()
             HelpExampleCli("getrawmempool", "true")
             + HelpExampleRpc("getrawmempool", "true")
         },
-        [&](const RPCHelpMan& self, const JSONRPCRequest& request) -> UniValue
+        [](const RPCMethod& self, const JSONRPCRequest& request) -> UniValue
 {
     bool fVerbose = false;
     if (!request.params[0].isNull())
@@ -700,9 +702,9 @@ static RPCHelpMan getrawmempool()
     };
 }
 
-static RPCHelpMan getmempoolancestors()
+static RPCMethod getmempoolancestors()
 {
-    return RPCHelpMan{
+    return RPCMethod{
         "getmempoolancestors",
         "If txid is in the mempool, returns all in-mempool ancestors.\n",
         {
@@ -723,7 +725,7 @@ static RPCHelpMan getmempoolancestors()
             HelpExampleCli("getmempoolancestors", "\"mytxid\"")
             + HelpExampleRpc("getmempoolancestors", "\"mytxid\"")
         },
-        [&](const RPCHelpMan& self, const JSONRPCRequest& request) -> UniValue
+        [](const RPCMethod& self, const JSONRPCRequest& request) -> UniValue
 {
     bool fVerbose = false;
     if (!request.params[1].isNull())
@@ -761,9 +763,9 @@ static RPCHelpMan getmempoolancestors()
     };
 }
 
-static RPCHelpMan getmempooldescendants()
+static RPCMethod getmempooldescendants()
 {
-    return RPCHelpMan{
+    return RPCMethod{
         "getmempooldescendants",
         "If txid is in the mempool, returns all in-mempool descendants.\n",
         {
@@ -784,7 +786,7 @@ static RPCHelpMan getmempooldescendants()
             HelpExampleCli("getmempooldescendants", "\"mytxid\"")
             + HelpExampleRpc("getmempooldescendants", "\"mytxid\"")
         },
-        [&](const RPCHelpMan& self, const JSONRPCRequest& request) -> UniValue
+        [](const RPCMethod& self, const JSONRPCRequest& request) -> UniValue
 {
     bool fVerbose = false;
     if (!request.params[1].isNull())
@@ -826,9 +828,9 @@ static RPCHelpMan getmempooldescendants()
     };
 }
 
-static RPCHelpMan getmempoolcluster()
+static RPCMethod getmempoolcluster()
 {
-    return RPCHelpMan{"getmempoolcluster",
+    return RPCMethod{"getmempoolcluster",
         "Returns mempool data for given cluster\n",
         {
             {"txid", RPCArg::Type::STR_HEX, RPCArg::Optional::NO, "The txid of a transaction in the cluster"},
@@ -839,7 +841,7 @@ static RPCHelpMan getmempoolcluster()
             HelpExampleCli("getmempoolcluster", "txid")
             + HelpExampleRpc("getmempoolcluster", "txid")
         },
-        [&](const RPCHelpMan& self, const JSONRPCRequest& request) -> UniValue
+        [](const RPCMethod& self, const JSONRPCRequest& request) -> UniValue
 {
     uint256 hash = ParseHashV(request.params[0], "txid");
 
@@ -861,9 +863,9 @@ static RPCHelpMan getmempoolcluster()
     };
 }
 
-static RPCHelpMan getmempoolentry()
+static RPCMethod getmempoolentry()
 {
-    return RPCHelpMan{
+    return RPCMethod{
         "getmempoolentry",
         "Returns mempool data for given transaction\n",
         {
@@ -875,7 +877,7 @@ static RPCHelpMan getmempoolentry()
             HelpExampleCli("getmempoolentry", "\"mytxid\"")
             + HelpExampleRpc("getmempoolentry", "\"mytxid\"")
         },
-        [&](const RPCHelpMan& self, const JSONRPCRequest& request) -> UniValue
+        [](const RPCMethod& self, const JSONRPCRequest& request) -> UniValue
 {
     auto txid{Txid::FromUint256(ParseHashV(request.params[0], "txid"))};
 
@@ -894,9 +896,9 @@ static RPCHelpMan getmempoolentry()
     };
 }
 
-static RPCHelpMan gettxspendingprevout()
+static RPCMethod gettxspendingprevout()
 {
-    return RPCHelpMan{"gettxspendingprevout",
+    return RPCMethod{"gettxspendingprevout",
         "Scans the mempool (and the txospenderindex, if available) to find transactions spending any of the given outputs",
         {
             {"outputs", RPCArg::Type::ARR, RPCArg::Optional::NO, "The transaction outputs that we want to check, and within each, the txid (string) vout (numeric).",
@@ -934,7 +936,7 @@ static RPCHelpMan gettxspendingprevout()
             + HelpExampleRpc("gettxspendingprevout", "\"[{\\\"txid\\\":\\\"a08e6907dbbd3d809776dbfc5d82e371b764ed838b5655e72f463568df1aadf0\\\",\\\"vout\\\":3}]\"")
             + HelpExampleCliNamed("gettxspendingprevout", {{"outputs", "[{\"txid\":\"a08e6907dbbd3d809776dbfc5d82e371b764ed838b5655e72f463568df1aadf0\",\"vout\":3}]"}, {"return_spending_tx", true}})
         },
-        [&](const RPCHelpMan& self, const JSONRPCRequest& request) -> UniValue
+        [](const RPCMethod& self, const JSONRPCRequest& request) -> UniValue
         {
             const UniValue& output_params = request.params[0].get_array();
             if (output_params.empty()) {
@@ -950,14 +952,13 @@ static RPCHelpMan gettxspendingprevout()
             const bool mempool_only{options.exists("mempool_only") ? options["mempool_only"].get_bool() : !g_txospenderindex};
             const bool return_spending_tx{options.exists("return_spending_tx") ? options["return_spending_tx"].get_bool() : false};
 
+            // Worklist of outpoints to resolve
             struct Entry {
-                const COutPoint prevout;
-                const UniValue& input;
-                UniValue output;
+                COutPoint outpoint;
+                const UniValue* raw;
             };
-            std::vector<Entry> prevouts;
-            prevouts.reserve(output_params.size());
-
+            std::vector<Entry> prevouts_to_process;
+            prevouts_to_process.reserve(output_params.size());
             for (unsigned int idx = 0; idx < output_params.size(); idx++) {
                 const UniValue& o = output_params[idx].get_obj();
 
@@ -972,57 +973,68 @@ static RPCHelpMan gettxspendingprevout()
                 if (nOutput < 0) {
                     throw JSONRPCError(RPC_INVALID_PARAMETER, "Invalid parameter, vout cannot be negative");
                 }
-                prevouts.emplace_back(COutPoint{txid, uint32_t(nOutput)}, o, UniValue{});
+                prevouts_to_process.emplace_back(COutPoint{txid, static_cast<uint32_t>(nOutput)}, &o);
             }
 
-            // search the mempool first
-            bool missing_from_mempool{false};
+            auto make_output = [return_spending_tx](const Entry& prevout, const CTransaction* spending_tx = nullptr) {
+                UniValue o{*prevout.raw};
+                if (spending_tx) {
+                    o.pushKV("spendingtxid", spending_tx->GetHash().ToString());
+                    if (return_spending_tx) {
+                        o.pushKV("spendingtx", EncodeHexTx(*spending_tx));
+                    }
+                }
+                return o;
+            };
+
+            UniValue result{UniValue::VARR};
+
+            // Search the mempool first
             {
                 const CTxMemPool& mempool = EnsureAnyMemPool(request.context);
                 LOCK(mempool.cs);
-                for (auto& entry : prevouts) {
-                    const CTransaction* spendingTx = mempool.GetConflictTx(entry.prevout);
-                    if (spendingTx != nullptr) {
-                        UniValue o{entry.input};
-                        o.pushKV("spendingtxid", spendingTx->GetHash().ToString());
-                        if (return_spending_tx) {
-                            o.pushKV("spendingtx", EncodeHexTx(*spendingTx));
-                        }
-                        entry.output = std::move(o);
-                    } else {
-                        missing_from_mempool = true;
+
+                // Make the result if the spending tx appears in the mempool or this is a mempool_only request
+                for (auto it = prevouts_to_process.begin(); it != prevouts_to_process.end(); ) {
+                    const CTransaction* spending_tx{mempool.GetConflictTx(it->outpoint)};
+
+                    // If the outpoint is not spent in the mempool and this is not a mempool-only
+                    // request, we cannot answer it yet.
+                    if (!spending_tx && !mempool_only) {
+                        ++it;
+                        continue;
                     }
+
+                    result.push_back(make_output(*it, spending_tx));
+                    it = prevouts_to_process.erase(it);
                 }
             }
-            // if search is not limited to the mempool and no spender was found for an outpoint, search the txospenderindex
-            // we call g_txospenderindex->BlockUntilSyncedToCurrentChain() only if g_txospenderindex is going to be used
-            UniValue result{UniValue::VARR};
-            bool txospenderindex_ready{mempool_only || !missing_from_mempool || (g_txospenderindex && g_txospenderindex->BlockUntilSyncedToCurrentChain())};
-            for (auto& entry : prevouts) {
-                if (!entry.output.isNull()) {
-                    result.push_back(std::move(entry.output));
-                    continue;
+
+            // Return early if all requests have been handled by the mempool search
+            if (prevouts_to_process.empty()) {
+                return result;
+            }
+
+            // At this point the request was not limited to the mempool and some outpoints remain
+            // unresolved. We now rely on the index to determine whether they were spent or not.
+            if (!g_txospenderindex || !g_txospenderindex->BlockUntilSyncedToCurrentChain()) {
+                throw JSONRPCError(RPC_MISC_ERROR, "Mempool lacks a relevant spend, and txospenderindex is unavailable.");
+            }
+
+            for (const auto& prevout : prevouts_to_process) {
+                const auto spender{g_txospenderindex->FindSpender(prevout.outpoint)};
+                if (!spender) {
+                    throw JSONRPCError(RPC_MISC_ERROR, spender.error());
                 }
-                UniValue o{entry.input};
-                if (mempool_only) {
-                    // do nothing, caller has selected to only query the mempool
-                } else if (!txospenderindex_ready) {
-                    throw JSONRPCError(RPC_MISC_ERROR, strprintf("No spending tx for the outpoint %s:%d in mempool, and txospenderindex is unavailable.", entry.prevout.hash.GetHex(), entry.prevout.n));
+
+                if (const auto& spender_opt{spender.value()}) {
+                    UniValue o{make_output(prevout, spender_opt->tx.get())};
+                    o.pushKV("blockhash", spender_opt->block_hash.GetHex());
+                    result.push_back(std::move(o));
                 } else {
-                    // no spending tx in mempool, query txospender index
-                    const auto spender{g_txospenderindex->FindSpender(entry.prevout)};
-                    if (!spender) {
-                        throw JSONRPCError(RPC_MISC_ERROR, spender.error());
-                    }
-                    if (spender.value()) {
-                        o.pushKV("spendingtxid", spender.value()->tx->GetHash().GetHex());
-                        o.pushKV("blockhash", spender.value()->block_hash.GetHex());
-                        if (return_spending_tx) {
-                            o.pushKV("spendingtx", EncodeHexTx(*spender.value()->tx));
-                        }
-                    }
+                    // Only return the input outpoint itself, which indicates it is unspent.
+                    result.push_back(make_output(prevout));
                 }
-                result.push_back(std::move(o));
             }
 
             return result;
@@ -1054,9 +1066,9 @@ UniValue MempoolInfoToJSON(const CTxMemPool& pool)
     return ret;
 }
 
-static RPCHelpMan getmempoolinfo()
+static RPCMethod getmempoolinfo()
 {
-    return RPCHelpMan{"getmempoolinfo",
+    return RPCMethod{"getmempoolinfo",
         "Returns details on the active state of the TX memory pool.",
         {},
         RPCResult{
@@ -1083,16 +1095,16 @@ static RPCHelpMan getmempoolinfo()
             HelpExampleCli("getmempoolinfo", "")
             + HelpExampleRpc("getmempoolinfo", "")
         },
-        [&](const RPCHelpMan& self, const JSONRPCRequest& request) -> UniValue
+        [](const RPCMethod& self, const JSONRPCRequest& request) -> UniValue
 {
     return MempoolInfoToJSON(EnsureAnyMemPool(request.context));
 },
     };
 }
 
-static RPCHelpMan importmempool()
+static RPCMethod importmempool()
 {
-    return RPCHelpMan{
+    return RPCMethod{
         "importmempool",
         "Import a mempool.dat file and attempt to add its contents to the mempool.\n"
         "Warning: Importing untrusted files is dangerous, especially if metadata from the file is taken over.",
@@ -1120,7 +1132,7 @@ static RPCHelpMan importmempool()
         },
         RPCResult{RPCResult::Type::OBJ, "", "", std::vector<RPCResult>{}},
         RPCExamples{HelpExampleCli("importmempool", "/path/to/mempool.dat") + HelpExampleRpc("importmempool", "/path/to/mempool.dat")},
-        [&](const RPCHelpMan& self, const JSONRPCRequest& request) -> UniValue {
+        [](const RPCMethod& self, const JSONRPCRequest& request) -> UniValue {
             const NodeContext& node{EnsureAnyNodeContext(request.context)};
 
             CTxMemPool& mempool{EnsureMemPool(node)};
@@ -1142,7 +1154,7 @@ static RPCHelpMan importmempool()
             };
 
             if (!node::LoadMempool(mempool, load_path, chainstate, std::move(opts))) {
-                throw JSONRPCError(RPC_MISC_ERROR, "Unable to import mempool file, see debug.log for details.");
+                throw JSONRPCError(RPC_MISC_ERROR, "Unable to import mempool file, see debug log for details.");
             }
 
             UniValue ret{UniValue::VOBJ};
@@ -1151,9 +1163,9 @@ static RPCHelpMan importmempool()
     };
 }
 
-static RPCHelpMan savemempool()
+static RPCMethod savemempool()
 {
-    return RPCHelpMan{
+    return RPCMethod{
         "savemempool",
         "Dumps the mempool to disk. It will fail until the previous dump is fully loaded.\n",
         {},
@@ -1166,7 +1178,7 @@ static RPCHelpMan savemempool()
             HelpExampleCli("savemempool", "")
             + HelpExampleRpc("savemempool", "")
         },
-        [&](const RPCHelpMan& self, const JSONRPCRequest& request) -> UniValue
+        [](const RPCMethod& self, const JSONRPCRequest& request) -> UniValue
 {
     const ArgsManager& args{EnsureAnyArgsman(request.context)};
     const CTxMemPool& mempool = EnsureAnyMemPool(request.context);
@@ -1220,9 +1232,9 @@ static UniValue OrphanToJSON(const node::TxOrphanage::OrphanInfo& orphan)
     return o;
 }
 
-static RPCHelpMan getorphantxs()
+static RPCMethod getorphantxs()
 {
-    return RPCHelpMan{
+    return RPCMethod{
         "getorphantxs",
         "Shows transactions in the tx orphanage.\n"
         "\nEXPERIMENTAL warning: this call may be changed in future releases.\n",
@@ -1256,7 +1268,7 @@ static RPCHelpMan getorphantxs()
             HelpExampleCli("getorphantxs", "2")
             + HelpExampleRpc("getorphantxs", "2")
         },
-        [&](const RPCHelpMan& self, const JSONRPCRequest& request) -> UniValue
+        [](const RPCMethod& self, const JSONRPCRequest& request) -> UniValue
         {
             const NodeContext& node = EnsureAnyNodeContext(request.context);
             PeerManager& peerman = EnsurePeerman(node);
@@ -1289,9 +1301,9 @@ static RPCHelpMan getorphantxs()
     };
 }
 
-static RPCHelpMan submitpackage()
+static RPCMethod submitpackage()
 {
-    return RPCHelpMan{"submitpackage",
+    return RPCMethod{"submitpackage",
         "Submit a package of raw transactions (serialized, hex-encoded) to local node.\n"
         "The package will be validated according to consensus and mempool policy rules. If any transaction passes, it will be accepted to mempool.\n"
         "This RPC is experimental and the interface may be unstable. Refer to doc/policy/packages.md for documentation on package policies.\n"
@@ -1345,7 +1357,7 @@ static RPCHelpMan submitpackage()
             HelpExampleRpc("submitpackage", R"(["raw-parent-tx-1", "raw-parent-tx-2", "raw-child-tx"])") +
             HelpExampleCli("submitpackage", R"('["raw-tx-without-unconfirmed-parents"]')")
         },
-        [&](const RPCHelpMan& self, const JSONRPCRequest& request) -> UniValue
+        [](const RPCMethod& self, const JSONRPCRequest& request) -> UniValue
         {
             const UniValue raw_transactions = request.params[0].get_array();
             if (raw_transactions.empty() || raw_transactions.size() > MAX_PACKAGE_COUNT) {
diff --git a/src/rpc/mining.cpp b/src/rpc/mining.cpp
index 043e11ff63ad..dcf5ee26457a 100644
--- a/src/rpc/mining.cpp
+++ b/src/rpc/mining.cpp
@@ -108,9 +108,9 @@ static UniValue GetNetworkHashPS(int lookup, int height, const CChain& active_ch
     return workDiff.getdouble() / timeDiff;
 }
 
-static RPCHelpMan getnetworkhashps()
+static RPCMethod getnetworkhashps()
 {
-    return RPCHelpMan{
+    return RPCMethod{
         "getnetworkhashps",
         "Returns the estimated network hashes per second based on the last n blocks.\n"
                 "Pass in [blocks] to override # of blocks, -1 specifies since last difficulty change.\n"
@@ -125,7 +125,7 @@ static RPCHelpMan getnetworkhashps()
                     HelpExampleCli("getnetworkhashps", "")
             + HelpExampleRpc("getnetworkhashps", "")
                 },
-        [&](const RPCHelpMan& self, const JSONRPCRequest& request) -> UniValue
+        [](const RPCMethod& self, const JSONRPCRequest& request) -> UniValue
 {
     ChainstateManager& chainman = EnsureAnyChainman(request.context);
     LOCK(cs_main);
@@ -216,9 +216,9 @@ static bool getScriptFromDescriptor(std::string_view descriptor, CScript& script
     return true;
 }
 
-static RPCHelpMan generatetodescriptor()
+static RPCMethod generatetodescriptor()
 {
-    return RPCHelpMan{
+    return RPCMethod{
         "generatetodescriptor",
         "Mine to a specified descriptor and return the block hashes.",
         {
@@ -234,7 +234,7 @@ static RPCHelpMan generatetodescriptor()
         },
         RPCExamples{
             "\nGenerate 11 blocks to mydesc\n" + HelpExampleCli("generatetodescriptor", "11 \"mydesc\"")},
-        [&](const RPCHelpMan& self, const JSONRPCRequest& request) -> UniValue
+        [](const RPCMethod& self, const JSONRPCRequest& request) -> UniValue
 {
     const auto num_blocks{self.Arg<int>("num_blocks")};
     const auto max_tries{self.Arg<uint64_t>("maxtries")};
@@ -254,16 +254,16 @@ static RPCHelpMan generatetodescriptor()
     };
 }
 
-static RPCHelpMan generate()
+static RPCMethod generate()
 {
-    return RPCHelpMan{"generate", "has been replaced by the -generate cli option. Refer to -help for more information.", {}, {}, RPCExamples{""}, [&](const RPCHelpMan& self, const JSONRPCRequest& request) -> UniValue {
+    return RPCMethod{"generate", "has been replaced by the -generate cli option. Refer to -help for more information.", {}, {}, RPCExamples{""}, [](const RPCMethod& self, const JSONRPCRequest& request) -> UniValue {
         throw JSONRPCError(RPC_METHOD_NOT_FOUND, self.ToString());
     }};
 }
 
-static RPCHelpMan generatetoaddress()
+static RPCMethod generatetoaddress()
 {
-    return RPCHelpMan{"generatetoaddress",
+    return RPCMethod{"generatetoaddress",
         "Mine to a specified address and return the block hashes.",
          {
              {"nblocks", RPCArg::Type::NUM, RPCArg::Optional::NO, "How many blocks are generated."},
@@ -281,7 +281,7 @@ static RPCHelpMan generatetoaddress()
             + "If you are using the " CLIENT_NAME " wallet, you can get a new address to send the newly generated bitcoin to with:\n"
             + HelpExampleCli("getnewaddress", "")
                 },
-        [&](const RPCHelpMan& self, const JSONRPCRequest& request) -> UniValue
+        [](const RPCMethod& self, const JSONRPCRequest& request) -> UniValue
 {
     const int num_blocks{request.params[0].getInt<int>()};
     const uint64_t max_tries{request.params[2].isNull() ? DEFAULT_MAX_TRIES : request.params[2].getInt<int>()};
@@ -302,10 +302,11 @@ static RPCHelpMan generatetoaddress()
     };
 }
 
-static RPCHelpMan generateblock()
+static RPCMethod generateblock()
 {
-    return RPCHelpMan{"generateblock",
-        "Mine a set of ordered transactions to a specified address or descriptor and return the block hash.",
+    return RPCMethod{"generateblock",
+        "Mine a set of ordered transactions to a specified address or descriptor and return the block hash.\n"
+        "Transaction fees are not collected in the block reward.",
         {
             {"output", RPCArg::Type::STR, RPCArg::Optional::NO, "The address or descriptor to send the newly generated bitcoin to."},
             {"transactions", RPCArg::Type::ARR, RPCArg::Optional::NO, "An array of hex strings which are either txids or raw transactions.\n"
@@ -328,7 +329,7 @@ static RPCHelpMan generateblock()
             "\nGenerate a block to myaddress, with txs rawtx and mempool_txid\n"
             + HelpExampleCli("generateblock", R"("myaddress" '["rawtx", "mempool_txid"]')")
         },
-        [&](const RPCHelpMan& self, const JSONRPCRequest& request) -> UniValue
+        [](const RPCMethod& self, const JSONRPCRequest& request) -> UniValue
 {
     const auto address_or_descriptor = request.params[0].get_str();
     CScript coinbase_output_script;
@@ -412,9 +413,9 @@ static RPCHelpMan generateblock()
     };
 }
 
-static RPCHelpMan getmininginfo()
+static RPCMethod getmininginfo()
 {
-    return RPCHelpMan{
+    return RPCMethod{
         "getmininginfo",
         "Returns a json object containing mining-related information.",
                 {},
@@ -452,7 +453,7 @@ static RPCHelpMan getmininginfo()
                     HelpExampleCli("getmininginfo", "")
             + HelpExampleRpc("getmininginfo", "")
                 },
-        [&](const RPCHelpMan& self, const JSONRPCRequest& request) -> UniValue
+        [](const RPCMethod& self, const JSONRPCRequest& request) -> UniValue
 {
     NodeContext& node = EnsureAnyNodeContext(request.context);
     const CTxMemPool& mempool = EnsureMemPool(node);
@@ -498,9 +499,9 @@ static RPCHelpMan getmininginfo()
 
 
 // NOTE: Unlike wallet RPC (which use BTC values), mining RPCs follow GBT (BIP 22) in using satoshi amounts
-static RPCHelpMan prioritisetransaction()
+static RPCMethod prioritisetransaction()
 {
-    return RPCHelpMan{"prioritisetransaction",
+    return RPCMethod{"prioritisetransaction",
                 "Accepts the transaction into mined blocks at a higher (or lower) priority\n",
                 {
                     {"txid", RPCArg::Type::STR_HEX, RPCArg::Optional::NO, "The transaction id."},
@@ -517,7 +518,7 @@ static RPCHelpMan prioritisetransaction()
                     HelpExampleCli("prioritisetransaction", "\"txid\" 0.0 10000")
             + HelpExampleRpc("prioritisetransaction", "\"txid\", 0.0, 10000")
                 },
-        [&](const RPCHelpMan& self, const JSONRPCRequest& request) -> UniValue
+        [](const RPCMethod& self, const JSONRPCRequest& request) -> UniValue
 {
     LOCK(cs_main);
 
@@ -543,9 +544,9 @@ static RPCHelpMan prioritisetransaction()
     };
 }
 
-static RPCHelpMan getprioritisedtransactions()
+static RPCMethod getprioritisedtransactions()
 {
-    return RPCHelpMan{"getprioritisedtransactions",
+    return RPCMethod{"getprioritisedtransactions",
         "Returns a map of all user-created (see prioritisetransaction) fee deltas by txid, and whether the tx is present in mempool.",
         {},
         RPCResult{
@@ -562,7 +563,7 @@ static RPCHelpMan getprioritisedtransactions()
             HelpExampleCli("getprioritisedtransactions", "")
             + HelpExampleRpc("getprioritisedtransactions", "")
         },
-        [&](const RPCHelpMan& self, const JSONRPCRequest& request) -> UniValue
+        [](const RPCMethod& self, const JSONRPCRequest& request) -> UniValue
         {
             NodeContext& node = EnsureAnyNodeContext(request.context);
             CTxMemPool& mempool = EnsureMemPool(node);
@@ -611,9 +612,9 @@ static std::string gbt_rule_value(const std::string& name, bool gbt_optional_rul
     return s;
 }
 
-static RPCHelpMan getblocktemplate()
+static RPCMethod getblocktemplate()
 {
-    return RPCHelpMan{
+    return RPCMethod{
         "getblocktemplate",
         "If the request parameters include a 'mode' key, that is used to explicitly select between the default 'template' request or a 'proposal'.\n"
         "It returns data needed to construct a block to work on.\n"
@@ -703,7 +704,7 @@ static RPCHelpMan getblocktemplate()
                     HelpExampleCli("getblocktemplate", "'{\"rules\": [\"segwit\"]}'")
             + HelpExampleRpc("getblocktemplate", "{\"rules\": [\"segwit\"]}")
                 },
-        [&](const RPCHelpMan& self, const JSONRPCRequest& request) -> UniValue
+        [](const RPCMethod& self, const JSONRPCRequest& request) -> UniValue
 {
     NodeContext& node = EnsureAnyNodeContext(request.context);
     ChainstateManager& chainman = EnsureChainman(node);
@@ -947,8 +948,14 @@ static RPCHelpMan getblocktemplate()
     result.pushKV("capabilities", std::move(aCaps));
 
     UniValue aRules(UniValue::VARR);
+    // See getblocktemplate changes in BIP 9:
+    // ! indicates a more subtle change to the block structure or generation transaction
+    // Otherwise clients may assume the rule will not impact usage of the template as-is.
     aRules.push_back("csv");
-    if (!fPreSegWit) aRules.push_back("!segwit");
+    if (!fPreSegWit) {
+        aRules.push_back("!segwit");
+        aRules.push_back("taproot");
+    }
     if (consensusParams.signet_blocks) {
         // indicate to miner that they must understand signet rules
         // when attempting to mine with this template
@@ -1046,10 +1053,10 @@ class submitblock_StateCatcher final : public CValidationInterface
     }
 };
 
-static RPCHelpMan submitblock()
+static RPCMethod submitblock()
 {
     // We allow 2 arguments for compliance with BIP22. Argument 2 is ignored.
-    return RPCHelpMan{
+    return RPCMethod{
         "submitblock",
         "Attempts to submit new block to network.\n"
         "See https://en.bitcoin.it/wiki/BIP_0022 for full specification.\n",
@@ -1065,7 +1072,7 @@ static RPCHelpMan submitblock()
                     HelpExampleCli("submitblock", "\"mydata\"")
             + HelpExampleRpc("submitblock", "\"mydata\"")
                 },
-        [&](const RPCHelpMan& self, const JSONRPCRequest& request) -> UniValue
+        [](const RPCMethod& self, const JSONRPCRequest& request) -> UniValue
 {
     std::shared_ptr<CBlock> blockptr = std::make_shared<CBlock>();
     CBlock& block = *blockptr;
@@ -1098,9 +1105,9 @@ static RPCHelpMan submitblock()
     };
 }
 
-static RPCHelpMan submitheader()
+static RPCMethod submitheader()
 {
-    return RPCHelpMan{
+    return RPCMethod{
         "submitheader",
         "Decode the given hexdata as a header and submit it as a candidate chain tip if valid."
                 "\nThrows when the header is invalid.\n",
@@ -1113,7 +1120,7 @@ static RPCHelpMan submitheader()
                     HelpExampleCli("submitheader", "\"aabbcc\"") +
                     HelpExampleRpc("submitheader", "\"aabbcc\"")
                 },
-        [&](const RPCHelpMan& self, const JSONRPCRequest& request) -> UniValue
+        [](const RPCMethod& self, const JSONRPCRequest& request) -> UniValue
 {
     CBlockHeader h;
     if (!DecodeHexBlockHeader(h, request.params[0].get_str())) {
diff --git a/src/rpc/net.cpp b/src/rpc/net.cpp
index 5c54e2079730..cf5e58642ef3 100644
--- a/src/rpc/net.cpp
+++ b/src/rpc/net.cpp
@@ -58,9 +58,9 @@ const std::vector<std::string> TRANSPORT_TYPE_DOC{
     "v2 (BIP324 encrypted transport protocol)"
 };
 
-static RPCHelpMan getconnectioncount()
+static RPCMethod getconnectioncount()
 {
-    return RPCHelpMan{
+    return RPCMethod{
         "getconnectioncount",
         "Returns the number of connections to other nodes.\n",
                 {},
@@ -71,7 +71,7 @@ static RPCHelpMan getconnectioncount()
                     HelpExampleCli("getconnectioncount", "")
             + HelpExampleRpc("getconnectioncount", "")
                 },
-        [&](const RPCHelpMan& self, const JSONRPCRequest& request) -> UniValue
+        [](const RPCMethod& self, const JSONRPCRequest& request) -> UniValue
 {
     NodeContext& node = EnsureAnyNodeContext(request.context);
     const CConnman& connman = EnsureConnman(node);
@@ -81,9 +81,9 @@ static RPCHelpMan getconnectioncount()
     };
 }
 
-static RPCHelpMan ping()
+static RPCMethod ping()
 {
-    return RPCHelpMan{
+    return RPCMethod{
         "ping",
         "Requests that a ping be sent to all other nodes, to measure ping time.\n"
                 "Results are provided in getpeerinfo.\n"
@@ -94,7 +94,7 @@ static RPCHelpMan ping()
                     HelpExampleCli("ping", "")
             + HelpExampleRpc("ping", "")
                 },
-        [&](const RPCHelpMan& self, const JSONRPCRequest& request) -> UniValue
+        [](const RPCMethod& self, const JSONRPCRequest& request) -> UniValue
 {
     NodeContext& node = EnsureAnyNodeContext(request.context);
     PeerManager& peerman = EnsurePeerman(node);
@@ -118,9 +118,9 @@ static UniValue GetServicesNames(ServiceFlags services)
     return servicesNames;
 }
 
-static RPCHelpMan getpeerinfo()
+static RPCMethod getpeerinfo()
 {
-    return RPCHelpMan{
+    return RPCMethod{
         "getpeerinfo",
         "Returns data about each connected network peer as a json array of objects.",
         {},
@@ -161,7 +161,6 @@ static RPCHelpMan getpeerinfo()
                     {RPCResult::Type::BOOL, "inbound", "Inbound (true) or Outbound (false)"},
                     {RPCResult::Type::BOOL, "bip152_hb_to", "Whether we selected peer as (compact blocks) high-bandwidth peer"},
                     {RPCResult::Type::BOOL, "bip152_hb_from", "Whether peer selected us as (compact blocks) high-bandwidth peer"},
-                    {RPCResult::Type::NUM, "startingheight", /*optional=*/true, "(DEPRECATED, returned only if config option -deprecatedrpc=startingheight is passed) The starting height (block) of the peer"},
                     {RPCResult::Type::NUM, "presynced_headers", "The current height of header pre-synchronization with this peer, or -1 if no low-work sync is in progress"},
                     {RPCResult::Type::NUM, "synced_headers", "The last header we have in common with this peer"},
                     {RPCResult::Type::NUM, "synced_blocks", "The last block we have in common with this peer"},
@@ -202,7 +201,7 @@ static RPCHelpMan getpeerinfo()
             HelpExampleCli("getpeerinfo", "")
             + HelpExampleRpc("getpeerinfo", "")
         },
-        [&](const RPCHelpMan& self, const JSONRPCRequest& request) -> UniValue
+        [](const RPCMethod& self, const JSONRPCRequest& request) -> UniValue
 {
     NodeContext& node = EnsureAnyNodeContext(request.context);
     const CConnman& connman = EnsureConnman(node);
@@ -268,9 +267,6 @@ static RPCHelpMan getpeerinfo()
         obj.pushKV("inbound", stats.fInbound);
         obj.pushKV("bip152_hb_to", stats.m_bip152_highbandwidth_to);
         obj.pushKV("bip152_hb_from", stats.m_bip152_highbandwidth_from);
-        if (IsDeprecatedRPCEnabled("startingheight")) {
-            obj.pushKV("startingheight", statestats.m_starting_height);
-        }
         obj.pushKV("presynced_headers", statestats.presync_height);
         obj.pushKV("synced_headers", statestats.nSyncHeight);
         obj.pushKV("synced_blocks", statestats.nCommonHeight);
@@ -314,9 +310,9 @@ static RPCHelpMan getpeerinfo()
     };
 }
 
-static RPCHelpMan addnode()
+static RPCMethod addnode()
 {
-    return RPCHelpMan{
+    return RPCMethod{
         "addnode",
         "Attempts to add or remove a node from the addnode list.\n"
                 "Or try a connection to a node once.\n"
@@ -334,7 +330,7 @@ static RPCHelpMan addnode()
                     HelpExampleCli("addnode", "\"192.168.0.6:8333\" \"onetry\" true")
             + HelpExampleRpc("addnode", "\"192.168.0.6:8333\", \"onetry\" true")
                 },
-        [&](const RPCHelpMan& self, const JSONRPCRequest& request) -> UniValue
+        [](const RPCMethod& self, const JSONRPCRequest& request) -> UniValue
 {
     const auto command{self.Arg<std::string_view>("command")};
     if (command != "onetry" && command != "add" && command != "remove") {
@@ -378,9 +374,9 @@ static RPCHelpMan addnode()
     };
 }
 
-static RPCHelpMan addconnection()
+static RPCMethod addconnection()
 {
-    return RPCHelpMan{
+    return RPCMethod{
         "addconnection",
         "Open an outbound connection to a specified node. This RPC is for testing only.\n",
         {
@@ -398,7 +394,7 @@ static RPCHelpMan addconnection()
             HelpExampleCli("addconnection", "\"192.168.0.6:8333\" \"outbound-full-relay\" true")
             + HelpExampleRpc("addconnection", "\"192.168.0.6:8333\" \"outbound-full-relay\" true")
         },
-        [&](const RPCHelpMan& self, const JSONRPCRequest& request) -> UniValue
+        [](const RPCMethod& self, const JSONRPCRequest& request) -> UniValue
 {
     if (Params().GetChainType() != ChainType::REGTEST) {
         throw std::runtime_error("addconnection is for regression testing (-regtest mode) only.");
@@ -441,9 +437,9 @@ static RPCHelpMan addconnection()
     };
 }
 
-static RPCHelpMan disconnectnode()
+static RPCMethod disconnectnode()
 {
-    return RPCHelpMan{
+    return RPCMethod{
         "disconnectnode",
         "Immediately disconnects from the specified peer node.\n"
                 "\nStrictly one out of 'address' and 'nodeid' can be provided to identify the node.\n"
@@ -459,7 +455,7 @@ static RPCHelpMan disconnectnode()
             + HelpExampleRpc("disconnectnode", "\"192.168.0.6:8333\"")
             + HelpExampleRpc("disconnectnode", "\"\", 1")
                 },
-        [&](const RPCHelpMan& self, const JSONRPCRequest& request) -> UniValue
+        [](const RPCMethod& self, const JSONRPCRequest& request) -> UniValue
 {
     NodeContext& node = EnsureAnyNodeContext(request.context);
     CConnman& connman = EnsureConnman(node);
@@ -487,9 +483,9 @@ static RPCHelpMan disconnectnode()
     };
 }
 
-static RPCHelpMan getaddednodeinfo()
+static RPCMethod getaddednodeinfo()
 {
-    return RPCHelpMan{
+    return RPCMethod{
         "getaddednodeinfo",
         "Returns information about the given added node, or all added nodes\n"
                 "(note that onetry addnodes are not listed here)\n",
@@ -518,7 +514,7 @@ static RPCHelpMan getaddednodeinfo()
                     HelpExampleCli("getaddednodeinfo", "\"192.168.0.201\"")
             + HelpExampleRpc("getaddednodeinfo", "\"192.168.0.201\"")
                 },
-        [&](const RPCHelpMan& self, const JSONRPCRequest& request) -> UniValue
+        [](const RPCMethod& self, const JSONRPCRequest& request) -> UniValue
 {
     NodeContext& node = EnsureAnyNodeContext(request.context);
     const CConnman& connman = EnsureConnman(node);
@@ -561,9 +557,9 @@ static RPCHelpMan getaddednodeinfo()
     };
 }
 
-static RPCHelpMan getnettotals()
+static RPCMethod getnettotals()
 {
-    return RPCHelpMan{"getnettotals",
+    return RPCMethod{"getnettotals",
         "Returns information about network traffic, including bytes in, bytes out,\n"
         "and current system time.",
         {},
@@ -588,7 +584,7 @@ static RPCHelpMan getnettotals()
                     HelpExampleCli("getnettotals", "")
             + HelpExampleRpc("getnettotals", "")
                 },
-        [&](const RPCHelpMan& self, const JSONRPCRequest& request) -> UniValue
+        [](const RPCMethod& self, const JSONRPCRequest& request) -> UniValue
 {
     NodeContext& node = EnsureAnyNodeContext(request.context);
     const CConnman& connman = EnsureConnman(node);
@@ -617,22 +613,25 @@ static UniValue GetNetworksInfo()
     for (int n = 0; n < NET_MAX; ++n) {
         enum Network network = static_cast<enum Network>(n);
         if (network == NET_UNROUTABLE || network == NET_INTERNAL) continue;
-        Proxy proxy;
         UniValue obj(UniValue::VOBJ);
-        GetProxy(network, proxy);
         obj.pushKV("name", GetNetworkName(network));
         obj.pushKV("limited", !g_reachable_nets.Contains(network));
         obj.pushKV("reachable", g_reachable_nets.Contains(network));
-        obj.pushKV("proxy", proxy.IsValid() ? proxy.ToString() : std::string());
-        obj.pushKV("proxy_randomize_credentials", proxy.m_tor_stream_isolation);
+        if (const auto proxy = GetProxy(network)) {
+            obj.pushKV("proxy", proxy->ToString());
+            obj.pushKV("proxy_randomize_credentials", proxy->m_tor_stream_isolation);
+        } else {
+            obj.pushKV("proxy", std::string());
+            obj.pushKV("proxy_randomize_credentials", false);
+        }
         networks.push_back(std::move(obj));
     }
     return networks;
 }
 
-static RPCHelpMan getnetworkinfo()
+static RPCMethod getnetworkinfo()
 {
-    return RPCHelpMan{"getnetworkinfo",
+    return RPCMethod{"getnetworkinfo",
                 "Returns an object containing various state info regarding P2P networking.\n",
                 {},
                 RPCResult{
@@ -688,7 +687,7 @@ static RPCHelpMan getnetworkinfo()
                     HelpExampleCli("getnetworkinfo", "")
             + HelpExampleRpc("getnetworkinfo", "")
                 },
-        [&](const RPCHelpMan& self, const JSONRPCRequest& request) -> UniValue
+        [](const RPCMethod& self, const JSONRPCRequest& request) -> UniValue
 {
     LOCK(cs_main);
     UniValue obj(UniValue::VOBJ);
@@ -737,9 +736,9 @@ static RPCHelpMan getnetworkinfo()
     };
 }
 
-static RPCHelpMan setban()
+static RPCMethod setban()
 {
-    return RPCHelpMan{
+    return RPCMethod{
         "setban",
         "Attempts to add or remove an IP/Subnet from the banned list.\n",
                 {
@@ -754,7 +753,7 @@ static RPCHelpMan setban()
                             + HelpExampleCli("setban", "\"192.168.0.0/24\" \"add\"")
                             + HelpExampleRpc("setban", "\"192.168.0.6\", \"add\", 86400")
                 },
-        [&](const RPCHelpMan& help, const JSONRPCRequest& request) -> UniValue
+        [](const RPCMethod& help, const JSONRPCRequest& request) -> UniValue
 {
     auto command{help.Arg<std::string_view>("command")};
     if (command != "add" && command != "remove") {
@@ -817,9 +816,9 @@ static RPCHelpMan setban()
     };
 }
 
-static RPCHelpMan listbanned()
+static RPCMethod listbanned()
 {
-    return RPCHelpMan{
+    return RPCMethod{
         "listbanned",
         "List all manually banned IPs/Subnets.\n",
                 {},
@@ -838,7 +837,7 @@ static RPCHelpMan listbanned()
                     HelpExampleCli("listbanned", "")
                             + HelpExampleRpc("listbanned", "")
                 },
-        [&](const RPCHelpMan& self, const JSONRPCRequest& request) -> UniValue
+        [](const RPCMethod& self, const JSONRPCRequest& request) -> UniValue
 {
     BanMan& banman = EnsureAnyBanman(request.context);
 
@@ -865,9 +864,9 @@ static RPCHelpMan listbanned()
     };
 }
 
-static RPCHelpMan clearbanned()
+static RPCMethod clearbanned()
 {
-    return RPCHelpMan{
+    return RPCMethod{
         "clearbanned",
         "Clear all banned IPs.\n",
                 {},
@@ -876,7 +875,7 @@ static RPCHelpMan clearbanned()
                     HelpExampleCli("clearbanned", "")
                             + HelpExampleRpc("clearbanned", "")
                 },
-        [&](const RPCHelpMan& self, const JSONRPCRequest& request) -> UniValue
+        [](const RPCMethod& self, const JSONRPCRequest& request) -> UniValue
 {
     BanMan& banman = EnsureAnyBanman(request.context);
 
@@ -887,9 +886,9 @@ static RPCHelpMan clearbanned()
     };
 }
 
-static RPCHelpMan setnetworkactive()
+static RPCMethod setnetworkactive()
 {
-    return RPCHelpMan{
+    return RPCMethod{
         "setnetworkactive",
         "Disable/enable all p2p network activity.\n",
                 {
@@ -897,7 +896,7 @@ static RPCHelpMan setnetworkactive()
                 },
                 RPCResult{RPCResult::Type::BOOL, "", "The value that was passed in"},
                 RPCExamples{""},
-        [&](const RPCHelpMan& self, const JSONRPCRequest& request) -> UniValue
+        [](const RPCMethod& self, const JSONRPCRequest& request) -> UniValue
 {
     NodeContext& node = EnsureAnyNodeContext(request.context);
     CConnman& connman = EnsureConnman(node);
@@ -909,9 +908,9 @@ static RPCHelpMan setnetworkactive()
     };
 }
 
-static RPCHelpMan getnodeaddresses()
+static RPCMethod getnodeaddresses()
 {
-    return RPCHelpMan{"getnodeaddresses",
+    return RPCMethod{"getnodeaddresses",
                 "Return known addresses, after filtering for quality and recency.\n"
                 "These can potentially be used to find new peers in the network.\n"
                 "The total number of addresses known to the node may be higher.",
@@ -939,7 +938,7 @@ static RPCHelpMan getnodeaddresses()
                     + HelpExampleRpc("getnodeaddresses", "8")
                     + HelpExampleRpc("getnodeaddresses", "4, \"i2p\"")
                 },
-        [&](const RPCHelpMan& self, const JSONRPCRequest& request) -> UniValue
+        [](const RPCMethod& self, const JSONRPCRequest& request) -> UniValue
 {
     NodeContext& node = EnsureAnyNodeContext(request.context);
     const CConnman& connman = EnsureConnman(node);
@@ -970,9 +969,9 @@ static RPCHelpMan getnodeaddresses()
     };
 }
 
-static RPCHelpMan addpeeraddress()
+static RPCMethod addpeeraddress()
 {
-    return RPCHelpMan{"addpeeraddress",
+    return RPCMethod{"addpeeraddress",
         "Add the address of a potential peer to an address manager table. This RPC is for testing only.",
         {
             {"address", RPCArg::Type::STR, RPCArg::Optional::NO, "The IP address of the peer"},
@@ -990,7 +989,7 @@ static RPCHelpMan addpeeraddress()
             HelpExampleCli("addpeeraddress", "\"1.2.3.4\" 8333 true")
     + HelpExampleRpc("addpeeraddress", "\"1.2.3.4\", 8333, true")
         },
-        [&](const RPCHelpMan& self, const JSONRPCRequest& request) -> UniValue
+        [](const RPCMethod& self, const JSONRPCRequest& request) -> UniValue
 {
     AddrMan& addrman = EnsureAnyAddrman(request.context);
 
@@ -1030,9 +1029,9 @@ static RPCHelpMan addpeeraddress()
     };
 }
 
-static RPCHelpMan sendmsgtopeer()
+static RPCMethod sendmsgtopeer()
 {
-    return RPCHelpMan{
+    return RPCMethod{
         "sendmsgtopeer",
         "Send a p2p message to a peer specified by id.\n"
         "The message type and body must be provided, the message header will be generated.\n"
@@ -1045,7 +1044,7 @@ static RPCHelpMan sendmsgtopeer()
         RPCResult{RPCResult::Type::OBJ, "", "", std::vector<RPCResult>{}},
         RPCExamples{
             HelpExampleCli("sendmsgtopeer", "0 \"addr\" \"ffffff\"") + HelpExampleRpc("sendmsgtopeer", "0 \"addr\" \"ffffff\"")},
-        [&](const RPCHelpMan& self, const JSONRPCRequest& request) -> UniValue {
+        [](const RPCMethod& self, const JSONRPCRequest& request) -> UniValue {
             const NodeId peer_id{request.params[0].getInt<int64_t>()};
             const auto msg_type{self.Arg<std::string_view>("msg_type")};
             if (msg_type.size() > CMessageHeader::MESSAGE_TYPE_SIZE) {
@@ -1078,9 +1077,9 @@ static RPCHelpMan sendmsgtopeer()
     };
 }
 
-static RPCHelpMan getaddrmaninfo()
+static RPCMethod getaddrmaninfo()
 {
-    return RPCHelpMan{
+    return RPCMethod{
         "getaddrmaninfo",
         "Provides information about the node's address manager by returning the number of "
         "addresses in the `new` and `tried` tables and their sum for all networks.\n",
@@ -1094,7 +1093,7 @@ static RPCHelpMan getaddrmaninfo()
             }},
         }},
         RPCExamples{HelpExampleCli("getaddrmaninfo", "") + HelpExampleRpc("getaddrmaninfo", "")},
-        [&](const RPCHelpMan& self, const JSONRPCRequest& request) -> UniValue {
+        [](const RPCMethod& self, const JSONRPCRequest& request) -> UniValue {
             AddrMan& addrman = EnsureAnyAddrman(request.context);
 
             UniValue ret(UniValue::VOBJ);
@@ -1154,9 +1153,9 @@ UniValue AddrmanTableToJSON(const std::vector<std::pair<AddrInfo, AddressPositio
     return table;
 }
 
-static RPCHelpMan getrawaddrman()
+static RPCMethod getrawaddrman()
 {
-    return RPCHelpMan{"getrawaddrman",
+    return RPCMethod{"getrawaddrman",
         "EXPERIMENTAL warning: this call may be changed in future releases.\n"
         "\nReturns information on all address manager entries for the new and tried tables.\n",
         {},
@@ -1181,7 +1180,7 @@ static RPCHelpMan getrawaddrman()
             HelpExampleCli("getrawaddrman", "")
             + HelpExampleRpc("getrawaddrman", "")
         },
-        [&](const RPCHelpMan& self, const JSONRPCRequest& request) -> UniValue {
+        [](const RPCMethod& self, const JSONRPCRequest& request) -> UniValue {
             AddrMan& addrman = EnsureAnyAddrman(request.context);
             NodeContext& node_context = EnsureAnyNodeContext(request.context);
             CConnman& connman = EnsureConnman(node_context);
diff --git a/src/rpc/node.cpp b/src/rpc/node.cpp
index 2379ae07e06b..aad24b0f5b33 100644
--- a/src/rpc/node.cpp
+++ b/src/rpc/node.cpp
@@ -36,9 +36,9 @@
 
 using node::NodeContext;
 
-static RPCHelpMan setmocktime()
+static RPCMethod setmocktime()
 {
-    return RPCHelpMan{
+    return RPCMethod{
         "setmocktime",
         "Set the local time to given timestamp (-regtest only)\n",
         {
@@ -47,7 +47,7 @@ static RPCHelpMan setmocktime()
         },
         RPCResult{RPCResult::Type::NONE, "", ""},
         RPCExamples{""},
-        [&](const RPCHelpMan& self, const JSONRPCRequest& request) -> UniValue
+        [](const RPCMethod& self, const JSONRPCRequest& request) -> UniValue
 {
     if (!Params().IsMockableChain()) {
         throw std::runtime_error("setmocktime is for regression testing (-regtest mode) only");
@@ -77,9 +77,9 @@ static RPCHelpMan setmocktime()
     };
 }
 
-static RPCHelpMan mockscheduler()
+static RPCMethod mockscheduler()
 {
-    return RPCHelpMan{
+    return RPCMethod{
         "mockscheduler",
         "Bump the scheduler into the future (-regtest only)\n",
         {
@@ -87,7 +87,7 @@ static RPCHelpMan mockscheduler()
         },
         RPCResult{RPCResult::Type::NONE, "", ""},
         RPCExamples{""},
-        [&](const RPCHelpMan& self, const JSONRPCRequest& request) -> UniValue
+        [](const RPCMethod& self, const JSONRPCRequest& request) -> UniValue
 {
     if (!Params().IsMockableChain()) {
         throw std::runtime_error("mockscheduler is for regression testing (-regtest mode) only");
@@ -142,12 +142,12 @@ static std::string RPCMallocInfo()
 }
 #endif
 
-static RPCHelpMan getmemoryinfo()
+static RPCMethod getmemoryinfo()
 {
     /* Please, avoid using the word "pool" here in the RPC interface or help,
      * as users will undoubtedly confuse it with the other "memory pool"
      */
-    return RPCHelpMan{"getmemoryinfo",
+    return RPCMethod{"getmemoryinfo",
                 "Returns an object containing information about memory usage.\n",
                 {
                     {"mode", RPCArg::Type::STR, RPCArg::Default{"stats"}, "determines what kind of information is returned.\n"
@@ -177,7 +177,7 @@ static RPCHelpMan getmemoryinfo()
                     HelpExampleCli("getmemoryinfo", "")
             + HelpExampleRpc("getmemoryinfo", "")
                 },
-        [&](const RPCHelpMan& self, const JSONRPCRequest& request) -> UniValue
+        [](const RPCMethod& self, const JSONRPCRequest& request) -> UniValue
 {
     auto mode{self.Arg<std::string_view>("mode")};
     if (mode == "stats") {
@@ -215,9 +215,9 @@ static void EnableOrDisableLogCategories(UniValue cats, bool enable) {
     }
 }
 
-static RPCHelpMan logging()
+static RPCMethod logging()
 {
-    return RPCHelpMan{"logging",
+    return RPCMethod{"logging",
             "Gets and sets the logging configuration.\n"
             "When called without an argument, returns the list of categories with status that are currently being debug logged or not.\n"
             "When called with arguments, adds or removes categories from debug logging and return the lists above.\n"
@@ -247,7 +247,7 @@ static RPCHelpMan logging()
                     HelpExampleCli("logging", "\"[\\\"all\\\"]\" \"[\\\"http\\\"]\"")
             + HelpExampleRpc("logging", "[\"all\"], [\"libevent\"]")
                 },
-        [&](const RPCHelpMan& self, const JSONRPCRequest& request) -> UniValue
+        [](const RPCMethod& self, const JSONRPCRequest& request) -> UniValue
 {
     BCLog::CategoryMask original_log_categories = LogInstance().GetCategoryMask();
     if (request.params[0].isArray()) {
@@ -274,9 +274,9 @@ static RPCHelpMan logging()
     };
 }
 
-static RPCHelpMan echo(const std::string& name)
+static RPCMethod echo(const std::string& name)
 {
-    return RPCHelpMan{
+    return RPCMethod{
         name,
         "Simply echo back the input arguments. This command is for testing.\n"
                 "\nIt will return an internal bug report when arg9='trigger_internal_bug' is passed.\n"
@@ -296,7 +296,7 @@ static RPCHelpMan echo(const std::string& name)
         },
                 RPCResult{RPCResult::Type::ANY, "", "Returns whatever was passed in"},
                 RPCExamples{""},
-        [&](const RPCHelpMan& self, const JSONRPCRequest& request) -> UniValue
+        [](const RPCMethod& self, const JSONRPCRequest& request) -> UniValue
 {
     if (request.params[9].isStr()) {
         CHECK_NONFATAL(request.params[9].get_str() != "trigger_internal_bug");
@@ -307,12 +307,12 @@ static RPCHelpMan echo(const std::string& name)
     };
 }
 
-static RPCHelpMan echo() { return echo("echo"); }
-static RPCHelpMan echojson() { return echo("echojson"); }
+static RPCMethod echo() { return echo("echo"); }
+static RPCMethod echojson() { return echo("echojson"); }
 
-static RPCHelpMan echoipc()
+static RPCMethod echoipc()
 {
-    return RPCHelpMan{
+    return RPCMethod{
         "echoipc",
         "Echo back the input argument, passing it through a spawned process in a multiprocess build.\n"
         "This command is for testing.\n",
@@ -320,7 +320,7 @@ static RPCHelpMan echoipc()
         RPCResult{RPCResult::Type::STR, "echo", "The echoed string."},
         RPCExamples{HelpExampleCli("echo", "\"Hello world\"") +
                     HelpExampleRpc("echo", "\"Hello world\"")},
-        [&](const RPCHelpMan& self, const JSONRPCRequest& request) -> UniValue {
+        [](const RPCMethod& self, const JSONRPCRequest& request) -> UniValue {
             interfaces::Init& local_init = *EnsureAnyNodeContext(request.context).init;
             std::unique_ptr<interfaces::Echo> echo;
             if (interfaces::Ipc* ipc = local_init.ipc()) {
@@ -360,9 +360,9 @@ static UniValue SummaryToJSON(const IndexSummary&& summary, std::string index_na
     return ret_summary;
 }
 
-static RPCHelpMan getindexinfo()
+static RPCMethod getindexinfo()
 {
-    return RPCHelpMan{
+    return RPCMethod{
         "getindexinfo",
         "Returns the status of one or all available indices currently running in the node.\n",
                 {
@@ -385,7 +385,7 @@ static RPCHelpMan getindexinfo()
                   + HelpExampleCli("getindexinfo", "txindex")
                   + HelpExampleRpc("getindexinfo", "txindex")
                 },
-                [&](const RPCHelpMan& self, const JSONRPCRequest& request) -> UniValue
+                [](const RPCMethod& self, const JSONRPCRequest& request) -> UniValue
 {
     UniValue result(UniValue::VOBJ);
     const std::string index_name{self.MaybeArg<std::string_view>("index_name").value_or("")};
diff --git a/src/rpc/output_script.cpp b/src/rpc/output_script.cpp
index 2d65b98a8c74..cb73fe544909 100644
--- a/src/rpc/output_script.cpp
+++ b/src/rpc/output_script.cpp
@@ -26,9 +26,9 @@
 #include <tuple>
 #include <vector>
 
-static RPCHelpMan validateaddress()
+static RPCMethod validateaddress()
 {
-    return RPCHelpMan{
+    return RPCMethod{
         "validateaddress",
         "Return information about the given bitcoin address.\n",
         {
@@ -55,7 +55,7 @@ static RPCHelpMan validateaddress()
             HelpExampleCli("validateaddress", "\"" + EXAMPLE_ADDRESS[0] + "\"") +
             HelpExampleRpc("validateaddress", "\"" + EXAMPLE_ADDRESS[0] + "\"")
         },
-        [&](const RPCHelpMan& self, const JSONRPCRequest& request) -> UniValue
+        [](const RPCMethod& self, const JSONRPCRequest& request) -> UniValue
         {
             std::string error_msg;
             std::vector<int> error_locations;
@@ -86,9 +86,9 @@ static RPCHelpMan validateaddress()
     };
 }
 
-static RPCHelpMan createmultisig()
+static RPCMethod createmultisig()
 {
-    return RPCHelpMan{
+    return RPCMethod{
         "createmultisig",
         "Creates a multi-signature address with n signatures of m keys required.\n"
         "It returns a json object with the address and redeemScript.\n",
@@ -118,7 +118,7 @@ static RPCHelpMan createmultisig()
             "\nAs a JSON-RPC call\n"
             + HelpExampleRpc("createmultisig", "2, [\"03789ed0bb717d88f7d321a368d905e7430207ebbd82bd342cf11ae157a7ace5fd\",\"03dbc6764b8884a92e871274b87583e6d5c2a58819473e17e107ef3f6aa5a61626\"]")
                 },
-        [&](const RPCHelpMan& self, const JSONRPCRequest& request) -> UniValue
+        [](const RPCMethod& self, const JSONRPCRequest& request) -> UniValue
         {
             int required = request.params[0].getInt<int>();
 
@@ -163,11 +163,11 @@ static RPCHelpMan createmultisig()
     };
 }
 
-static RPCHelpMan getdescriptorinfo()
+static RPCMethod getdescriptorinfo()
 {
     const std::string EXAMPLE_DESCRIPTOR = "wpkh([d34db33f/84h/0h/0h]0279be667ef9dcbbac55a06295Ce870b07029Bfcdb2dce28d959f2815b16f81798)";
 
-    return RPCHelpMan{
+    return RPCMethod{
         "getdescriptorinfo",
         "Analyses a descriptor.\n",
         {
@@ -192,7 +192,7 @@ static RPCHelpMan getdescriptorinfo()
             HelpExampleCli("getdescriptorinfo", "\"" + EXAMPLE_DESCRIPTOR + "\"") +
             HelpExampleRpc("getdescriptorinfo", "\"" + EXAMPLE_DESCRIPTOR + "\"")
         },
-        [&](const RPCHelpMan& self, const JSONRPCRequest& request) -> UniValue
+        [](const RPCMethod& self, const JSONRPCRequest& request) -> UniValue
         {
             FlatSigningProvider provider;
             std::string error;
@@ -255,11 +255,11 @@ static UniValue DeriveAddresses(const Descriptor* desc, int64_t range_begin, int
     return addresses;
 }
 
-static RPCHelpMan deriveaddresses()
+static RPCMethod deriveaddresses()
 {
     const std::string EXAMPLE_DESCRIPTOR = "wpkh([d34db33f/84h/0h/0h]xpub6DJ2dNUysrn5Vt36jH2KLBT2i1auw1tTSSomg8PhqNiUtx8QX2SvC9nrHu81fT41fvDUnhMjEzQgXnQjKEu3oaqMSzhSrHMxyyoEAmUHQbY/0/*)#cjjspncu";
 
-    return RPCHelpMan{
+    return RPCMethod{
         "deriveaddresses",
         "Derives one or more addresses corresponding to an output descriptor.\n"
          "Examples of output descriptors are:\n"
@@ -299,7 +299,7 @@ static RPCHelpMan deriveaddresses()
             HelpExampleCli("deriveaddresses", "\"" + EXAMPLE_DESCRIPTOR + "\" \"[0,2]\"") +
             HelpExampleRpc("deriveaddresses", "\"" + EXAMPLE_DESCRIPTOR + "\", \"[0,2]\"")
         },
-        [&](const RPCHelpMan& self, const JSONRPCRequest& request) -> UniValue
+        [](const RPCMethod& self, const JSONRPCRequest& request) -> UniValue
         {
             auto desc_str{self.Arg<std::string_view>("descriptor")};
 
diff --git a/src/rpc/protocol.h b/src/rpc/protocol.h
index 3f18365c50bc..40e685d5868e 100644
--- a/src/rpc/protocol.h
+++ b/src/rpc/protocol.h
@@ -7,7 +7,7 @@
 #define BITCOIN_RPC_PROTOCOL_H
 
 //! HTTP status codes
-enum HTTPStatusCode
+enum HTTPStatusCode : int
 {
     HTTP_OK                    = 200,
     HTTP_NO_CONTENT            = 204,
diff --git a/src/rpc/rawtransaction.cpp b/src/rpc/rawtransaction.cpp
index 5885422be7c2..74652c174217 100644
--- a/src/rpc/rawtransaction.cpp
+++ b/src/rpc/rawtransaction.cpp
@@ -213,9 +213,9 @@ PartiallySignedTransaction ProcessPSBT(const std::string& psbt_string, const std
     return psbtx;
 }
 
-static RPCHelpMan getrawtransaction()
+static RPCMethod getrawtransaction()
 {
-    return RPCHelpMan{
+    return RPCMethod{
                 "getrawtransaction",
 
                 "By default, this call only returns a transaction if it is in the mempool. If -txindex is enabled\n"
@@ -248,7 +248,7 @@ static RPCHelpMan getrawtransaction()
                              {RPCResult::Type::NUM, "time", /*optional=*/true, "Same as \"blocktime\""},
                              {RPCResult::Type::STR_HEX, "hex", "The serialized, hex-encoded data for 'txid'"},
                          },
-                         DecodeTxDoc(/*txid_field_doc=*/"The transaction id (same as provided)", /*wallet=*/false)),
+                         TxDoc({.txid_field_doc="The transaction id (same as provided)"})),
                     },
                     RPCResult{"for verbosity = 2",
                         RPCResult::Type::OBJ, "", "",
@@ -279,7 +279,7 @@ static RPCHelpMan getrawtransaction()
             + HelpExampleCli("getrawtransaction", "\"mytxid\" 1 \"myblockhash\"")
             + HelpExampleCli("getrawtransaction", "\"mytxid\" 2 \"myblockhash\"")
                 },
-        [&](const RPCHelpMan& self, const JSONRPCRequest& request) -> UniValue
+        [](const RPCMethod& self, const JSONRPCRequest& request) -> UniValue
 {
     const NodeContext& node = EnsureAnyNodeContext(request.context);
     ChainstateManager& chainman = EnsureChainman(node);
@@ -374,9 +374,9 @@ static RPCHelpMan getrawtransaction()
     };
 }
 
-static RPCHelpMan createrawtransaction()
+static RPCMethod createrawtransaction()
 {
-    return RPCHelpMan{
+    return RPCMethod{
         "createrawtransaction",
         "Create a transaction spending the given inputs and creating new outputs.\n"
                 "Outputs can be addresses or data.\n"
@@ -393,7 +393,7 @@ static RPCHelpMan createrawtransaction()
             + HelpExampleRpc("createrawtransaction", "\"[{\\\"txid\\\":\\\"myid\\\",\\\"vout\\\":0}]\", \"[{\\\"address\\\":0.01}]\"")
             + HelpExampleRpc("createrawtransaction", "\"[{\\\"txid\\\":\\\"myid\\\",\\\"vout\\\":0}]\", \"[{\\\"data\\\":\\\"00010203\\\"}]\"")
                 },
-        [&](const RPCHelpMan& self, const JSONRPCRequest& request) -> UniValue
+        [](const RPCMethod& self, const JSONRPCRequest& request) -> UniValue
 {
     std::optional<bool> rbf;
     if (!request.params[3].isNull()) {
@@ -406,9 +406,9 @@ static RPCHelpMan createrawtransaction()
     };
 }
 
-static RPCHelpMan decoderawtransaction()
+static RPCMethod decoderawtransaction()
 {
-    return RPCHelpMan{"decoderawtransaction",
+    return RPCMethod{"decoderawtransaction",
                 "Return a JSON object representing the serialized, hex-encoded transaction.",
                 {
                     {"hexstring", RPCArg::Type::STR_HEX, RPCArg::Optional::NO, "The transaction hex string"},
@@ -422,13 +422,13 @@ static RPCHelpMan decoderawtransaction()
                 },
                 RPCResult{
                     RPCResult::Type::OBJ, "", "",
-                    DecodeTxDoc(/*txid_field_doc=*/"The transaction id", /*wallet=*/false),
+                    TxDoc(),
                 },
                 RPCExamples{
                     HelpExampleCli("decoderawtransaction", "\"hexstring\"")
             + HelpExampleRpc("decoderawtransaction", "\"hexstring\"")
                 },
-        [&](const RPCHelpMan& self, const JSONRPCRequest& request) -> UniValue
+        [](const RPCMethod& self, const JSONRPCRequest& request) -> UniValue
 {
     CMutableTransaction mtx;
 
@@ -447,9 +447,9 @@ static RPCHelpMan decoderawtransaction()
     };
 }
 
-static RPCHelpMan decodescript()
+static RPCMethod decodescript()
 {
-    return RPCHelpMan{
+    return RPCMethod{
         "decodescript",
         "Decode a hex-encoded script.\n",
         {
@@ -480,7 +480,7 @@ static RPCHelpMan decodescript()
             HelpExampleCli("decodescript", "\"hexstring\"")
           + HelpExampleRpc("decodescript", "\"hexstring\"")
         },
-        [&](const RPCHelpMan& self, const JSONRPCRequest& request) -> UniValue
+        [](const RPCMethod& self, const JSONRPCRequest& request) -> UniValue
 {
     UniValue r(UniValue::VOBJ);
     CScript script;
@@ -582,9 +582,9 @@ static RPCHelpMan decodescript()
     };
 }
 
-static RPCHelpMan combinerawtransaction()
+static RPCMethod combinerawtransaction()
 {
-    return RPCHelpMan{
+    return RPCMethod{
         "combinerawtransaction",
         "Combine multiple partially signed transactions into one transaction.\n"
                 "The combined transaction may be another partially signed transaction or a \n"
@@ -602,7 +602,7 @@ static RPCHelpMan combinerawtransaction()
                 RPCExamples{
                     HelpExampleCli("combinerawtransaction", R"('["myhex1", "myhex2", "myhex3"]')")
                 },
-        [&](const RPCHelpMan& self, const JSONRPCRequest& request) -> UniValue
+        [](const RPCMethod& self, const JSONRPCRequest& request) -> UniValue
 {
 
     UniValue txs = request.params[0].get_array();
@@ -623,8 +623,7 @@ static RPCHelpMan combinerawtransaction()
     CMutableTransaction mergedTx(txVariants[0]);
 
     // Fetch previous transactions (inputs):
-    CCoinsView viewDummy;
-    CCoinsViewCache view(&viewDummy);
+    CCoinsViewCache view{&CoinsViewEmpty::Get()};
     {
         NodeContext& node = EnsureAnyNodeContext(request.context);
         const CTxMemPool& mempool = EnsureMemPool(node);
@@ -638,7 +637,7 @@ static RPCHelpMan combinerawtransaction()
             view.AccessCoin(txin.prevout); // Load entries from viewChain into view; can fail.
         }
 
-        view.SetBackend(viewDummy); // switch back to avoid locking mempool for too long
+        view.SetBackend(CoinsViewEmpty::Get()); // switch back to avoid locking mempool for too long
     }
 
     // Use CTransaction for the constant parts of the
@@ -669,9 +668,9 @@ static RPCHelpMan combinerawtransaction()
     };
 }
 
-static RPCHelpMan signrawtransactionwithkey()
+static RPCMethod signrawtransactionwithkey()
 {
-    return RPCHelpMan{
+    return RPCMethod{
         "signrawtransactionwithkey",
         "Sign inputs for raw transaction (serialized, hex-encoded).\n"
                 "The second argument is an array of base58-encoded private\n"
@@ -735,7 +734,7 @@ static RPCHelpMan signrawtransactionwithkey()
                     HelpExampleCli("signrawtransactionwithkey", "\"myhex\" \"[\\\"key1\\\",\\\"key2\\\"]\"")
             + HelpExampleRpc("signrawtransactionwithkey", "\"myhex\", \"[\\\"key1\\\",\\\"key2\\\"]\"")
                 },
-        [&](const RPCHelpMan& self, const JSONRPCRequest& request) -> UniValue
+        [](const RPCMethod& self, const JSONRPCRequest& request) -> UniValue
 {
     CMutableTransaction mtx;
     if (!DecodeHexTx(mtx, request.params[0].get_str())) {
@@ -775,245 +774,252 @@ static RPCHelpMan signrawtransactionwithkey()
     };
 }
 
-const RPCResult decodepsbt_inputs{
-    RPCResult::Type::ARR, "inputs", "",
-    {
-        {RPCResult::Type::OBJ, "", "",
+const RPCResult& DecodePSBTInputs()
+{
+    static const RPCResult decodepsbt_inputs{
+        RPCResult::Type::ARR, "inputs", "",
         {
-            {RPCResult::Type::OBJ, "non_witness_utxo", /*optional=*/true, "Decoded network transaction for non-witness UTXOs",
-            {
-                {RPCResult::Type::ELISION, "",""},
-            }},
-            {RPCResult::Type::OBJ, "witness_utxo", /*optional=*/true, "Transaction output for witness UTXOs",
+            {RPCResult::Type::OBJ, "", "",
             {
-                {RPCResult::Type::NUM, "amount", "The value in " + CURRENCY_UNIT},
-                {RPCResult::Type::OBJ, "scriptPubKey", "",
+                {RPCResult::Type::OBJ, "non_witness_utxo", /*optional=*/true, "Decoded network transaction for non-witness UTXOs",
+                    TxDoc({.elision_description="The layout is the same as the output of decoderawtransaction."})
+                },
+                {RPCResult::Type::OBJ, "witness_utxo", /*optional=*/true, "Transaction output for witness UTXOs",
+                {
+                    {RPCResult::Type::NUM, "amount", "The value in " + CURRENCY_UNIT},
+                    {RPCResult::Type::OBJ, "scriptPubKey", "",
+                    {
+                        {RPCResult::Type::STR, "asm", "Disassembly of the output script"},
+                        {RPCResult::Type::STR, "desc", "Inferred descriptor for the output"},
+                        {RPCResult::Type::STR_HEX, "hex", "The raw output script bytes, hex-encoded"},
+                        {RPCResult::Type::STR, "type", "The type, eg 'pubkeyhash'"},
+                        {RPCResult::Type::STR, "address", /*optional=*/true, "The Bitcoin address (only if a well-defined address exists)"},
+                    }},
+                }},
+                {RPCResult::Type::OBJ_DYN, "partial_signatures", /*optional=*/true, "",
+                {
+                    {RPCResult::Type::STR, "pubkey", "The public key and signature that corresponds to it."},
+                }},
+                {RPCResult::Type::STR, "sighash", /*optional=*/true, "The sighash type to be used"},
+                {RPCResult::Type::OBJ, "redeem_script", /*optional=*/true, "",
                 {
-                    {RPCResult::Type::STR, "asm", "Disassembly of the output script"},
-                    {RPCResult::Type::STR, "desc", "Inferred descriptor for the output"},
-                    {RPCResult::Type::STR_HEX, "hex", "The raw output script bytes, hex-encoded"},
+                    {RPCResult::Type::STR, "asm", "Disassembly of the redeem script"},
+                    {RPCResult::Type::STR_HEX, "hex", "The raw redeem script bytes, hex-encoded"},
                     {RPCResult::Type::STR, "type", "The type, eg 'pubkeyhash'"},
-                    {RPCResult::Type::STR, "address", /*optional=*/true, "The Bitcoin address (only if a well-defined address exists)"},
                 }},
-            }},
-            {RPCResult::Type::OBJ_DYN, "partial_signatures", /*optional=*/true, "",
-            {
-                {RPCResult::Type::STR, "pubkey", "The public key and signature that corresponds to it."},
-            }},
-            {RPCResult::Type::STR, "sighash", /*optional=*/true, "The sighash type to be used"},
-            {RPCResult::Type::OBJ, "redeem_script", /*optional=*/true, "",
-            {
-                {RPCResult::Type::STR, "asm", "Disassembly of the redeem script"},
-                {RPCResult::Type::STR_HEX, "hex", "The raw redeem script bytes, hex-encoded"},
-                {RPCResult::Type::STR, "type", "The type, eg 'pubkeyhash'"},
-            }},
-            {RPCResult::Type::OBJ, "witness_script", /*optional=*/true, "",
-            {
-                {RPCResult::Type::STR, "asm", "Disassembly of the witness script"},
-                {RPCResult::Type::STR_HEX, "hex", "The raw witness script bytes, hex-encoded"},
-                {RPCResult::Type::STR, "type", "The type, eg 'pubkeyhash'"},
-            }},
-            {RPCResult::Type::ARR, "bip32_derivs", /*optional=*/true, "",
-            {
-                {RPCResult::Type::OBJ, "", "",
+                {RPCResult::Type::OBJ, "witness_script", /*optional=*/true, "",
                 {
-                    {RPCResult::Type::STR, "pubkey", "The public key with the derivation path as the value."},
-                    {RPCResult::Type::STR, "master_fingerprint", "The fingerprint of the master key"},
-                    {RPCResult::Type::STR, "path", "The path"},
+                    {RPCResult::Type::STR, "asm", "Disassembly of the witness script"},
+                    {RPCResult::Type::STR_HEX, "hex", "The raw witness script bytes, hex-encoded"},
+                    {RPCResult::Type::STR, "type", "The type, eg 'pubkeyhash'"},
                 }},
-            }},
-            {RPCResult::Type::OBJ, "final_scriptSig", /*optional=*/true, "",
-            {
-                {RPCResult::Type::STR, "asm", "Disassembly of the final signature script"},
-                {RPCResult::Type::STR_HEX, "hex", "The raw final signature script bytes, hex-encoded"},
-            }},
-            {RPCResult::Type::ARR, "final_scriptwitness", /*optional=*/true, "",
-            {
-                {RPCResult::Type::STR_HEX, "", "hex-encoded witness data (if any)"},
-            }},
-            {RPCResult::Type::OBJ_DYN, "ripemd160_preimages", /*optional=*/ true, "",
-            {
-                {RPCResult::Type::STR, "hash", "The hash and preimage that corresponds to it."},
-            }},
-            {RPCResult::Type::OBJ_DYN, "sha256_preimages", /*optional=*/ true, "",
-            {
-                {RPCResult::Type::STR, "hash", "The hash and preimage that corresponds to it."},
-            }},
-            {RPCResult::Type::OBJ_DYN, "hash160_preimages", /*optional=*/ true, "",
-            {
-                {RPCResult::Type::STR, "hash", "The hash and preimage that corresponds to it."},
-            }},
-            {RPCResult::Type::OBJ_DYN, "hash256_preimages", /*optional=*/ true, "",
-            {
-                {RPCResult::Type::STR, "hash", "The hash and preimage that corresponds to it."},
-            }},
-            {RPCResult::Type::STR_HEX, "taproot_key_path_sig", /*optional=*/ true, "hex-encoded signature for the Taproot key path spend"},
-            {RPCResult::Type::ARR, "taproot_script_path_sigs", /*optional=*/ true, "",
-            {
-                {RPCResult::Type::OBJ, "signature", /*optional=*/ true, "The signature for the pubkey and leaf hash combination",
+                {RPCResult::Type::ARR, "bip32_derivs", /*optional=*/true, "",
+                {
+                    {RPCResult::Type::OBJ, "", "",
+                    {
+                        {RPCResult::Type::STR, "pubkey", "The public key with the derivation path as the value."},
+                        {RPCResult::Type::STR, "master_fingerprint", "The fingerprint of the master key"},
+                        {RPCResult::Type::STR, "path", "The path"},
+                    }},
+                }},
+                {RPCResult::Type::OBJ, "final_scriptSig", /*optional=*/true, "",
                 {
-                    {RPCResult::Type::STR, "pubkey", "The x-only pubkey for this signature"},
-                    {RPCResult::Type::STR, "leaf_hash", "The leaf hash for this signature"},
-                    {RPCResult::Type::STR, "sig", "The signature itself"},
+                    {RPCResult::Type::STR, "asm", "Disassembly of the final signature script"},
+                    {RPCResult::Type::STR_HEX, "hex", "The raw final signature script bytes, hex-encoded"},
                 }},
-            }},
-            {RPCResult::Type::ARR, "taproot_scripts", /*optional=*/ true, "",
-            {
-                {RPCResult::Type::OBJ, "", "",
+                {RPCResult::Type::ARR, "final_scriptwitness", /*optional=*/true, "",
+                {
+                    {RPCResult::Type::STR_HEX, "", "hex-encoded witness data (if any)"},
+                }},
+                {RPCResult::Type::OBJ_DYN, "ripemd160_preimages", /*optional=*/ true, "",
+                {
+                    {RPCResult::Type::STR, "hash", "The hash and preimage that corresponds to it."},
+                }},
+                {RPCResult::Type::OBJ_DYN, "sha256_preimages", /*optional=*/ true, "",
+                {
+                    {RPCResult::Type::STR, "hash", "The hash and preimage that corresponds to it."},
+                }},
+                {RPCResult::Type::OBJ_DYN, "hash160_preimages", /*optional=*/ true, "",
+                {
+                    {RPCResult::Type::STR, "hash", "The hash and preimage that corresponds to it."},
+                }},
+                {RPCResult::Type::OBJ_DYN, "hash256_preimages", /*optional=*/ true, "",
                 {
-                    {RPCResult::Type::STR_HEX, "script", "A leaf script"},
-                    {RPCResult::Type::NUM, "leaf_ver", "The version number for the leaf script"},
-                    {RPCResult::Type::ARR, "control_blocks", "The control blocks for this script",
+                    {RPCResult::Type::STR, "hash", "The hash and preimage that corresponds to it."},
+                }},
+                {RPCResult::Type::STR_HEX, "taproot_key_path_sig", /*optional=*/ true, "hex-encoded signature for the Taproot key path spend"},
+                {RPCResult::Type::ARR, "taproot_script_path_sigs", /*optional=*/ true, "",
+                {
+                    {RPCResult::Type::OBJ, "signature", /*optional=*/ true, "The signature for the pubkey and leaf hash combination",
                     {
-                        {RPCResult::Type::STR_HEX, "control_block", "A hex-encoded control block for this script"},
+                        {RPCResult::Type::STR, "pubkey", "The x-only pubkey for this signature"},
+                        {RPCResult::Type::STR, "leaf_hash", "The leaf hash for this signature"},
+                        {RPCResult::Type::STR, "sig", "The signature itself"},
                     }},
                 }},
-            }},
-            {RPCResult::Type::ARR, "taproot_bip32_derivs", /*optional=*/ true, "",
-            {
-                {RPCResult::Type::OBJ, "", "",
+                {RPCResult::Type::ARR, "taproot_scripts", /*optional=*/ true, "",
                 {
-                    {RPCResult::Type::STR, "pubkey", "The x-only public key this path corresponds to"},
-                    {RPCResult::Type::STR, "master_fingerprint", "The fingerprint of the master key"},
-                    {RPCResult::Type::STR, "path", "The path"},
-                    {RPCResult::Type::ARR, "leaf_hashes", "The hashes of the leaves this pubkey appears in",
+                    {RPCResult::Type::OBJ, "", "",
                     {
-                        {RPCResult::Type::STR_HEX, "hash", "The hash of a leaf this pubkey appears in"},
+                        {RPCResult::Type::STR_HEX, "script", "A leaf script"},
+                        {RPCResult::Type::NUM, "leaf_ver", "The version number for the leaf script"},
+                        {RPCResult::Type::ARR, "control_blocks", "The control blocks for this script",
+                        {
+                            {RPCResult::Type::STR_HEX, "control_block", "A hex-encoded control block for this script"},
+                        }},
                     }},
                 }},
-            }},
-            {RPCResult::Type::STR_HEX, "taproot_internal_key", /*optional=*/ true, "The hex-encoded Taproot x-only internal key"},
-            {RPCResult::Type::STR_HEX, "taproot_merkle_root", /*optional=*/ true, "The hex-encoded Taproot merkle root"},
-            {RPCResult::Type::ARR, "musig2_participant_pubkeys", /*optional=*/true, "",
-            {
-                {RPCResult::Type::OBJ, "", "",
+                {RPCResult::Type::ARR, "taproot_bip32_derivs", /*optional=*/ true, "",
                 {
-                    {RPCResult::Type::STR_HEX, "aggregate_pubkey", "The compressed aggregate public key for which the participants create."},
-                    {RPCResult::Type::ARR, "participant_pubkeys", "",
+                    {RPCResult::Type::OBJ, "", "",
                     {
-                        {RPCResult::Type::STR_HEX, "pubkey", "The compressed public keys that are aggregated for aggregate_pubkey."},
+                        {RPCResult::Type::STR, "pubkey", "The x-only public key this path corresponds to"},
+                        {RPCResult::Type::STR, "master_fingerprint", "The fingerprint of the master key"},
+                        {RPCResult::Type::STR, "path", "The path"},
+                        {RPCResult::Type::ARR, "leaf_hashes", "The hashes of the leaves this pubkey appears in",
+                        {
+                            {RPCResult::Type::STR_HEX, "hash", "The hash of a leaf this pubkey appears in"},
+                        }},
                     }},
                 }},
-            }},
-            {RPCResult::Type::ARR, "musig2_pubnonces", /*optional=*/true, "",
-            {
-                {RPCResult::Type::OBJ, "", "",
+                {RPCResult::Type::STR_HEX, "taproot_internal_key", /*optional=*/ true, "The hex-encoded Taproot x-only internal key"},
+                {RPCResult::Type::STR_HEX, "taproot_merkle_root", /*optional=*/ true, "The hex-encoded Taproot merkle root"},
+                {RPCResult::Type::ARR, "musig2_participant_pubkeys", /*optional=*/true, "",
                 {
-                    {RPCResult::Type::STR_HEX, "participant_pubkey", "The compressed public key of the participant that created this pubnonce."},
-                    {RPCResult::Type::STR_HEX, "aggregate_pubkey", "The compressed aggregate public key for which this pubnonce is for."},
-                    {RPCResult::Type::STR_HEX, "leaf_hash", /*optional=*/true, "The hash of the leaf script that contains the aggregate pubkey being signed for. Omitted when signing for the internal key."},
-                    {RPCResult::Type::STR_HEX, "pubnonce", "The public nonce itself."},
+                    {RPCResult::Type::OBJ, "", "",
+                    {
+                        {RPCResult::Type::STR_HEX, "aggregate_pubkey", "The compressed aggregate public key for which the participants create."},
+                        {RPCResult::Type::ARR, "participant_pubkeys", "",
+                        {
+                            {RPCResult::Type::STR_HEX, "pubkey", "The compressed public keys that are aggregated for aggregate_pubkey."},
+                        }},
+                    }},
                 }},
-            }},
-            {RPCResult::Type::ARR, "musig2_partial_sigs", /*optional=*/true, "",
-            {
-                {RPCResult::Type::OBJ, "", "",
+                {RPCResult::Type::ARR, "musig2_pubnonces", /*optional=*/true, "",
                 {
-                    {RPCResult::Type::STR_HEX, "participant_pubkey", "The compressed public key of the participant that created this partial signature."},
-                    {RPCResult::Type::STR_HEX, "aggregate_pubkey", "The compressed aggregate public key for which this partial signature is for."},
-                    {RPCResult::Type::STR_HEX, "leaf_hash", /*optional=*/true, "The hash of the leaf script that contains the aggregate pubkey being signed for. Omitted when signing for the internal key."},
-                    {RPCResult::Type::STR_HEX, "partial_sig", "The partial signature itself."},
+                    {RPCResult::Type::OBJ, "", "",
+                    {
+                        {RPCResult::Type::STR_HEX, "participant_pubkey", "The compressed public key of the participant that created this pubnonce."},
+                        {RPCResult::Type::STR_HEX, "aggregate_pubkey", "The compressed aggregate public key for which this pubnonce is for."},
+                        {RPCResult::Type::STR_HEX, "leaf_hash", /*optional=*/true, "The hash of the leaf script that contains the aggregate pubkey being signed for. Omitted when signing for the internal key."},
+                        {RPCResult::Type::STR_HEX, "pubnonce", "The public nonce itself."},
+                    }},
                 }},
-            }},
-            {RPCResult::Type::OBJ_DYN, "unknown", /*optional=*/ true, "The unknown input fields",
-            {
-                {RPCResult::Type::STR_HEX, "key", "(key-value pair) An unknown key-value pair"},
-            }},
-            {RPCResult::Type::ARR, "proprietary", /*optional=*/true, "The input proprietary map",
-            {
-                {RPCResult::Type::OBJ, "", "",
+                {RPCResult::Type::ARR, "musig2_partial_sigs", /*optional=*/true, "",
+                {
+                    {RPCResult::Type::OBJ, "", "",
+                    {
+                        {RPCResult::Type::STR_HEX, "participant_pubkey", "The compressed public key of the participant that created this partial signature."},
+                        {RPCResult::Type::STR_HEX, "aggregate_pubkey", "The compressed aggregate public key for which this partial signature is for."},
+                        {RPCResult::Type::STR_HEX, "leaf_hash", /*optional=*/true, "The hash of the leaf script that contains the aggregate pubkey being signed for. Omitted when signing for the internal key."},
+                        {RPCResult::Type::STR_HEX, "partial_sig", "The partial signature itself."},
+                    }},
+                }},
+                {RPCResult::Type::OBJ_DYN, "unknown", /*optional=*/ true, "The unknown input fields",
                 {
-                    {RPCResult::Type::STR_HEX, "identifier", "The hex string for the proprietary identifier"},
-                    {RPCResult::Type::NUM, "subtype", "The number for the subtype"},
-                    {RPCResult::Type::STR_HEX, "key", "The hex for the key"},
-                    {RPCResult::Type::STR_HEX, "value", "The hex for the value"},
+                    {RPCResult::Type::STR_HEX, "key", "(key-value pair) An unknown key-value pair"},
+                }},
+                {RPCResult::Type::ARR, "proprietary", /*optional=*/true, "The input proprietary map",
+                {
+                    {RPCResult::Type::OBJ, "", "",
+                    {
+                        {RPCResult::Type::STR_HEX, "identifier", "The hex string for the proprietary identifier"},
+                        {RPCResult::Type::NUM, "subtype", "The number for the subtype"},
+                        {RPCResult::Type::STR_HEX, "key", "The hex for the key"},
+                        {RPCResult::Type::STR_HEX, "value", "The hex for the value"},
+                    }},
                 }},
             }},
-        }},
-    }
-};
+        }
+    };
+    return decodepsbt_inputs;
+}
 
-const RPCResult decodepsbt_outputs{
-    RPCResult::Type::ARR, "outputs", "",
-    {
-        {RPCResult::Type::OBJ, "", "",
+const RPCResult& DecodePSBTOutputs()
+{
+    static const RPCResult decodepsbt_outputs{
+        RPCResult::Type::ARR, "outputs", "",
         {
-            {RPCResult::Type::OBJ, "redeem_script", /*optional=*/true, "",
+            {RPCResult::Type::OBJ, "", "",
             {
-                {RPCResult::Type::STR, "asm", "Disassembly of the redeem script"},
-                {RPCResult::Type::STR_HEX, "hex", "The raw redeem script bytes, hex-encoded"},
-                {RPCResult::Type::STR, "type", "The type, eg 'pubkeyhash'"},
-            }},
-            {RPCResult::Type::OBJ, "witness_script", /*optional=*/true, "",
-            {
-                {RPCResult::Type::STR, "asm", "Disassembly of the witness script"},
-                {RPCResult::Type::STR_HEX, "hex", "The raw witness script bytes, hex-encoded"},
-                {RPCResult::Type::STR, "type", "The type, eg 'pubkeyhash'"},
-            }},
-            {RPCResult::Type::ARR, "bip32_derivs", /*optional=*/true, "",
-            {
-                {RPCResult::Type::OBJ, "", "",
+                {RPCResult::Type::OBJ, "redeem_script", /*optional=*/true, "",
                 {
-                    {RPCResult::Type::STR, "pubkey", "The public key this path corresponds to"},
-                    {RPCResult::Type::STR, "master_fingerprint", "The fingerprint of the master key"},
-                    {RPCResult::Type::STR, "path", "The path"},
+                    {RPCResult::Type::STR, "asm", "Disassembly of the redeem script"},
+                    {RPCResult::Type::STR_HEX, "hex", "The raw redeem script bytes, hex-encoded"},
+                    {RPCResult::Type::STR, "type", "The type, eg 'pubkeyhash'"},
                 }},
-            }},
-            {RPCResult::Type::STR_HEX, "taproot_internal_key", /*optional=*/ true, "The hex-encoded Taproot x-only internal key"},
-            {RPCResult::Type::ARR, "taproot_tree", /*optional=*/ true, "The tuples that make up the Taproot tree, in depth first search order",
-            {
-                {RPCResult::Type::OBJ, "tuple", /*optional=*/ true, "A single leaf script in the taproot tree",
+                {RPCResult::Type::OBJ, "witness_script", /*optional=*/true, "",
+                {
+                    {RPCResult::Type::STR, "asm", "Disassembly of the witness script"},
+                    {RPCResult::Type::STR_HEX, "hex", "The raw witness script bytes, hex-encoded"},
+                    {RPCResult::Type::STR, "type", "The type, eg 'pubkeyhash'"},
+                }},
+                {RPCResult::Type::ARR, "bip32_derivs", /*optional=*/true, "",
                 {
-                    {RPCResult::Type::NUM, "depth", "The depth of this element in the tree"},
-                    {RPCResult::Type::NUM, "leaf_ver", "The version of this leaf"},
-                    {RPCResult::Type::STR, "script", "The hex-encoded script itself"},
+                    {RPCResult::Type::OBJ, "", "",
+                    {
+                        {RPCResult::Type::STR, "pubkey", "The public key this path corresponds to"},
+                        {RPCResult::Type::STR, "master_fingerprint", "The fingerprint of the master key"},
+                        {RPCResult::Type::STR, "path", "The path"},
+                    }},
                 }},
-            }},
-            {RPCResult::Type::ARR, "taproot_bip32_derivs", /*optional=*/ true, "",
-            {
-                {RPCResult::Type::OBJ, "", "",
+                {RPCResult::Type::STR_HEX, "taproot_internal_key", /*optional=*/ true, "The hex-encoded Taproot x-only internal key"},
+                {RPCResult::Type::ARR, "taproot_tree", /*optional=*/ true, "The tuples that make up the Taproot tree, in depth first search order",
                 {
-                    {RPCResult::Type::STR, "pubkey", "The x-only public key this path corresponds to"},
-                    {RPCResult::Type::STR, "master_fingerprint", "The fingerprint of the master key"},
-                    {RPCResult::Type::STR, "path", "The path"},
-                    {RPCResult::Type::ARR, "leaf_hashes", "The hashes of the leaves this pubkey appears in",
+                    {RPCResult::Type::OBJ, "tuple", /*optional=*/ true, "A single leaf script in the taproot tree",
                     {
-                        {RPCResult::Type::STR_HEX, "hash", "The hash of a leaf this pubkey appears in"},
+                        {RPCResult::Type::NUM, "depth", "The depth of this element in the tree"},
+                        {RPCResult::Type::NUM, "leaf_ver", "The version of this leaf"},
+                        {RPCResult::Type::STR, "script", "The hex-encoded script itself"},
                     }},
                 }},
-            }},
-            {RPCResult::Type::ARR, "musig2_participant_pubkeys", /*optional=*/true, "",
-            {
-                {RPCResult::Type::OBJ, "", "",
+                {RPCResult::Type::ARR, "taproot_bip32_derivs", /*optional=*/ true, "",
                 {
-                    {RPCResult::Type::STR_HEX, "aggregate_pubkey", "The compressed aggregate public key for which the participants create."},
-                    {RPCResult::Type::ARR, "participant_pubkeys", "",
+                    {RPCResult::Type::OBJ, "", "",
                     {
-                        {RPCResult::Type::STR_HEX, "pubkey", "The compressed public keys that are aggregated for aggregate_pubkey."},
+                        {RPCResult::Type::STR, "pubkey", "The x-only public key this path corresponds to"},
+                        {RPCResult::Type::STR, "master_fingerprint", "The fingerprint of the master key"},
+                        {RPCResult::Type::STR, "path", "The path"},
+                        {RPCResult::Type::ARR, "leaf_hashes", "The hashes of the leaves this pubkey appears in",
+                        {
+                            {RPCResult::Type::STR_HEX, "hash", "The hash of a leaf this pubkey appears in"},
+                        }},
                     }},
                 }},
-            }},
-            {RPCResult::Type::OBJ_DYN, "unknown", /*optional=*/true, "The unknown output fields",
-            {
-                {RPCResult::Type::STR_HEX, "key", "(key-value pair) An unknown key-value pair"},
-            }},
-            {RPCResult::Type::ARR, "proprietary", /*optional=*/true, "The output proprietary map",
-            {
-                {RPCResult::Type::OBJ, "", "",
+                {RPCResult::Type::ARR, "musig2_participant_pubkeys", /*optional=*/true, "",
                 {
-                    {RPCResult::Type::STR_HEX, "identifier", "The hex string for the proprietary identifier"},
-                    {RPCResult::Type::NUM, "subtype", "The number for the subtype"},
-                    {RPCResult::Type::STR_HEX, "key", "The hex for the key"},
-                    {RPCResult::Type::STR_HEX, "value", "The hex for the value"},
+                    {RPCResult::Type::OBJ, "", "",
+                    {
+                        {RPCResult::Type::STR_HEX, "aggregate_pubkey", "The compressed aggregate public key for which the participants create."},
+                        {RPCResult::Type::ARR, "participant_pubkeys", "",
+                        {
+                            {RPCResult::Type::STR_HEX, "pubkey", "The compressed public keys that are aggregated for aggregate_pubkey."},
+                        }},
+                    }},
+                }},
+                {RPCResult::Type::OBJ_DYN, "unknown", /*optional=*/true, "The unknown output fields",
+                {
+                    {RPCResult::Type::STR_HEX, "key", "(key-value pair) An unknown key-value pair"},
+                }},
+                {RPCResult::Type::ARR, "proprietary", /*optional=*/true, "The output proprietary map",
+                {
+                    {RPCResult::Type::OBJ, "", "",
+                    {
+                        {RPCResult::Type::STR_HEX, "identifier", "The hex string for the proprietary identifier"},
+                        {RPCResult::Type::NUM, "subtype", "The number for the subtype"},
+                        {RPCResult::Type::STR_HEX, "key", "The hex for the key"},
+                        {RPCResult::Type::STR_HEX, "value", "The hex for the value"},
+                    }},
                 }},
             }},
-        }},
-    }
-};
+        }
+    };
+    return decodepsbt_outputs;
+}
 
-static RPCHelpMan decodepsbt()
+static RPCMethod decodepsbt()
 {
-    return RPCHelpMan{
+    return RPCMethod{
         "decodepsbt",
         "Return a JSON object representing the serialized, base64-encoded partially signed Bitcoin transaction.",
                 {
@@ -1023,9 +1029,8 @@ static RPCHelpMan decodepsbt()
                     RPCResult::Type::OBJ, "", "",
                     {
                         {RPCResult::Type::OBJ, "tx", "The decoded network-serialized unsigned transaction.",
-                        {
-                            {RPCResult::Type::ELISION, "", "The layout is the same as the output of decoderawtransaction."},
-                        }},
+                            TxDoc({.elision_description="The layout is the same as the output of decoderawtransaction."})
+                        },
                         {RPCResult::Type::ARR, "global_xpubs", "",
                         {
                             {RPCResult::Type::OBJ, "", "",
@@ -1050,15 +1055,15 @@ static RPCHelpMan decodepsbt()
                         {
                              {RPCResult::Type::STR_HEX, "key", "(key-value pair) An unknown key-value pair"},
                         }},
-                        decodepsbt_inputs,
-                        decodepsbt_outputs,
+                        DecodePSBTInputs(),
+                        DecodePSBTOutputs(),
                         {RPCResult::Type::STR_AMOUNT, "fee", /*optional=*/true, "The transaction fee paid if all UTXOs slots in the PSBT have been filled."},
                     }
                 },
                 RPCExamples{
                     HelpExampleCli("decodepsbt", "\"psbt\"")
                 },
-        [&](const RPCHelpMan& self, const JSONRPCRequest& request) -> UniValue
+        [](const RPCMethod& self, const JSONRPCRequest& request) -> UniValue
 {
     // Unserialize the transactions
     PartiallySignedTransaction psbtx;
@@ -1514,9 +1519,9 @@ static RPCHelpMan decodepsbt()
     };
 }
 
-static RPCHelpMan combinepsbt()
+static RPCMethod combinepsbt()
 {
-    return RPCHelpMan{
+    return RPCMethod{
         "combinepsbt",
         "Combine multiple partially signed Bitcoin transactions into one transaction.\n"
                 "Implements the Combiner role.\n",
@@ -1533,7 +1538,7 @@ static RPCHelpMan combinepsbt()
                 RPCExamples{
                     HelpExampleCli("combinepsbt", R"('["mybase64_1", "mybase64_2", "mybase64_3"]')")
                 },
-        [&](const RPCHelpMan& self, const JSONRPCRequest& request) -> UniValue
+        [](const RPCMethod& self, const JSONRPCRequest& request) -> UniValue
 {
     // Unserialize the transactions
     std::vector<PartiallySignedTransaction> psbtxs;
@@ -1562,9 +1567,9 @@ static RPCHelpMan combinepsbt()
     };
 }
 
-static RPCHelpMan finalizepsbt()
+static RPCMethod finalizepsbt()
 {
-    return RPCHelpMan{"finalizepsbt",
+    return RPCMethod{"finalizepsbt",
                 "Finalize the inputs of a PSBT. If the transaction is fully signed, it will produce a\n"
                 "network serialized transaction which can be broadcast with sendrawtransaction. Otherwise a PSBT will be\n"
                 "created which has the final_scriptSig and final_scriptwitness fields filled for inputs that are complete.\n"
@@ -1585,7 +1590,7 @@ static RPCHelpMan finalizepsbt()
                 RPCExamples{
                     HelpExampleCli("finalizepsbt", "\"psbt\"")
                 },
-        [&](const RPCHelpMan& self, const JSONRPCRequest& request) -> UniValue
+        [](const RPCMethod& self, const JSONRPCRequest& request) -> UniValue
 {
     // Unserialize the transactions
     PartiallySignedTransaction psbtx;
@@ -1619,9 +1624,9 @@ static RPCHelpMan finalizepsbt()
     };
 }
 
-static RPCHelpMan createpsbt()
+static RPCMethod createpsbt()
 {
-    return RPCHelpMan{
+    return RPCMethod{
         "createpsbt",
         "Creates a transaction in the Partially Signed Transaction format.\n"
                 "Implements the Creator role.\n"
@@ -1634,7 +1639,7 @@ static RPCHelpMan createpsbt()
                 RPCExamples{
                     HelpExampleCli("createpsbt", "\"[{\\\"txid\\\":\\\"myid\\\",\\\"vout\\\":0}]\" \"[{\\\"address\\\":0.01}]\"")
                 },
-        [&](const RPCHelpMan& self, const JSONRPCRequest& request) -> UniValue
+        [](const RPCMethod& self, const JSONRPCRequest& request) -> UniValue
 {
 
     std::optional<bool> rbf;
@@ -1662,9 +1667,9 @@ static RPCHelpMan createpsbt()
     };
 }
 
-static RPCHelpMan converttopsbt()
+static RPCMethod converttopsbt()
 {
-    return RPCHelpMan{
+    return RPCMethod{
         "converttopsbt",
         "Converts a network serialized transaction to a PSBT. This should be used only with createrawtransaction and fundrawtransaction\n"
                 "createpsbt and walletcreatefundedpsbt should be used for new applications.\n",
@@ -1689,7 +1694,7 @@ static RPCHelpMan converttopsbt()
                             "\nConvert the transaction to a PSBT\n"
                             + HelpExampleCli("converttopsbt", "\"rawtransaction\"")
                 },
-        [&](const RPCHelpMan& self, const JSONRPCRequest& request) -> UniValue
+        [](const RPCMethod& self, const JSONRPCRequest& request) -> UniValue
 {
     // parse hex string from parameter
     CMutableTransaction tx;
@@ -1730,9 +1735,9 @@ static RPCHelpMan converttopsbt()
     };
 }
 
-static RPCHelpMan utxoupdatepsbt()
+static RPCMethod utxoupdatepsbt()
 {
-    return RPCHelpMan{
+    return RPCMethod{
         "utxoupdatepsbt",
         "Updates all segwit inputs and outputs in a PSBT with data from output descriptors, the UTXO set, txindex, or the mempool.\n",
             {
@@ -1751,7 +1756,7 @@ static RPCHelpMan utxoupdatepsbt()
             RPCExamples {
                 HelpExampleCli("utxoupdatepsbt", "\"psbt\"")
             },
-        [&](const RPCHelpMan& self, const JSONRPCRequest& request) -> UniValue
+        [](const RPCMethod& self, const JSONRPCRequest& request) -> UniValue
 {
     // Parse descriptors, if any.
     FlatSigningProvider provider;
@@ -1777,9 +1782,9 @@ static RPCHelpMan utxoupdatepsbt()
     };
 }
 
-static RPCHelpMan joinpsbts()
+static RPCMethod joinpsbts()
 {
-    return RPCHelpMan{
+    return RPCMethod{
         "joinpsbts",
         "Joins multiple distinct PSBTs with different inputs and outputs into one PSBT with inputs and outputs from all of the PSBTs\n"
             "No input in any of the PSBTs can be in more than one of the PSBTs.\n",
@@ -1795,7 +1800,7 @@ static RPCHelpMan joinpsbts()
             RPCExamples {
                 HelpExampleCli("joinpsbts", "\"psbt\"")
             },
-        [&](const RPCHelpMan& self, const JSONRPCRequest& request) -> UniValue
+        [](const RPCMethod& self, const JSONRPCRequest& request) -> UniValue
 {
     // Unserialize the transactions
     std::vector<PartiallySignedTransaction> psbtxs;
@@ -1879,9 +1884,9 @@ static RPCHelpMan joinpsbts()
     };
 }
 
-static RPCHelpMan analyzepsbt()
+static RPCMethod analyzepsbt()
 {
-    return RPCHelpMan{
+    return RPCMethod{
         "analyzepsbt",
         "Analyzes and provides information about the current status of a PSBT and its inputs\n",
             {
@@ -1922,7 +1927,7 @@ static RPCHelpMan analyzepsbt()
             RPCExamples {
                 HelpExampleCli("analyzepsbt", "\"psbt\"")
             },
-        [&](const RPCHelpMan& self, const JSONRPCRequest& request) -> UniValue
+        [](const RPCMethod& self, const JSONRPCRequest& request) -> UniValue
 {
     // Unserialize the transaction
     PartiallySignedTransaction psbtx;
@@ -1989,9 +1994,9 @@ static RPCHelpMan analyzepsbt()
     };
 }
 
-RPCHelpMan descriptorprocesspsbt()
+RPCMethod descriptorprocesspsbt()
 {
-    return RPCHelpMan{
+    return RPCMethod{
         "descriptorprocesspsbt",
         "Update all segwit inputs in a PSBT with information from output descriptors, the UTXO set or the mempool. \n"
                 "Then, sign the inputs we are able to with information from the output descriptors. ",
@@ -2027,7 +2032,7 @@ RPCHelpMan descriptorprocesspsbt()
                     HelpExampleCli("descriptorprocesspsbt", "\"psbt\" \"[\\\"descriptor1\\\", \\\"descriptor2\\\"]\"") +
                     HelpExampleCli("descriptorprocesspsbt", "\"psbt\" \"[{\\\"desc\\\":\\\"mydescriptor\\\", \\\"range\\\":21}]\"")
                 },
-        [&](const RPCHelpMan& self, const JSONRPCRequest& request) -> UniValue
+        [](const RPCMethod& self, const JSONRPCRequest& request) -> UniValue
 {
     // Add descriptor information to a signing provider
     FlatSigningProvider provider;
diff --git a/src/rpc/rawtransaction_util.cpp b/src/rpc/rawtransaction_util.cpp
index 467289fc14c9..d3a1b875807f 100644
--- a/src/rpc/rawtransaction_util.cpp
+++ b/src/rpc/rawtransaction_util.cpp
@@ -344,16 +344,18 @@ void SignTransactionResultToJSON(CMutableTransaction& mtx, bool complete, const
     }
 }
 
-std::vector<RPCResult> DecodeTxDoc(const std::string& txid_field_doc, bool wallet)
+std::vector<RPCResult> TxDoc(const TxDocOptions& opts)
 {
+    std::optional<std::string> maybe_skip{};
+    if (opts.elision_description) maybe_skip.emplace();
     return {
-        {RPCResult::Type::STR_HEX, "txid", txid_field_doc},
-        {RPCResult::Type::STR_HEX, "hash", "The transaction hash (differs from txid for witness transactions)"},
-        {RPCResult::Type::NUM, "size", "The serialized transaction size"},
-        {RPCResult::Type::NUM, "vsize", "The virtual transaction size (differs from size for witness transactions)"},
-        {RPCResult::Type::NUM, "weight", "The transaction's weight (between vsize*4-3 and vsize*4)"},
-        {RPCResult::Type::NUM, "version", "The version"},
-        {RPCResult::Type::NUM_TIME, "locktime", "The lock time"},
+        {RPCResult::Type::STR_HEX, "txid", opts.txid_field_doc, {}, {.print_elision=opts.elision_description}},
+        {RPCResult::Type::STR_HEX, "hash", "The transaction hash (differs from txid for witness transactions)", {}, {.print_elision=maybe_skip}},
+        {RPCResult::Type::NUM, "size", "The serialized transaction size", {}, {.print_elision=maybe_skip}},
+        {RPCResult::Type::NUM, "vsize", "The virtual transaction size (differs from size for witness transactions)", {}, {.print_elision=maybe_skip}},
+        {RPCResult::Type::NUM, "weight", "The transaction's weight (between vsize*4-3 and vsize*4)", {}, {.print_elision=maybe_skip}},
+        {RPCResult::Type::NUM, "version", "The version", {}, {.print_elision=maybe_skip}},
+        {RPCResult::Type::NUM_TIME, "locktime", "The lock time", {}, {.print_elision=maybe_skip}},
         {RPCResult::Type::ARR, "vin", "",
         {
             {RPCResult::Type::OBJ, "", "",
@@ -372,7 +374,7 @@ std::vector<RPCResult> DecodeTxDoc(const std::string& txid_field_doc, bool walle
                 }},
                 {RPCResult::Type::NUM, "sequence", "The script sequence number"},
             }},
-        }},
+        }, {.print_elision=maybe_skip}},
         {RPCResult::Type::ARR, "vout", "",
         {
             {RPCResult::Type::OBJ, "", "", Cat(
@@ -381,11 +383,11 @@ std::vector<RPCResult> DecodeTxDoc(const std::string& txid_field_doc, bool walle
                     {RPCResult::Type::NUM, "n", "index"},
                     {RPCResult::Type::OBJ, "scriptPubKey", "", ScriptPubKeyDoc()},
                 },
-                    wallet ?
+                    opts.wallet ?
                     std::vector<RPCResult>{{RPCResult::Type::BOOL, "ischange", /*optional=*/true, "Output script is change (only present if true)"}} :
                     std::vector<RPCResult>{}
                 )
             },
-        }},
+        }, {.print_elision=maybe_skip}},
     };
 }
diff --git a/src/rpc/rawtransaction_util.h b/src/rpc/rawtransaction_util.h
index 7bd051220a70..5a1bc6047c79 100644
--- a/src/rpc/rawtransaction_util.h
+++ b/src/rpc/rawtransaction_util.h
@@ -56,7 +56,15 @@ void AddOutputs(CMutableTransaction& rawTx, const UniValue& outputs_in);
 /** Create a transaction from univalue parameters */
 CMutableTransaction ConstructTransaction(const UniValue& inputs_in, const UniValue& outputs_in, const UniValue& locktime, std::optional<bool> rbf, uint32_t version);
 
+struct TxDocOptions {
+    /// The description of the txid field
+    std::string txid_field_doc{"The transaction id"};
+    /// Include wallet-related fields (e.g. ischange on outputs)
+    bool wallet{false};
+    /// Treat this as an elided Result in the help
+    std::optional<std::string> elision_description{};
+};
 /** Explain the UniValue "decoded" transaction object, may include extra fields if processed by wallet **/
-std::vector<RPCResult> DecodeTxDoc(const std::string& txid_field_doc, bool wallet);
+std::vector<RPCResult> TxDoc(const TxDocOptions& opts = {});
 
 #endif // BITCOIN_RPC_RAWTRANSACTION_UTIL_H
diff --git a/src/rpc/request.cpp b/src/rpc/request.cpp
index 1798cdef235a..34a9ff755358 100644
--- a/src/rpc/request.cpp
+++ b/src/rpc/request.cpp
@@ -97,9 +97,9 @@ static fs::path GetAuthCookieFile(bool temp=false)
 
 static bool g_generated_cookie = false;
 
-GenerateAuthCookieResult GenerateAuthCookie(const std::optional<fs::perms>& cookie_perms,
-                                            std::string& user,
-                                            std::string& pass)
+AuthCookieResult GenerateAuthCookie(const std::optional<fs::perms>& cookie_perms,
+                                    std::string& user,
+                                    std::string& pass)
 {
     const size_t COOKIE_SIZE = 32;
     unsigned char rand_pwd[COOKIE_SIZE];
@@ -112,12 +112,12 @@ GenerateAuthCookieResult GenerateAuthCookie(const std::optional<fs::perms>& cook
     std::ofstream file;
     fs::path filepath_tmp = GetAuthCookieFile(true);
     if (filepath_tmp.empty()) {
-        return GenerateAuthCookieResult::DISABLED; // -norpccookiefile
+        return AuthCookieResult::Disabled; // -norpccookiefile
     }
     file.open(filepath_tmp.std_path());
     if (!file.is_open()) {
         LogWarning("Unable to open cookie authentication file %s for writing", fs::PathToString(filepath_tmp));
-        return GenerateAuthCookieResult::ERR;
+        return AuthCookieResult::Error;
     }
     file << COOKIEAUTH_USER << ":" << rand_pwd_hex;
     file.close();
@@ -125,14 +125,14 @@ GenerateAuthCookieResult GenerateAuthCookie(const std::optional<fs::perms>& cook
     fs::path filepath = GetAuthCookieFile(false);
     if (!RenameOver(filepath_tmp, filepath)) {
         LogWarning("Unable to rename cookie authentication file %s to %s", fs::PathToString(filepath_tmp), fs::PathToString(filepath));
-        return GenerateAuthCookieResult::ERR;
+        return AuthCookieResult::Error;
     }
     if (cookie_perms) {
         std::error_code code;
         fs::permissions(filepath, cookie_perms.value(), fs::perm_options::replace, code);
         if (code) {
             LogWarning("Unable to set permissions on cookie authentication file %s", fs::PathToString(filepath));
-            return GenerateAuthCookieResult::ERR;
+            return AuthCookieResult::Error;
         }
     }
 
@@ -142,26 +142,23 @@ GenerateAuthCookieResult GenerateAuthCookie(const std::optional<fs::perms>& cook
 
     user = COOKIEAUTH_USER;
     pass = rand_pwd_hex;
-    return GenerateAuthCookieResult::OK;
+    return AuthCookieResult::Ok;
 }
 
-bool GetAuthCookie(std::string *cookie_out)
+AuthCookieResult GetAuthCookie(std::string& cookie_out)
 {
     std::ifstream file;
-    std::string cookie;
     fs::path filepath = GetAuthCookieFile();
     if (filepath.empty()) {
-        return true; // -norpccookiefile
+        return AuthCookieResult::Disabled; // -norpccookiefile
     }
     file.open(filepath.std_path());
-    if (!file.is_open())
-        return false;
-    std::getline(file, cookie);
+    if (!file.is_open()) {
+        return AuthCookieResult::Error;
+    }
+    std::getline(file, cookie_out);
     file.close();
-
-    if (cookie_out)
-        *cookie_out = cookie;
-    return true;
+    return AuthCookieResult::Ok;
 }
 
 void DeleteAuthCookie()
diff --git a/src/rpc/request.h b/src/rpc/request.h
index 4588db5122d4..00216562fcb3 100644
--- a/src/rpc/request.h
+++ b/src/rpc/request.h
@@ -23,10 +23,10 @@ UniValue JSONRPCRequestObj(const std::string& strMethod, const UniValue& params,
 UniValue JSONRPCReplyObj(UniValue result, UniValue error, std::optional<UniValue> id, JSONRPCVersion jsonrpc_version);
 UniValue JSONRPCError(int code, const std::string& message);
 
-enum class GenerateAuthCookieResult : uint8_t {
-    DISABLED, // -norpccookiefile
-    ERR,
-    OK,
+enum class AuthCookieResult : uint8_t {
+    Disabled, // -norpccookiefile
+    Error,
+    Ok,
 };
 
 /**
@@ -34,16 +34,16 @@ enum class GenerateAuthCookieResult : uint8_t {
  * @param[in] cookie_perms Filesystem permissions to use for the cookie file.
  * @param[out] user Generated username, only set if `OK` is returned.
  * @param[out] pass Generated password, only set if `OK` is returned.
- * @retval GenerateAuthCookieResult::DISABLED Authentication via cookie is disabled.
- * @retval GenerateAuthCookieResult::ERROR Error occurred, auth data could not be saved to disk.
- * @retval GenerateAuthCookieResult::OK Auth data was generated, saved to disk and in `user` and `pass`.
+ * @retval AuthCookieResult::Disabled Authentication via cookie is disabled.
+ * @retval AuthCookieResult::Error Error occurred, auth data could not be saved to disk.
+ * @retval AuthCookieResult::Ok Auth data was generated, saved to disk and in `user` and `pass`.
  */
-GenerateAuthCookieResult GenerateAuthCookie(const std::optional<fs::perms>& cookie_perms,
+AuthCookieResult GenerateAuthCookie(const std::optional<fs::perms>& cookie_perms,
                                             std::string& user,
                                             std::string& pass);
 
 /** Read the RPC authentication cookie from disk */
-bool GetAuthCookie(std::string *cookie_out);
+AuthCookieResult GetAuthCookie(std::string& cookie_out);
 /** Delete RPC authentication cookie from disk */
 void DeleteAuthCookie();
 /** Parse JSON-RPC batch reply into a vector */
diff --git a/src/rpc/server.cpp b/src/rpc/server.cpp
index cddd62f4aa5c..0894ba1cdfee 100644
--- a/src/rpc/server.cpp
+++ b/src/rpc/server.cpp
@@ -116,9 +116,9 @@ std::string CRPCTable::help(std::string_view strCommand, const JSONRPCRequest& h
     return strRet;
 }
 
-static RPCHelpMan help()
+static RPCMethod help()
 {
-    return RPCHelpMan{
+    return RPCMethod{
         "help",
         "List all commands, or get help for a specified command.\n",
                 {
@@ -129,7 +129,7 @@ static RPCHelpMan help()
                     RPCResult{RPCResult::Type::ANY, "", ""},
                 },
                 RPCExamples{""},
-        [&](const RPCHelpMan& self, const JSONRPCRequest& jsonRequest) -> UniValue
+        [](const RPCMethod& self, const JSONRPCRequest& jsonRequest) -> UniValue
 {
     auto command{self.MaybeArg<std::string_view>("command")};
     if (command == "dump_all_command_conversions") {
@@ -142,10 +142,10 @@ static RPCHelpMan help()
     };
 }
 
-static RPCHelpMan stop()
+static RPCMethod stop()
 {
     static const std::string RESULT{CLIENT_NAME " stopping"};
-    return RPCHelpMan{
+    return RPCMethod{
         "stop",
     // Also accept the hidden 'wait' integer argument (milliseconds)
     // For instance, 'stop 1000' makes the call wait 1 second before returning
@@ -156,7 +156,7 @@ static RPCHelpMan stop()
                 },
                 RPCResult{RPCResult::Type::STR, "", "A string with the content '" + RESULT + "'"},
                 RPCExamples{""},
-        [&](const RPCHelpMan& self, const JSONRPCRequest& jsonRequest) -> UniValue
+        [](const RPCMethod& self, const JSONRPCRequest& jsonRequest) -> UniValue
 {
     // Event loop will exit after current HTTP requests have been handled, so
     // this reply will get back to the client.
@@ -169,9 +169,9 @@ static RPCHelpMan stop()
     };
 }
 
-static RPCHelpMan uptime()
+static RPCMethod uptime()
 {
-    return RPCHelpMan{
+    return RPCMethod{
         "uptime",
         "Returns the total uptime of the server.\n",
                             {},
@@ -182,16 +182,16 @@ static RPCHelpMan uptime()
                     HelpExampleCli("uptime", "")
                 + HelpExampleRpc("uptime", "")
                 },
-        [&](const RPCHelpMan& self, const JSONRPCRequest& request) -> UniValue
+        [](const RPCMethod& self, const JSONRPCRequest& request) -> UniValue
 {
     return TicksSeconds(GetUptime());
 }
     };
 }
 
-static RPCHelpMan getrpcinfo()
+static RPCMethod getrpcinfo()
 {
-    return RPCHelpMan{
+    return RPCMethod{
         "getrpcinfo",
         "Returns details of the RPC server.\n",
                 {},
@@ -212,7 +212,7 @@ static RPCHelpMan getrpcinfo()
                 RPCExamples{
                     HelpExampleCli("getrpcinfo", "")
                 + HelpExampleRpc("getrpcinfo", "")},
-        [&](const RPCHelpMan& self, const JSONRPCRequest& request) -> UniValue
+        [](const RPCMethod& self, const JSONRPCRequest& request) -> UniValue
 {
     LOCK(g_rpc_server_info.mutex);
     UniValue active_commands(UniValue::VARR);
diff --git a/src/rpc/server.h b/src/rpc/server.h
index cb68c1def79f..5355c3205763 100644
--- a/src/rpc/server.h
+++ b/src/rpc/server.h
@@ -36,7 +36,7 @@ void SetRPCWarmupFinished();
 /* returns the current warmup state.  */
 bool RPCIsInWarmup(std::string *outStatus);
 
-typedef RPCHelpMan (*RpcMethodFnType)();
+typedef RPCMethod (*RpcMethodFnType)();
 
 class CRPCCommand
 {
diff --git a/src/rpc/signmessage.cpp b/src/rpc/signmessage.cpp
index dcdc0260806b..df56e09fe0c7 100644
--- a/src/rpc/signmessage.cpp
+++ b/src/rpc/signmessage.cpp
@@ -14,9 +14,9 @@
 
 #include <string>
 
-static RPCHelpMan verifymessage()
+static RPCMethod verifymessage()
 {
-    return RPCHelpMan{"verifymessage",
+    return RPCMethod{"verifymessage",
         "Verify a signed message.",
         {
             {"address", RPCArg::Type::STR, RPCArg::Optional::NO, "The bitcoin address to use for the signature."},
@@ -36,7 +36,7 @@ static RPCHelpMan verifymessage()
             "\nAs a JSON-RPC call\n"
             + HelpExampleRpc("verifymessage", "\"1D1ZrZNe3JUo7ZycKEYQQiQAWd9y54F4XX\", \"signature\", \"my message\"")
         },
-        [&](const RPCHelpMan& self, const JSONRPCRequest& request) -> UniValue
+        [](const RPCMethod& self, const JSONRPCRequest& request) -> UniValue
         {
             switch (MessageVerify(std::string{self.Arg<std::string_view>("address")},
                                   std::string{self.Arg<std::string_view>("signature")},
@@ -59,9 +59,9 @@ static RPCHelpMan verifymessage()
     };
 }
 
-static RPCHelpMan signmessagewithprivkey()
+static RPCMethod signmessagewithprivkey()
 {
-    return RPCHelpMan{
+    return RPCMethod{
         "signmessagewithprivkey",
         "Sign a message with the private key of an address\n",
         {
@@ -79,7 +79,7 @@ static RPCHelpMan signmessagewithprivkey()
             "\nAs a JSON-RPC call\n"
             + HelpExampleRpc("signmessagewithprivkey", "\"privkey\", \"my message\"")
         },
-        [&](const RPCHelpMan& self, const JSONRPCRequest& request) -> UniValue
+        [](const RPCMethod& self, const JSONRPCRequest& request) -> UniValue
         {
             std::string strPrivkey = request.params[0].get_str();
             std::string strMessage = request.params[1].get_str();
diff --git a/src/rpc/txoutproof.cpp b/src/rpc/txoutproof.cpp
index 89611a0c41fd..f68f53f665d8 100644
--- a/src/rpc/txoutproof.cpp
+++ b/src/rpc/txoutproof.cpp
@@ -20,9 +20,9 @@
 
 using node::GetTransaction;
 
-static RPCHelpMan gettxoutproof()
+static RPCMethod gettxoutproof()
 {
-    return RPCHelpMan{
+    return RPCMethod{
         "gettxoutproof",
         "Returns a hex-encoded proof that \"txid\" was included in a block.\n"
         "\nNOTE: By default this function only works sometimes. This is when there is an\n"
@@ -41,7 +41,7 @@ static RPCHelpMan gettxoutproof()
             RPCResult::Type::STR, "data", "A string that is a serialized, hex-encoded data for the proof."
         },
         RPCExamples{""},
-        [&](const RPCHelpMan& self, const JSONRPCRequest& request) -> UniValue
+        [](const RPCMethod& self, const JSONRPCRequest& request) -> UniValue
         {
             std::set<Txid> setTxids;
             UniValue txids = request.params[0].get_array();
@@ -126,9 +126,9 @@ static RPCHelpMan gettxoutproof()
     };
 }
 
-static RPCHelpMan verifytxoutproof()
+static RPCMethod verifytxoutproof()
 {
-    return RPCHelpMan{
+    return RPCMethod{
         "verifytxoutproof",
         "Verifies that a proof points to a transaction in a block, returning the transaction it commits to\n"
         "and throwing an RPC error if the block is not in our best chain\n",
@@ -142,7 +142,7 @@ static RPCHelpMan verifytxoutproof()
             }
         },
         RPCExamples{""},
-        [&](const RPCHelpMan& self, const JSONRPCRequest& request) -> UniValue
+        [](const RPCMethod& self, const JSONRPCRequest& request) -> UniValue
         {
             CMerkleBlock merkleBlock;
             SpanReader{ParseHexV(request.params[0], "proof")} >> merkleBlock;
diff --git a/src/rpc/util.cpp b/src/rpc/util.cpp
index 49569c7be540..80b08d0140c4 100644
--- a/src/rpc/util.cpp
+++ b/src/rpc/util.cpp
@@ -542,10 +542,10 @@ struct Sections {
     }
 };
 
-RPCHelpMan::RPCHelpMan(std::string name, std::string description, std::vector<RPCArg> args, RPCResults results, RPCExamples examples)
-    : RPCHelpMan{std::move(name), std::move(description), std::move(args), std::move(results), std::move(examples), nullptr} {}
+RPCMethod::RPCMethod(std::string name, std::string description, std::vector<RPCArg> args, RPCResults results, RPCExamples examples)
+    : RPCMethod{std::move(name), std::move(description), std::move(args), std::move(results), std::move(examples), nullptr} {}
 
-RPCHelpMan::RPCHelpMan(std::string name, std::string description, std::vector<RPCArg> args, RPCResults results, RPCExamples examples, RPCMethodImpl fun)
+RPCMethod::RPCMethod(std::string name, std::string description, std::vector<RPCArg> args, RPCResults results, RPCExamples examples, RPCMethodImpl fun)
     : m_name{std::move(name)},
       m_fun{std::move(fun)},
       m_description{std::move(description)},
@@ -583,29 +583,29 @@ RPCHelpMan::RPCHelpMan(std::string name, std::string description, std::vector<RP
         // Default value type should match argument type only when defined
         if (arg.m_fallback.index() == 2) {
             const RPCArg::Type type = arg.m_type;
-            switch (std::get<RPCArg::Default>(arg.m_fallback).getType()) {
-            case UniValue::VOBJ:
-                CHECK_NONFATAL(type == RPCArg::Type::OBJ);
-                break;
-            case UniValue::VARR:
-                CHECK_NONFATAL(type == RPCArg::Type::ARR);
-                break;
-            case UniValue::VSTR:
-                CHECK_NONFATAL(type == RPCArg::Type::STR || type == RPCArg::Type::STR_HEX || type == RPCArg::Type::AMOUNT);
-                break;
-            case UniValue::VNUM:
-                CHECK_NONFATAL(type == RPCArg::Type::NUM || type == RPCArg::Type::AMOUNT || type == RPCArg::Type::RANGE);
-                break;
-            case UniValue::VBOOL:
-                CHECK_NONFATAL(type == RPCArg::Type::BOOL);
-                break;
-            case UniValue::VNULL:
-                // Null values are accepted in all arguments
-                break;
-            default:
+            [&]() {
+                switch (std::get<RPCArg::Default>(arg.m_fallback).getType()) {
+                case UniValue::VOBJ:
+                    CHECK_NONFATAL(type == RPCArg::Type::OBJ);
+                    return;
+                case UniValue::VARR:
+                    CHECK_NONFATAL(type == RPCArg::Type::ARR);
+                    return;
+                case UniValue::VSTR:
+                    CHECK_NONFATAL(type == RPCArg::Type::STR || type == RPCArg::Type::STR_HEX || type == RPCArg::Type::AMOUNT);
+                    return;
+                case UniValue::VNUM:
+                    CHECK_NONFATAL(type == RPCArg::Type::NUM || type == RPCArg::Type::AMOUNT || type == RPCArg::Type::RANGE);
+                    return;
+                case UniValue::VBOOL:
+                    CHECK_NONFATAL(type == RPCArg::Type::BOOL);
+                    return;
+                case UniValue::VNULL:
+                    // Null values are accepted in all arguments
+                    return;
+                } // no default case, so the compiler can warn about missing cases
                 NONFATAL_UNREACHABLE();
-                break;
-            }
+            }();
         }
     }
 }
@@ -632,7 +632,7 @@ std::string RPCExamples::ToDescriptionString() const
     return m_examples.empty() ? m_examples : "\nExamples:\n" + m_examples;
 }
 
-UniValue RPCHelpMan::HandleRequest(const JSONRPCRequest& request) const
+UniValue RPCMethod::HandleRequest(const JSONRPCRequest& request) const
 {
     if (request.mode == JSONRPCRequest::GET_ARGS) {
         return GetArgMap();
@@ -706,7 +706,7 @@ static void CheckRequiredOrDefault(const RPCArg& param)
 
 #define TMPL_INST(check_param, ret_type, return_code)       \
     template <>                                             \
-    ret_type RPCHelpMan::ArgValue<ret_type>(size_t i) const \
+    ret_type RPCMethod::ArgValue<ret_type>(size_t i) const \
     {                                                       \
         const UniValue* maybe_arg{                          \
             DetailMaybeArg(check_param, m_args, m_req, i),  \
@@ -730,7 +730,7 @@ TMPL_INST(CheckRequiredOrDefault, uint64_t, CHECK_NONFATAL(maybe_arg)->getInt<ui
 TMPL_INST(CheckRequiredOrDefault, uint32_t, CHECK_NONFATAL(maybe_arg)->getInt<uint32_t>(););
 TMPL_INST(CheckRequiredOrDefault, std::string_view, CHECK_NONFATAL(maybe_arg)->get_str(););
 
-bool RPCHelpMan::IsValidNumArgs(size_t num_args) const
+bool RPCMethod::IsValidNumArgs(size_t num_args) const
 {
     size_t num_required_args = 0;
     for (size_t n = m_args.size(); n > 0; --n) {
@@ -742,7 +742,7 @@ bool RPCHelpMan::IsValidNumArgs(size_t num_args) const
     return num_required_args <= num_args && num_args <= m_args.size();
 }
 
-std::vector<std::pair<std::string, bool>> RPCHelpMan::GetArgNames() const
+std::vector<std::pair<std::string, bool>> RPCMethod::GetArgNames() const
 {
     std::vector<std::pair<std::string, bool>> ret;
     ret.reserve(m_args.size());
@@ -757,7 +757,7 @@ std::vector<std::pair<std::string, bool>> RPCHelpMan::GetArgNames() const
     return ret;
 }
 
-size_t RPCHelpMan::GetParamIndex(std::string_view key) const
+size_t RPCMethod::GetParamIndex(std::string_view key) const
 {
     auto it{std::find_if(
         m_args.begin(), m_args.end(), [&key](const auto& arg) { return arg.GetName() == key;}
@@ -767,7 +767,7 @@ size_t RPCHelpMan::GetParamIndex(std::string_view key) const
     return std::distance(m_args.begin(), it);
 }
 
-std::string RPCHelpMan::ToString() const
+std::string RPCMethod::ToString() const
 {
     std::string ret;
 
@@ -830,7 +830,7 @@ std::string RPCHelpMan::ToString() const
     return ret;
 }
 
-UniValue RPCHelpMan::GetArgMap() const
+UniValue RPCMethod::GetArgMap() const
 {
     UniValue arr{UniValue::VARR};
 
@@ -1015,9 +1015,22 @@ void RPCResult::ToSections(Sections& sections, const OuterType outer_type, const
                (this->m_description.empty() ? "" : " " + this->m_description);
     };
 
+    // Ensure at least one elision description exists, if there is any elision
+    const auto elision_has_description{[](const std::vector<RPCResult>& inner) {
+        return std::ranges::none_of(inner, [](const auto& res) { return res.m_opts.print_elision.has_value(); }) ||
+               std::ranges::any_of(inner, [](const auto& res) { return res.m_opts.print_elision.has_value() && !res.m_opts.print_elision->empty(); });
+    }};
+
+    if (m_opts.print_elision) {
+        if (!m_opts.print_elision->empty()) {
+            sections.PushSection({indent + "..." + maybe_separator, *m_opts.print_elision});
+        }
+        return;
+    }
+
     switch (m_type) {
     case Type::ELISION: {
-        // If the inner result is empty, use three dots for elision
+        // Deprecated alias of m_opts.print_elision
         sections.PushSection({indent + "..." + maybe_separator, m_description});
         return;
     }
@@ -1059,6 +1072,7 @@ void RPCResult::ToSections(Sections& sections, const OuterType outer_type, const
             i.ToSections(sections, OuterType::ARR, current_indent + 2);
         }
         CHECK_NONFATAL(!m_inner.empty());
+        CHECK_NONFATAL(elision_has_description(m_inner));
         if (m_type == Type::ARR && m_inner.back().m_type != Type::ELISION) {
             sections.PushSection({indent_next + "...", ""});
         } else {
@@ -1074,6 +1088,7 @@ void RPCResult::ToSections(Sections& sections, const OuterType outer_type, const
             sections.PushSection({indent + maybe_key + "{}", Description("empty JSON object")});
             return;
         }
+        CHECK_NONFATAL(elision_has_description(m_inner));
         sections.PushSection({indent + maybe_key + "{", Description("json object")});
         for (const auto& i : m_inner) {
             i.ToSections(sections, OuterType::OBJ, current_indent + 2);
@@ -1130,7 +1145,7 @@ static std::optional<UniValue::VType> ExpectedType(RPCResult::Type type)
 // NOLINTNEXTLINE(misc-no-recursion)
 UniValue RPCResult::MatchesType(const UniValue& result) const
 {
-    if (m_skip_type_check) {
+    if (m_opts.skip_type_check) {
         return true;
     }
 
diff --git a/src/rpc/util.h b/src/rpc/util.h
index 37530876d734..77199dfe3fd6 100644
--- a/src/rpc/util.h
+++ b/src/rpc/util.h
@@ -292,6 +292,18 @@ struct RPCArg {
     std::string ToDescriptionString(bool is_named_arg) const;
 };
 
+struct RPCResultOptions {
+    bool skip_type_check{false};
+    /// Whether to treat this as elided in the human-readable description, and
+    /// possibly supply a description for the elision. Normally, there will be
+    /// one string on any of the elided results, for example `Same output as
+    /// verbosity = 1`, and all other elided strings will be empty.
+    ///
+    /// - If nullopt: normal display.
+    /// - If empty string: suppress from help.
+    /// - If non-empty: show "..." with this description.
+    std::optional<std::string> print_elision{std::nullopt};
+};
 // NOLINTNEXTLINE(misc-no-recursion)
 struct RPCResult {
     enum class Type {
@@ -314,7 +326,7 @@ struct RPCResult {
     const std::string m_key_name;         //!< Only used for dicts
     const std::vector<RPCResult> m_inner; //!< Only used for arrays or dicts
     const bool m_optional;
-    const bool m_skip_type_check;
+    const RPCResultOptions m_opts;
     const std::string m_description;
     const std::string m_cond;
 
@@ -324,12 +336,13 @@ struct RPCResult {
         std::string m_key_name,
         bool optional,
         std::string description,
-        std::vector<RPCResult> inner = {})
+        std::vector<RPCResult> inner = {},
+        RPCResultOptions opts = {})
         : m_type{std::move(type)},
           m_key_name{std::move(m_key_name)},
           m_inner{std::move(inner)},
           m_optional{optional},
-          m_skip_type_check{false},
+          m_opts{std::move(opts)},
           m_description{std::move(description)},
           m_cond{std::move(cond)}
     {
@@ -342,8 +355,9 @@ struct RPCResult {
         Type type,
         std::string m_key_name,
         std::string description,
-        std::vector<RPCResult> inner = {})
-        : RPCResult{std::move(cond), type, std::move(m_key_name), /*optional=*/false, std::move(description), std::move(inner)} {}
+        std::vector<RPCResult> inner = {},
+        RPCResultOptions opts = {})
+        : RPCResult{std::move(cond), type, std::move(m_key_name), /*optional=*/false, std::move(description), std::move(inner), std::move(opts)} {}
 
     RPCResult(
         Type type,
@@ -351,12 +365,12 @@ struct RPCResult {
         bool optional,
         std::string description,
         std::vector<RPCResult> inner = {},
-        bool skip_type_check = false)
+        RPCResultOptions opts = {})
         : m_type{std::move(type)},
           m_key_name{std::move(m_key_name)},
           m_inner{std::move(inner)},
           m_optional{optional},
-          m_skip_type_check{skip_type_check},
+          m_opts{std::move(opts)},
           m_description{std::move(description)},
           m_cond{}
     {
@@ -368,8 +382,8 @@ struct RPCResult {
         std::string m_key_name,
         std::string description,
         std::vector<RPCResult> inner = {},
-        bool skip_type_check = false)
-        : RPCResult{type, std::move(m_key_name), /*optional=*/false, std::move(description), std::move(inner), skip_type_check} {}
+        RPCResultOptions opts = {})
+        : RPCResult{type, std::move(m_key_name), /*optional=*/false, std::move(description), std::move(inner), std::move(opts)} {}
 
     /** Append the sections of the result. */
     void ToSections(Sections& sections, OuterType outer_type = OuterType::NONE, int current_indent = 0) const;
@@ -415,12 +429,12 @@ struct RPCExamples {
     std::string ToDescriptionString() const;
 };
 
-class RPCHelpMan
+class RPCMethod
 {
 public:
-    RPCHelpMan(std::string name, std::string description, std::vector<RPCArg> args, RPCResults results, RPCExamples examples);
-    using RPCMethodImpl = std::function<UniValue(const RPCHelpMan&, const JSONRPCRequest&)>;
-    RPCHelpMan(std::string name, std::string description, std::vector<RPCArg> args, RPCResults results, RPCExamples examples, RPCMethodImpl fun);
+    RPCMethod(std::string name, std::string description, std::vector<RPCArg> args, RPCResults results, RPCExamples examples);
+    using RPCMethodImpl = std::function<UniValue(const RPCMethod&, const JSONRPCRequest&)>;
+    RPCMethod(std::string name, std::string description, std::vector<RPCArg> args, RPCResults results, RPCExamples examples, RPCMethodImpl fun);
 
     UniValue HandleRequest(const JSONRPCRequest& request) const;
     /**
diff --git a/src/scheduler.h b/src/scheduler.h
index 79b8afd2ada1..5d4affb0ab8b 100644
--- a/src/scheduler.h
+++ b/src/scheduler.h
@@ -7,7 +7,6 @@
 
 #include <attributes.h>
 #include <sync.h>
-#include <threadsafety.h>
 #include <util/task_runner.h>
 
 #include <chrono>
diff --git a/src/script/miniscript.h b/src/script/miniscript.h
index 8733d3471369..f2b9cdc45764 100644
--- a/src/script/miniscript.h
+++ b/src/script/miniscript.h
@@ -552,6 +552,9 @@ class Node
         // Destroy the subexpressions iteratively after moving out their
         // subexpressions to avoid a stack-overflow due to recursive calls to
         // the subs' destructors.
+        // We move vectors in order to only update array-pointers inside them
+        // rather than moving individual Node instances which would involve
+        // moving/copying each Node field.
         std::vector<std::vector<Node>> queue;
         queue.push_back(std::move(subs));
         do {
@@ -607,7 +610,7 @@ class Node
     // This is kept private as no valid fragment has all of these arguments.
     // Only used by Clone()
     Node(internal::NoDupCheck, MiniscriptContext script_ctx, enum Fragment nt, std::vector<Node> sub, std::vector<Key> key, std::vector<unsigned char> arg, uint32_t val)
-        : fragment(nt), k(val), keys(key), data(std::move(arg)), subs(std::move(sub)), m_script_ctx{script_ctx}, ops(CalcOps()), ss(CalcStackSize()), ws(CalcWitnessSize()), typ(CalcType()), scriptlen(CalcScriptLen()) {}
+        : fragment(nt), k(val), keys(std::move(key)), data(std::move(arg)), subs(std::move(sub)), m_script_ctx{script_ctx}, ops(CalcOps()), ss(CalcStackSize()), ws(CalcWitnessSize()), typ(CalcType()), scriptlen(CalcScriptLen()) {}
 
     //! Compute the length of the script for this miniscript (including children).
     size_t CalcScriptLen() const
diff --git a/src/script/script.cpp b/src/script/script.cpp
index 829e351be697..3f764aaf2141 100644
--- a/src/script/script.cpp
+++ b/src/script/script.cpp
@@ -151,9 +151,8 @@ std::string GetOpName(opcodetype opcode)
 
     case OP_INVALIDOPCODE          : return "OP_INVALIDOPCODE";
 
-    default:
-        return "OP_UNKNOWN";
-    }
+    } // no default case, so the compiler can warn about missing cases
+    return "OP_UNKNOWN";
 }
 
 unsigned int CScript::GetSigOpCount(bool fAccurate) const
diff --git a/src/script/script_error.cpp b/src/script/script_error.cpp
index b0e7a6e10ec6..7fa127420e65 100644
--- a/src/script/script_error.cpp
+++ b/src/script/script_error.cpp
@@ -121,7 +121,7 @@ std::string ScriptErrorString(const ScriptError serror)
             return "Script number overflowed or is non-minimally encoded";
         case SCRIPT_ERR_UNKNOWN_ERROR:
         case SCRIPT_ERR_ERROR_COUNT:
-        default: break;
-    }
+            break;
+    } // no default case, so the compiler can warn about missing cases
     return "unknown error";
 }
diff --git a/src/secp256k1/.github/actions/install-homebrew-valgrind/action.yml b/src/secp256k1/.github/actions/install-homebrew-valgrind/action.yml
index ce10eb2686cd..e9aa61508301 100644
--- a/src/secp256k1/.github/actions/install-homebrew-valgrind/action.yml
+++ b/src/secp256k1/.github/actions/install-homebrew-valgrind/action.yml
@@ -16,7 +16,7 @@ runs:
         cat valgrind_fingerprint
       shell: bash
 
-    - uses: actions/cache@v4
+    - uses: actions/cache@v5
       id: cache
       with:
         path: ${{ env.CI_HOMEBREW_CELLAR_VALGRIND }}
diff --git a/src/secp256k1/.github/actions/run-in-docker-action/action.yml b/src/secp256k1/.github/actions/run-in-docker-action/action.yml
index 0884d3a44303..f0eb9810c31f 100644
--- a/src/secp256k1/.github/actions/run-in-docker-action/action.yml
+++ b/src/secp256k1/.github/actions/run-in-docker-action/action.yml
@@ -13,9 +13,9 @@ inputs:
 runs:
   using: "composite"
   steps:
-    - uses: docker/setup-buildx-action@v3
+    - uses: docker/setup-buildx-action@v4
 
-    - uses: docker/build-push-action@v6
+    - uses: docker/build-push-action@v7
       id: main_builder
       continue-on-error: true
       with:
@@ -24,7 +24,7 @@ runs:
         load: true
         cache-from: type=gha,scope=${{ inputs.scope }}
 
-    - uses: docker/build-push-action@v6
+    - uses: docker/build-push-action@v7
       id: retry_builder
       if: steps.main_builder.outcome == 'failure'
       with:
@@ -44,7 +44,7 @@ runs:
           $(echo '${{ toJSON(env) }}' | jq -r 'keys[] | "--env \(.) "') \
           --volume ${{ github.workspace }}:${{ github.workspace }} \
           --workdir ${{ github.workspace }} \
-          $(docker images -q | head -n1) \
+          ${{ case(steps.main_builder.outcome == 'success', steps.main_builder.outputs.imageid, steps.retry_builder.outputs.imageid) }} \
           bash -c "
             git config --global --add safe.directory ${{ github.workspace }}
             ${{ inputs.command }}
diff --git a/src/secp256k1/.github/workflows/ci.yml b/src/secp256k1/.github/workflows/ci.yml
index 308035c6a548..152f9a1f4d6b 100644
--- a/src/secp256k1/.github/workflows/ci.yml
+++ b/src/secp256k1/.github/workflows/ci.yml
@@ -47,6 +47,9 @@ env:
   SYMBOL_CHECK: 'yes'
   # Compile and run the examples.
   EXAMPLES: 'yes'
+  # Disable Docker build summary generation.
+  # See https://github.com/docker/build-push-action/blob/master/README.md#environment-variables.
+  DOCKER_BUILD_SUMMARY: false
 
 jobs:
   docker_cache:
@@ -67,17 +70,17 @@ jobs:
     steps:
       - name: Get cache validity period
         id: cache_timestamp
-        run: echo "period=$(($(date +%V) / 4))" >> "$GITHUB_OUTPUT"
+        run: echo "period=$((10#$(date +%V) / 4))" >> "$GITHUB_OUTPUT"
 
       - name: Set up Docker Buildx
-        uses: docker/setup-buildx-action@v3
+        uses: docker/setup-buildx-action@v4
         with:
           # See: https://github.com/moby/buildkit/issues/3969.
           driver-opts: |
             network=host
 
       - name: Build container
-        uses: docker/build-push-action@v6
+        uses: docker/build-push-action@v7
         with:
           file: ./ci/linux-debian.Dockerfile
           cache-from: type=gha,scope=${{ runner.arch }}-${{ steps.cache_timestamp.outputs.period }}
@@ -511,7 +514,7 @@ jobs:
       matrix:
         env_vars:
           - { WIDEMUL: 'int64',  RECOVERY: 'yes', ECDH: 'yes', EXTRAKEYS: 'yes', SCHNORRSIG: 'yes', MUSIG: 'yes', ELLSWIFT: 'yes' }
-          - { WIDEMUL: 'int128_struct', ECMULTGENPRECISION: 2, ECMULTWINDOW: 4 }
+          - { WIDEMUL: 'int128_struct', ECMULTGENKB: 2, ECMULTWINDOW: 4 }
           - { WIDEMUL: 'int128',                  ECDH: 'yes', EXTRAKEYS: 'yes', SCHNORRSIG: 'yes', MUSIG: 'yes', ELLSWIFT: 'yes' }
           - { WIDEMUL: 'int128', RECOVERY: 'yes' }
           - { WIDEMUL: 'int128', RECOVERY: 'yes', ECDH: 'yes', EXTRAKEYS: 'yes', SCHNORRSIG: 'yes', MUSIG: 'yes', ELLSWIFT: 'yes' }
diff --git a/src/secp256k1/ci/linux-debian.Dockerfile b/src/secp256k1/ci/linux-debian.Dockerfile
index a862f1b17f74..a575d9b1c489 100644
--- a/src/secp256k1/ci/linux-debian.Dockerfile
+++ b/src/secp256k1/ci/linux-debian.Dockerfile
@@ -67,9 +67,6 @@ RUN \
     wget -qO- https://apt.llvm.org/llvm-snapshot.gpg.key | tee /etc/apt/trusted.gpg.d/apt.llvm.org.asc && \
     # Add repository for this Debian release
     . /etc/os-release && echo "deb http://apt.llvm.org/${VERSION_CODENAME} llvm-toolchain-${VERSION_CODENAME} main" >> /etc/apt/sources.list && \
-    # Temporarily work around Sequoia PGP policy deadline for legacy repositories.
-    # See https://github.com/llvm/llvm-project/issues/153385.
-    sed -i 's/\(sha1\.second_preimage_resistance =\).*/\1 9999-01-01/' /usr/share/apt/default-sequoia.config && \
     apt-get update && \
     # Determine the version number of the LLVM development branch
     LLVM_VERSION=$(apt-cache search --names-only '^clang-[0-9]+$' | sort -V | tail -1 | cut -f1 -d" " | cut -f2 -d"-" ) && \
diff --git a/src/secp256k1/cmake/DiscoverTests.cmake b/src/secp256k1/cmake/DiscoverTests.cmake
new file mode 100644
index 000000000000..683780a8b777
--- /dev/null
+++ b/src/secp256k1/cmake/DiscoverTests.cmake
@@ -0,0 +1,71 @@
+# TODO: rework/remove once test discovery is implemented upstream:
+# https://gitlab.kitware.com/cmake/cmake/-/issues/26920
+function(discover_tests target)
+  set(options "")
+  set(oneValueArgs DISCOVERY_MATCH TEST_NAME_REPLACEMENT TEST_ARGS_REPLACEMENT)
+  set(multiValueArgs DISCOVERY_ARGS PROPERTIES)
+  cmake_parse_arguments(PARSE_ARGV 1 arg "${options}" "${oneValueArgs}" "${multiValueArgs}")
+
+  set(file_base ${CMAKE_CURRENT_BINARY_DIR}/${target})
+  set(include_file ${file_base}_include.cmake)
+
+  set(properties_content)
+  list(LENGTH arg_PROPERTIES properties_len)
+  if(properties_len GREATER "0")
+    set(properties_content "      set_tests_properties(\"\${test_name}\" PROPERTIES\n")
+    math(EXPR num_properties "${properties_len} / 2")
+    foreach(i RANGE 0 ${num_properties} 2)
+      math(EXPR value_index "${i} + 1")
+      list(GET arg_PROPERTIES ${i} name)
+      list(GET arg_PROPERTIES ${value_index} value)
+      string(APPEND properties_content "        \"${name}\" \"${value}\"\n")
+    endforeach()
+    string(APPEND properties_content "      )\n")
+  endif()
+
+  string(CONCAT include_content
+    "set(runner   [[$<TARGET_FILE:${target}>]])\n"
+    "set(launcher [[$<TARGET_PROPERTY:${target},TEST_LAUNCHER>]])\n"
+    "set(emulator [[$<$<BOOL:${CMAKE_CROSSCOMPILING}>:$<TARGET_PROPERTY:${target},CROSSCOMPILING_EMULATOR>>]])\n"
+    "\n"
+    "execute_process(\n"
+    "  COMMAND \${launcher} \${emulator} \${runner} ${arg_DISCOVERY_ARGS}\n"
+    "  OUTPUT_VARIABLE output OUTPUT_STRIP_TRAILING_WHITESPACE\n"
+    "  ERROR_VARIABLE  output ERROR_STRIP_TRAILING_WHITESPACE\n"
+    "  RESULT_VARIABLE result\n"
+    ")\n"
+    "\n"
+    "if(NOT result EQUAL 0)\n"
+    "  add_test([[${target}_DISCOVERY_FAILURE]] \${launcher} \${emulator} \${runner} ${arg_DISCOVERY_ARGS})\n"
+    "else()\n"
+    "  string(REPLACE \"\\n\" \";\" lines \"\${output}\")\n"
+    "  foreach(line IN LISTS lines)\n"
+    "    if(line MATCHES \"${arg_DISCOVERY_MATCH}\")\n"
+    "      string(REGEX REPLACE \"${arg_DISCOVERY_MATCH}\" \"${arg_TEST_NAME_REPLACEMENT}\" test_name \"\${line}\")\n"
+    "      string(REGEX REPLACE \"${arg_DISCOVERY_MATCH}\" \"${arg_TEST_ARGS_REPLACEMENT}\" test_args \"\${line}\")\n"
+    "      separate_arguments(test_args)\n"
+    "      add_test(\"\${test_name}\" \${launcher} \${emulator} \${runner} \${test_args})\n"
+    ${properties_content}
+    "    endif()\n"
+    "  endforeach()\n"
+    "endif()\n"
+  )
+
+  get_property(is_multi_config GLOBAL PROPERTY GENERATOR_IS_MULTI_CONFIG)
+  if(is_multi_config)
+    file(GENERATE
+      OUTPUT ${file_base}_include-$<CONFIG>.cmake
+      CONTENT "${include_content}"
+    )
+    file(WRITE ${include_file}
+      "include(\"${file_base}_include-\${CTEST_CONFIGURATION_TYPE}.cmake\")"
+    )
+  else()
+    file(GENERATE
+      OUTPUT ${include_file}
+      CONTENT "${include_content}"
+    )
+  endif()
+
+  set_property(DIRECTORY APPEND PROPERTY TEST_INCLUDE_FILES ${include_file})
+endfunction()
diff --git a/src/secp256k1/examples/CMakeLists.txt b/src/secp256k1/examples/CMakeLists.txt
index c9da9de6be32..808917c4d641 100644
--- a/src/secp256k1/examples/CMakeLists.txt
+++ b/src/secp256k1/examples/CMakeLists.txt
@@ -8,8 +8,10 @@ function(add_example name)
     secp256k1
     $<$<PLATFORM_ID:Windows>:bcrypt>
   )
-  set(test_name ${name}_example)
-  add_test(NAME secp256k1_${test_name} COMMAND ${target_name})
+  add_test(NAME secp256k1.example.${name} COMMAND ${target_name})
+  set_tests_properties(secp256k1.example.${name} PROPERTIES
+    LABELS secp256k1_example
+  )
 endfunction()
 
 add_example(ecdsa)
diff --git a/src/secp256k1/include/secp256k1.h b/src/secp256k1/include/secp256k1.h
index 9de45f1f7d88..b7ec6a228319 100644
--- a/src/secp256k1/include/secp256k1.h
+++ b/src/secp256k1/include/secp256k1.h
@@ -6,6 +6,7 @@ extern "C" {
 #endif
 
 #include <stddef.h>
+#include <stdint.h>
 
 /** Unless explicitly stated all pointer arguments must not be NULL.
  *
@@ -404,6 +405,46 @@ SECP256K1_API void secp256k1_context_set_error_callback(
     const void *data
 ) SECP256K1_ARG_NONNULL(1);
 
+/** A pointer to a function implementing SHA256's internal compression function.
+ *
+ * This function processes one or more contiguous 64-byte message blocks and
+ * updates the internal SHA256 state accordingly. The function is not responsible
+ * for counting consumed blocks or bytes, nor for performing padding.
+ *
+ * In/Out:  state:     pointer to eight 32-bit words representing the current internal state;
+ *                     the state is updated in place.
+ * In:      blocks64:  pointer to concatenation of n_blocks blocks, of 64 bytes each.
+ *                     no alignment guarantees are made for this pointer.
+ *          n_blocks:  number of contiguous 64-byte blocks to process.
+ */
+typedef void (*secp256k1_sha256_compression_function)(
+    uint32_t *state,
+    const unsigned char *blocks64,
+    size_t n_blocks
+);
+
+/**
+ * Set a callback function to override the internal SHA256 compression function.
+ *
+ * This installs a function to replace the built-in block-compression
+ * step used by the library's internal SHA256 implementation.
+ * The provided callback must exactly implement the effect of n_blocks
+ * repeated applications of the SHA256 compression function.
+ *
+ * This API exists to support environments that wish to route the
+ * SHA256 compression step through a hardware-accelerated or otherwise
+ * specialized implementation. It is NOT meant for replacing SHA256
+ * with a different hash function.
+ *
+ * Args:    ctx:             pointer to a context object.
+ * In:      fn_compression:  pointer to a function implementing the compression function;
+ *                           passing NULL restores the default implementation.
+ */
+SECP256K1_API void secp256k1_context_set_sha256_compression(
+        secp256k1_context *ctx,
+        secp256k1_sha256_compression_function fn_compression
+) SECP256K1_ARG_NONNULL(1);
+
 /** Parse a variable-length public key into the pubkey object.
  *
  *  Returns: 1 if the public key was fully valid.
diff --git a/src/secp256k1/src/CMakeLists.txt b/src/secp256k1/src/CMakeLists.txt
index 46db77809d20..322f1987dde7 100644
--- a/src/secp256k1/src/CMakeLists.txt
+++ b/src/secp256k1/src/CMakeLists.txt
@@ -144,15 +144,24 @@ if(SECP256K1_BUILD_TESTS)
     list(APPEND TEST_DEFINITIONS SUPPORTS_CONCURRENCY=1)
   endif()
 
-  add_executable(noverify_tests tests.c)
-  target_link_libraries(noverify_tests secp256k1_precomputed secp256k1_asm)
-  target_compile_definitions(noverify_tests PRIVATE ${TEST_DEFINITIONS})
-  add_test(NAME secp256k1_noverify_tests COMMAND noverify_tests)
+  function(add_executable_and_tests exe_name verify_definition)
+    add_executable(${exe_name} tests.c)
+    target_link_libraries(${exe_name} secp256k1_precomputed secp256k1_asm)
+    target_compile_definitions(${exe_name} PRIVATE ${verify_definition} ${TEST_DEFINITIONS})
+    include(DiscoverTests)
+    discover_tests(${exe_name}
+      DISCOVERY_ARGS        "--list_tests"
+      DISCOVERY_MATCH       "^\\t\\\\[ *[0-9]+\\\\] ([^ ].*)$"
+      TEST_NAME_REPLACEMENT "secp256k1.${exe_name}.\\\\1"
+      TEST_ARGS_REPLACEMENT "--target=\\\\1 --log=1"
+      PROPERTIES
+        LABELS "secp256k1_${exe_name}"
+    )
+  endfunction()
+
+  add_executable_and_tests(noverify_tests "")
   if(NOT CMAKE_BUILD_TYPE STREQUAL "Coverage")
-    add_executable(tests tests.c)
-    target_compile_definitions(tests PRIVATE VERIFY ${TEST_DEFINITIONS})
-    target_link_libraries(tests secp256k1_precomputed secp256k1_asm)
-    add_test(NAME secp256k1_tests COMMAND tests)
+    add_executable_and_tests(tests VERIFY)
   endif()
   unset(TEST_DEFINITIONS)
 endif()
@@ -162,7 +171,10 @@ if(SECP256K1_BUILD_EXHAUSTIVE_TESTS)
   add_executable(exhaustive_tests tests_exhaustive.c)
   target_link_libraries(exhaustive_tests secp256k1_asm)
   target_compile_definitions(exhaustive_tests PRIVATE $<$<NOT:$<CONFIG:Coverage>>:VERIFY>)
-  add_test(NAME secp256k1_exhaustive_tests COMMAND exhaustive_tests)
+  add_test(NAME secp256k1.exhaustive_tests COMMAND exhaustive_tests)
+  set_tests_properties(secp256k1.exhaustive_tests PROPERTIES
+    LABELS secp256k1_exhaustive
+  )
 endif()
 
 if(SECP256K1_BUILD_CTIME_TESTS)
diff --git a/src/secp256k1/src/bench.c b/src/secp256k1/src/bench.c
index a5231b71e9ea..f561ad1c9d49 100644
--- a/src/secp256k1/src/bench.c
+++ b/src/secp256k1/src/bench.c
@@ -12,7 +12,7 @@
 #include "util.h"
 #include "bench.h"
 
-static void help(int default_iters) {
+static void help(const char *executable_path, int default_iters) {
     printf("Benchmarks the following algorithms:\n");
     printf("    - ECDSA signing/verification\n");
 
@@ -36,7 +36,7 @@ static void help(int default_iters) {
     printf("The default number of iterations for each benchmark is %d. This can be\n", default_iters);
     printf("customized using the SECP256K1_BENCH_ITERS environment variable.\n");
     printf("\n");
-    printf("Usage: ./bench [args]\n");
+    printf("Usage: %s [args]\n", executable_path);
     printf("By default, all benchmarks will be run.\n");
     printf("args:\n");
     printf("    help              : display this help and exit\n");
@@ -183,13 +183,12 @@ int main(int argc, char** argv) {
                          "ecdsa_recover", "schnorrsig", "schnorrsig_verify", "schnorrsig_sign", "ec",
                          "keygen", "ec_keygen", "ellswift", "encode", "ellswift_encode", "decode",
                          "ellswift_decode", "ellswift_keygen", "ellswift_ecdh"};
-    size_t valid_args_size = sizeof(valid_args)/sizeof(valid_args[0]);
-    int invalid_args = have_invalid_args(argc, argv, valid_args, valid_args_size);
+    int invalid_args = have_invalid_args(argc, argv, valid_args, ARRAY_SIZE(valid_args));
 
     int default_iters = 20000;
     int iters = get_iters(default_iters);
     if (iters == 0) {
-        help(default_iters);
+        help(argv[0], default_iters);
         return EXIT_FAILURE;
     }
 
@@ -197,11 +196,11 @@ int main(int argc, char** argv) {
         if (have_flag(argc, argv, "-h")
            || have_flag(argc, argv, "--help")
            || have_flag(argc, argv, "help")) {
-            help(default_iters);
+            help(argv[0], default_iters);
             return EXIT_SUCCESS;
         } else if (invalid_args) {
             fprintf(stderr, "./bench: unrecognized argument.\n\n");
-            help(default_iters);
+            help(argv[0], default_iters);
             return EXIT_FAILURE;
         }
     }
diff --git a/src/secp256k1/src/bench_ecmult.c b/src/secp256k1/src/bench_ecmult.c
index bcf8b43153f9..eb546db414ab 100644
--- a/src/secp256k1/src/bench_ecmult.c
+++ b/src/secp256k1/src/bench_ecmult.c
@@ -19,13 +19,13 @@
 
 #define POINTS 32768
 
-static void help(char **argv, int default_iters) {
+static void help(const char *executable_path, int default_iters) {
     printf("Benchmark EC multiplication algorithms\n");
     printf("\n");
     printf("The default number of iterations for each benchmark is %d. This can be\n", default_iters);
     printf("customized using the SECP256K1_BENCH_ITERS environment variable.\n");
     printf("\n");
-    printf("Usage: %s <help|pippenger_wnaf|strauss_wnaf|simple>\n", argv[0]);
+    printf("Usage: %s [args]\n", executable_path);
     printf("The output shows the number of multiplied and summed points right after the\n");
     printf("function name. The letter 'g' indicates that one of the points is the generator.\n");
     printf("The benchmarks are divided by the number of points.\n");
@@ -259,7 +259,7 @@ static void bench_ecmult_multi_teardown(void* arg, int iters) {
     }
 }
 
-static void generate_scalar(uint32_t num, secp256k1_scalar* scalar) {
+static void generate_scalar(const secp256k1_context *ctx, uint32_t num, secp256k1_scalar* scalar) {
     secp256k1_sha256 sha256;
     unsigned char c[10] = {'e', 'c', 'm', 'u', 'l', 't', 0, 0, 0, 0};
     unsigned char buf[32];
@@ -269,8 +269,8 @@ static void generate_scalar(uint32_t num, secp256k1_scalar* scalar) {
     c[8] = num >> 16;
     c[9] = num >> 24;
     secp256k1_sha256_initialize(&sha256);
-    secp256k1_sha256_write(&sha256, c, sizeof(c));
-    secp256k1_sha256_finalize(&sha256, buf);
+    secp256k1_sha256_write(secp256k1_get_hash_context(ctx), &sha256, c, sizeof(c));
+    secp256k1_sha256_finalize(secp256k1_get_hash_context(ctx), &sha256, buf);
     secp256k1_scalar_set_b32(scalar, buf, &overflow);
     CHECK(!overflow);
 }
@@ -314,7 +314,7 @@ int main(int argc, char **argv) {
     int default_iters = 10000;
     int iters = get_iters(default_iters);
     if (iters == 0) {
-        help(argv, default_iters);
+        help(argv[0], default_iters);
         return EXIT_FAILURE;
     }
 
@@ -324,7 +324,7 @@ int main(int argc, char **argv) {
         if(have_flag(argc, argv, "-h")
            || have_flag(argc, argv, "--help")
            || have_flag(argc, argv, "help")) {
-            help(argv, default_iters);
+            help(argv[0], default_iters);
             return EXIT_SUCCESS;
         } else if(have_flag(argc, argv, "pippenger_wnaf")) {
             printf("Using pippenger_wnaf:\n");
@@ -336,7 +336,7 @@ int main(int argc, char **argv) {
             printf("Using simple algorithm:\n");
         } else {
             fprintf(stderr, "%s: unrecognized argument '%s'.\n\n", argv[0], argv[1]);
-            help(argv, default_iters);
+            help(argv[0], default_iters);
             return EXIT_FAILURE;
         }
     }
@@ -362,7 +362,7 @@ int main(int argc, char **argv) {
     secp256k1_gej_set_ge(&data.pubkeys_gej[0], &secp256k1_ge_const_g);
     secp256k1_scalar_set_int(&data.seckeys[0], 1);
     for (i = 0; i < POINTS; ++i) {
-        generate_scalar(i, &data.scalars[i]);
+        generate_scalar(data.ctx, i, &data.scalars[i]);
         if (i) {
             secp256k1_gej_double_var(&data.pubkeys_gej[i], &data.pubkeys_gej[i - 1], NULL);
             secp256k1_scalar_add(&data.seckeys[i], &data.seckeys[i - 1], &data.seckeys[i - 1]);
diff --git a/src/secp256k1/src/bench_internal.c b/src/secp256k1/src/bench_internal.c
index 001bd25e08a9..f3c1be987f70 100644
--- a/src/secp256k1/src/bench_internal.c
+++ b/src/secp256k1/src/bench_internal.c
@@ -18,13 +18,13 @@
 #include "ecmult_impl.h"
 #include "bench.h"
 
-static void help(int default_iters) {
+static void help(const char *executable_path, int default_iters) {
     printf("Benchmarks various internal routines.\n");
     printf("\n");
     printf("The default number of iterations for each benchmark is %d. This can be\n", default_iters);
     printf("customized using the SECP256K1_BENCH_ITERS environment variable.\n");
     printf("\n");
-    printf("Usage: ./bench_internal [args]\n");
+    printf("Usage: %s [args]\n", executable_path);
     printf("By default, all benchmarks will be run.\n");
     printf("args:\n");
     printf("    help       : display this help and exit\n");
@@ -38,6 +38,7 @@ static void help(int default_iters) {
 }
 
 typedef struct {
+    const secp256k1_context* ctx;
     secp256k1_scalar scalar[2];
     secp256k1_fe fe[4];
     secp256k1_ge ge[2];
@@ -82,6 +83,9 @@ static void bench_setup(void* arg) {
         }
     };
 
+    /* Customize context if needed */
+    data->ctx = secp256k1_context_static;
+
     secp256k1_scalar_set_b32(&data->scalar[0], init[0], NULL);
     secp256k1_scalar_set_b32(&data->scalar[1], init[1], NULL);
     secp256k1_fe_set_b32_limit(&data->fe[0], init[0]);
@@ -344,11 +348,12 @@ static void bench_sha256(void* arg, int iters) {
     int i;
     bench_inv *data = (bench_inv*)arg;
     secp256k1_sha256 sha;
+    const secp256k1_hash_ctx *hash_ctx = secp256k1_get_hash_context(data->ctx);
 
     for (i = 0; i < iters; i++) {
         secp256k1_sha256_initialize(&sha);
-        secp256k1_sha256_write(&sha, data->data, 32);
-        secp256k1_sha256_finalize(&sha, data->data);
+        secp256k1_sha256_write(hash_ctx, &sha, data->data, 32);
+        secp256k1_sha256_finalize(hash_ctx, &sha, data->data);
     }
 }
 
@@ -356,11 +361,12 @@ static void bench_hmac_sha256(void* arg, int iters) {
     int i;
     bench_inv *data = (bench_inv*)arg;
     secp256k1_hmac_sha256 hmac;
+    const secp256k1_hash_ctx *hash_ctx = secp256k1_get_hash_context(data->ctx);
 
     for (i = 0; i < iters; i++) {
-        secp256k1_hmac_sha256_initialize(&hmac, data->data, 32);
-        secp256k1_hmac_sha256_write(&hmac, data->data, 32);
-        secp256k1_hmac_sha256_finalize(&hmac, data->data);
+        secp256k1_hmac_sha256_initialize(hash_ctx, &hmac, data->data, 32);
+        secp256k1_hmac_sha256_write(hash_ctx, &hmac, data->data, 32);
+        secp256k1_hmac_sha256_finalize(hash_ctx, &hmac, data->data);
     }
 }
 
@@ -368,10 +374,11 @@ static void bench_rfc6979_hmac_sha256(void* arg, int iters) {
     int i;
     bench_inv *data = (bench_inv*)arg;
     secp256k1_rfc6979_hmac_sha256 rng;
+    const secp256k1_hash_ctx *hash_ctx = secp256k1_get_hash_context(data->ctx);
 
     for (i = 0; i < iters; i++) {
-        secp256k1_rfc6979_hmac_sha256_initialize(&rng, data->data, 64);
-        secp256k1_rfc6979_hmac_sha256_generate(&rng, data->data, 32);
+        secp256k1_rfc6979_hmac_sha256_initialize(hash_ctx, &rng, data->data, 64);
+        secp256k1_rfc6979_hmac_sha256_generate(hash_ctx, &rng, data->data, 32);
     }
 }
 
@@ -389,7 +396,7 @@ int main(int argc, char **argv) {
     int default_iters = 20000;
     int iters = get_iters(default_iters);
     if (iters == 0) {
-        help(default_iters);
+        help(argv[0], default_iters);
         return EXIT_FAILURE;
     }
 
@@ -397,7 +404,7 @@ int main(int argc, char **argv) {
         if (have_flag(argc, argv, "-h")
            || have_flag(argc, argv, "--help")
            || have_flag(argc, argv, "help")) {
-            help(default_iters);
+            help(argv[0], default_iters);
             return EXIT_SUCCESS;
         }
     }
diff --git a/src/secp256k1/src/ctime_tests.c b/src/secp256k1/src/ctime_tests.c
index f81bdb9228d4..f80042a8e86c 100644
--- a/src/secp256k1/src/ctime_tests.c
+++ b/src/secp256k1/src/ctime_tests.c
@@ -49,7 +49,7 @@ int main(void) {
 
     if (!SECP256K1_CHECKMEM_RUNNING()) {
         fprintf(stderr, "This test can only usefully be run inside valgrind because it was not compiled under msan.\n");
-        fprintf(stderr, "Usage: libtool --mode=execute valgrind ./ctime_tests\n");
+        fprintf(stderr, "Usage: valgrind ./ctime_tests (or with Autotools: libtool --mode=execute valgrind ./ctime_tests)\n");
         return EXIT_FAILURE;
     }
     ctx = secp256k1_context_create(SECP256K1_CONTEXT_DECLASSIFY);
diff --git a/src/secp256k1/src/ecdsa_impl.h b/src/secp256k1/src/ecdsa_impl.h
index ce36e85e6a08..163539ebc14d 100644
--- a/src/secp256k1/src/ecdsa_impl.h
+++ b/src/secp256k1/src/ecdsa_impl.h
@@ -196,6 +196,7 @@ static int secp256k1_ecdsa_sig_verify(const secp256k1_scalar *sigr, const secp25
     unsigned char c[32];
     secp256k1_scalar sn, u1, u2;
 #if !defined(EXHAUSTIVE_TEST_ORDER)
+    int range;
     secp256k1_fe xr;
 #endif
     secp256k1_gej pubkeyj;
@@ -226,9 +227,16 @@ static int secp256k1_ecdsa_sig_verify(const secp256k1_scalar *sigr, const secp25
     return secp256k1_scalar_eq(sigr, &computed_r);
 }
 #else
+
+    /* Interpret sigr as a field element xr  */
     secp256k1_scalar_get_b32(c, sigr);
-    /* we can ignore the fe_set_b32_limit return value, because we know the input is in range */
-    (void)secp256k1_fe_set_b32_limit(&xr, c);
+    range = secp256k1_fe_set_b32_limit(&xr, c);
+#ifdef VERIFY
+    /* We know that c is in range; it comes from a scalar. */
+    VERIFY_CHECK(range);
+#else
+    (void)range;
+#endif
 
     /** We now have the recomputed R point in pr, and its claimed x coordinate (modulo n)
      *  in xr. Naively, we would extract the x coordinate from pr (requiring a inversion modulo p),
diff --git a/src/secp256k1/src/eckey_impl.h b/src/secp256k1/src/eckey_impl.h
index 48745e8fe7b1..57024e409d0f 100644
--- a/src/secp256k1/src/eckey_impl.h
+++ b/src/secp256k1/src/eckey_impl.h
@@ -86,7 +86,7 @@ static int secp256k1_eckey_pubkey_tweak_mul(secp256k1_ge *key, const secp256k1_s
     }
 
     secp256k1_gej_set_ge(&pt, key);
-    secp256k1_ecmult(&pt, &pt, tweak, &secp256k1_scalar_zero);
+    secp256k1_ecmult(&pt, &pt, tweak, NULL);
     secp256k1_ge_set_gej(key, &pt);
     return 1;
 }
diff --git a/src/secp256k1/src/ecmult.h b/src/secp256k1/src/ecmult.h
index 8d0a9f49052d..342195d92acb 100644
--- a/src/secp256k1/src/ecmult.h
+++ b/src/secp256k1/src/ecmult.h
@@ -40,7 +40,10 @@
 /** The number of entries a table with precomputed multiples needs to have. */
 #define ECMULT_TABLE_SIZE(w) ((size_t)1 << ((w)-2))
 
-/** Double multiply: R = na*A + ng*G */
+/** Double multiply: R = na*A + ng*G
+ *
+ * Passing NULL as ng is equivalent to the zero scalar but a tiny bit faster.
+ */
 static void secp256k1_ecmult(secp256k1_gej *r, const secp256k1_gej *a, const secp256k1_scalar *na, const secp256k1_scalar *ng);
 
 typedef int (secp256k1_ecmult_multi_callback)(secp256k1_scalar *sc, secp256k1_ge *pt, size_t idx, void *data);
diff --git a/src/secp256k1/src/ecmult_gen.h b/src/secp256k1/src/ecmult_gen.h
index 43dd10c38d70..8bc4f14c310a 100644
--- a/src/secp256k1/src/ecmult_gen.h
+++ b/src/secp256k1/src/ecmult_gen.h
@@ -7,6 +7,7 @@
 #ifndef SECP256K1_ECMULT_GEN_H
 #define SECP256K1_ECMULT_GEN_H
 
+#include "hash.h"
 #include "scalar.h"
 #include "group.h"
 
@@ -132,12 +133,12 @@ typedef struct {
     secp256k1_fe proj_blind;
 } secp256k1_ecmult_gen_context;
 
-static void secp256k1_ecmult_gen_context_build(secp256k1_ecmult_gen_context* ctx);
+static void secp256k1_ecmult_gen_context_build(secp256k1_ecmult_gen_context* ctx, const secp256k1_hash_ctx *hash_ctx);
 static void secp256k1_ecmult_gen_context_clear(secp256k1_ecmult_gen_context* ctx);
 
 /** Multiply with the generator: R = a*G */
 static void secp256k1_ecmult_gen(const secp256k1_ecmult_gen_context* ctx, secp256k1_gej *r, const secp256k1_scalar *a);
 
-static void secp256k1_ecmult_gen_blind(secp256k1_ecmult_gen_context *ctx, const unsigned char *seed32);
+static void secp256k1_ecmult_gen_blind(secp256k1_ecmult_gen_context *ctx, const secp256k1_hash_ctx *hash_ctx, const unsigned char *seed32);
 
 #endif /* SECP256K1_ECMULT_GEN_H */
diff --git a/src/secp256k1/src/ecmult_gen_impl.h b/src/secp256k1/src/ecmult_gen_impl.h
index 2159eed5e1e5..5a954977ebe1 100644
--- a/src/secp256k1/src/ecmult_gen_impl.h
+++ b/src/secp256k1/src/ecmult_gen_impl.h
@@ -14,8 +14,8 @@
 #include "hash_impl.h"
 #include "precomputed_ecmult_gen.h"
 
-static void secp256k1_ecmult_gen_context_build(secp256k1_ecmult_gen_context *ctx) {
-    secp256k1_ecmult_gen_blind(ctx, NULL);
+static void secp256k1_ecmult_gen_context_build(secp256k1_ecmult_gen_context *ctx, const secp256k1_hash_ctx *hash_ctx) {
+    secp256k1_ecmult_gen_blind(ctx, hash_ctx, NULL);
     ctx->built = 1;
 }
 
@@ -282,7 +282,7 @@ static void secp256k1_ecmult_gen(const secp256k1_ecmult_gen_context *ctx, secp25
 }
 
 /* Setup blinding values for secp256k1_ecmult_gen. */
-static void secp256k1_ecmult_gen_blind(secp256k1_ecmult_gen_context *ctx, const unsigned char *seed32) {
+static void secp256k1_ecmult_gen_blind(secp256k1_ecmult_gen_context *ctx, const secp256k1_hash_ctx *hash_ctx, const unsigned char *seed32) {
     secp256k1_scalar b;
     secp256k1_scalar diff;
     secp256k1_gej gb;
@@ -309,17 +309,17 @@ static void secp256k1_ecmult_gen_blind(secp256k1_ecmult_gen_context *ctx, const
      */
     VERIFY_CHECK(seed32 != NULL);
     memcpy(keydata + 32, seed32, 32);
-    secp256k1_rfc6979_hmac_sha256_initialize(&rng, keydata, 64);
+    secp256k1_rfc6979_hmac_sha256_initialize(hash_ctx, &rng, keydata, 64);
     secp256k1_memclear_explicit(keydata, sizeof(keydata));
 
     /* Compute projective blinding factor (cannot be 0). */
-    secp256k1_rfc6979_hmac_sha256_generate(&rng, nonce32, 32);
+    secp256k1_rfc6979_hmac_sha256_generate(hash_ctx, &rng, nonce32, 32);
     secp256k1_fe_set_b32_mod(&f, nonce32);
     secp256k1_fe_cmov(&f, &secp256k1_fe_one, secp256k1_fe_normalizes_to_zero(&f));
     ctx->proj_blind = f;
 
     /* For a random blinding value b, set scalar_offset=diff-b, ge_offset=bG */
-    secp256k1_rfc6979_hmac_sha256_generate(&rng, nonce32, 32);
+    secp256k1_rfc6979_hmac_sha256_generate(hash_ctx, &rng, nonce32, 32);
     secp256k1_scalar_set_b32(&b, nonce32, NULL);
     /* The blinding value cannot be zero, as that would mean ge_offset = infinity,
      * which secp256k1_gej_add_ge cannot handle. */
diff --git a/src/secp256k1/src/hash.h b/src/secp256k1/src/hash.h
index 6d903ca7e072..79d97671e5c2 100644
--- a/src/secp256k1/src/hash.h
+++ b/src/secp256k1/src/hash.h
@@ -10,6 +10,12 @@
 #include <stdlib.h>
 #include <stdint.h>
 
+typedef struct {
+    secp256k1_sha256_compression_function fn_sha256_compression;
+} secp256k1_hash_ctx;
+
+static void secp256k1_hash_ctx_init(secp256k1_hash_ctx *hash_ctx);
+
 typedef struct {
     uint32_t s[8];
     unsigned char buf[64];
@@ -17,17 +23,21 @@ typedef struct {
 } secp256k1_sha256;
 
 static void secp256k1_sha256_initialize(secp256k1_sha256 *hash);
-static void secp256k1_sha256_write(secp256k1_sha256 *hash, const unsigned char *data, size_t size);
-static void secp256k1_sha256_finalize(secp256k1_sha256 *hash, unsigned char *out32);
+/* Initialize a SHA256 hash state with a precomputed midstate.
+ * The byte counter must be a multiple of 64, i.e., there must be no unwritten
+ * bytes in the buffer. */
+static void secp256k1_sha256_initialize_midstate(secp256k1_sha256 *hash, uint64_t bytes, const uint32_t state[8]);
+static void secp256k1_sha256_write(const secp256k1_hash_ctx *hash_ctx, secp256k1_sha256 *hash, const unsigned char *data, size_t size);
+static void secp256k1_sha256_finalize(const secp256k1_hash_ctx *hash_ctx, secp256k1_sha256 *hash, unsigned char *out32);
 static void secp256k1_sha256_clear(secp256k1_sha256 *hash);
 
 typedef struct {
     secp256k1_sha256 inner, outer;
 } secp256k1_hmac_sha256;
 
-static void secp256k1_hmac_sha256_initialize(secp256k1_hmac_sha256 *hash, const unsigned char *key, size_t size);
-static void secp256k1_hmac_sha256_write(secp256k1_hmac_sha256 *hash, const unsigned char *data, size_t size);
-static void secp256k1_hmac_sha256_finalize(secp256k1_hmac_sha256 *hash, unsigned char *out32);
+static void secp256k1_hmac_sha256_initialize(const secp256k1_hash_ctx *hash_ctx, secp256k1_hmac_sha256 *hash, const unsigned char *key, size_t size);
+static void secp256k1_hmac_sha256_write(const secp256k1_hash_ctx *hash_ctx, secp256k1_hmac_sha256 *hash, const unsigned char *data, size_t size);
+static void secp256k1_hmac_sha256_finalize(const secp256k1_hash_ctx *hash_ctx, secp256k1_hmac_sha256 *hash, unsigned char *out32);
 static void secp256k1_hmac_sha256_clear(secp256k1_hmac_sha256 *hash);
 
 typedef struct {
@@ -36,8 +46,8 @@ typedef struct {
     int retry;
 } secp256k1_rfc6979_hmac_sha256;
 
-static void secp256k1_rfc6979_hmac_sha256_initialize(secp256k1_rfc6979_hmac_sha256 *rng, const unsigned char *key, size_t keylen);
-static void secp256k1_rfc6979_hmac_sha256_generate(secp256k1_rfc6979_hmac_sha256 *rng, unsigned char *out, size_t outlen);
+static void secp256k1_rfc6979_hmac_sha256_initialize(const secp256k1_hash_ctx *hash_ctx, secp256k1_rfc6979_hmac_sha256 *rng, const unsigned char *key, size_t keylen);
+static void secp256k1_rfc6979_hmac_sha256_generate(const secp256k1_hash_ctx *hash_ctx, secp256k1_rfc6979_hmac_sha256 *rng, unsigned char *out, size_t outlen);
 static void secp256k1_rfc6979_hmac_sha256_finalize(secp256k1_rfc6979_hmac_sha256 *rng);
 static void secp256k1_rfc6979_hmac_sha256_clear(secp256k1_rfc6979_hmac_sha256 *rng);
 
diff --git a/src/secp256k1/src/hash_impl.h b/src/secp256k1/src/hash_impl.h
index 4341917773d9..7c40f82e76e9 100644
--- a/src/secp256k1/src/hash_impl.h
+++ b/src/secp256k1/src/hash_impl.h
@@ -40,8 +40,15 @@ static void secp256k1_sha256_initialize(secp256k1_sha256 *hash) {
     hash->bytes = 0;
 }
 
+static void secp256k1_sha256_initialize_midstate(secp256k1_sha256 *hash, uint64_t bytes, const uint32_t state[8]) {
+    VERIFY_CHECK((bytes & 0x3F) == 0);
+    VERIFY_CHECK(state != NULL);
+    memcpy(hash->s, state, sizeof(hash->s));
+    hash->bytes = bytes;
+}
+
 /** Perform one SHA-256 transformation, processing 16 big endian 32-bit words. */
-static void secp256k1_sha256_transform(uint32_t* s, const unsigned char* buf) {
+static void secp256k1_sha256_transform_impl(uint32_t* s, const unsigned char* buf) {
     uint32_t a = s[0], b = s[1], c = s[2], d = s[3], e = s[4], f = s[5], g = s[6], h = s[7];
     uint32_t w0, w1, w2, w3, w4, w5, w6, w7, w8, w9, w10, w11, w12, w13, w14, w15;
 
@@ -123,26 +130,52 @@ static void secp256k1_sha256_transform(uint32_t* s, const unsigned char* buf) {
     s[7] += h;
 }
 
-static void secp256k1_sha256_write(secp256k1_sha256 *hash, const unsigned char *data, size_t len) {
+static void secp256k1_sha256_transform(uint32_t *state, const unsigned char *blocks64, size_t n_blocks) {
+    while (n_blocks--) {
+        secp256k1_sha256_transform_impl(state, blocks64);
+        blocks64 += 64;
+    }
+}
+
+static void secp256k1_hash_ctx_init(secp256k1_hash_ctx *hash_ctx) {
+    VERIFY_CHECK(hash_ctx != NULL);
+    hash_ctx->fn_sha256_compression = secp256k1_sha256_transform;
+}
+
+static void secp256k1_sha256_write(const secp256k1_hash_ctx *hash_ctx, secp256k1_sha256 *hash, const unsigned char *data, size_t len) {
+    size_t chunk_len;
     size_t bufsize = hash->bytes & 0x3F;
     hash->bytes += len;
     VERIFY_CHECK(hash->bytes >= len);
-    while (len >= 64 - bufsize) {
-        /* Fill the buffer, and process it. */
-        size_t chunk_len = 64 - bufsize;
+    VERIFY_CHECK(hash_ctx != NULL);
+    VERIFY_CHECK(hash_ctx->fn_sha256_compression != NULL);
+
+    /* If we exceed the 64-byte block size with this input, process it and wipe the buffer */
+    chunk_len = 64 - bufsize;
+    if (bufsize && len >= chunk_len) {
         memcpy(hash->buf + bufsize, data, chunk_len);
         data += chunk_len;
         len -= chunk_len;
-        secp256k1_sha256_transform(hash->s, hash->buf);
+        hash_ctx->fn_sha256_compression(hash->s, hash->buf, 1);
         bufsize = 0;
     }
+
+    /* If we still have data to process, invoke compression directly on the input */
+    if (len >= 64) {
+        const size_t n_blocks = len / 64;
+        const size_t advance = n_blocks * 64;
+        hash_ctx->fn_sha256_compression(hash->s, data, n_blocks);
+        data += advance;
+        len -= advance;
+    }
+
+    /* Fill the buffer with what remains */
     if (len) {
-        /* Fill the buffer with what remains. */
         memcpy(hash->buf + bufsize, data, len);
     }
 }
 
-static void secp256k1_sha256_finalize(secp256k1_sha256 *hash, unsigned char *out32) {
+static void secp256k1_sha256_finalize(const secp256k1_hash_ctx *hash_ctx, secp256k1_sha256 *hash, unsigned char *out32) {
     static const unsigned char pad[64] = {0x80};
     unsigned char sizedesc[8];
     int i;
@@ -150,8 +183,8 @@ static void secp256k1_sha256_finalize(secp256k1_sha256 *hash, unsigned char *out
     VERIFY_CHECK(hash->bytes < ((uint64_t)1 << 61));
     secp256k1_write_be32(&sizedesc[0], hash->bytes >> 29);
     secp256k1_write_be32(&sizedesc[4], hash->bytes << 3);
-    secp256k1_sha256_write(hash, pad, 1 + ((119 - (hash->bytes % 64)) % 64));
-    secp256k1_sha256_write(hash, sizedesc, 8);
+    secp256k1_sha256_write(hash_ctx, hash, pad, 1 + ((119 - (hash->bytes % 64)) % 64));
+    secp256k1_sha256_write(hash_ctx, hash, sizedesc, 8);
     for (i = 0; i < 8; i++) {
         secp256k1_write_be32(&out32[4*i], hash->s[i]);
         hash->s[i] = 0;
@@ -160,22 +193,22 @@ static void secp256k1_sha256_finalize(secp256k1_sha256 *hash, unsigned char *out
 
 /* Initializes a sha256 struct and writes the 64 byte string
  * SHA256(tag)||SHA256(tag) into it. */
-static void secp256k1_sha256_initialize_tagged(secp256k1_sha256 *hash, const unsigned char *tag, size_t taglen) {
+static void secp256k1_sha256_initialize_tagged(const secp256k1_hash_ctx *hash_ctx, secp256k1_sha256 *hash, const unsigned char *tag, size_t taglen) {
     unsigned char buf[32];
     secp256k1_sha256_initialize(hash);
-    secp256k1_sha256_write(hash, tag, taglen);
-    secp256k1_sha256_finalize(hash, buf);
+    secp256k1_sha256_write(hash_ctx, hash, tag, taglen);
+    secp256k1_sha256_finalize(hash_ctx, hash, buf);
 
     secp256k1_sha256_initialize(hash);
-    secp256k1_sha256_write(hash, buf, 32);
-    secp256k1_sha256_write(hash, buf, 32);
+    secp256k1_sha256_write(hash_ctx, hash, buf, 32);
+    secp256k1_sha256_write(hash_ctx, hash, buf, 32);
 }
 
 static void secp256k1_sha256_clear(secp256k1_sha256 *hash) {
     secp256k1_memclear_explicit(hash, sizeof(*hash));
 }
 
-static void secp256k1_hmac_sha256_initialize(secp256k1_hmac_sha256 *hash, const unsigned char *key, size_t keylen) {
+static void secp256k1_hmac_sha256_initialize(const secp256k1_hash_ctx *hash_ctx, secp256k1_hmac_sha256 *hash, const unsigned char *key, size_t keylen) {
     size_t n;
     unsigned char rkey[64];
     if (keylen <= sizeof(rkey)) {
@@ -184,8 +217,8 @@ static void secp256k1_hmac_sha256_initialize(secp256k1_hmac_sha256 *hash, const
     } else {
         secp256k1_sha256 sha256;
         secp256k1_sha256_initialize(&sha256);
-        secp256k1_sha256_write(&sha256, key, keylen);
-        secp256k1_sha256_finalize(&sha256, rkey);
+        secp256k1_sha256_write(hash_ctx, &sha256, key, keylen);
+        secp256k1_sha256_finalize(hash_ctx, &sha256, rkey);
         memset(rkey + 32, 0, 32);
     }
 
@@ -193,33 +226,33 @@ static void secp256k1_hmac_sha256_initialize(secp256k1_hmac_sha256 *hash, const
     for (n = 0; n < sizeof(rkey); n++) {
         rkey[n] ^= 0x5c;
     }
-    secp256k1_sha256_write(&hash->outer, rkey, sizeof(rkey));
+    secp256k1_sha256_write(hash_ctx, &hash->outer, rkey, sizeof(rkey));
 
     secp256k1_sha256_initialize(&hash->inner);
     for (n = 0; n < sizeof(rkey); n++) {
         rkey[n] ^= 0x5c ^ 0x36;
     }
-    secp256k1_sha256_write(&hash->inner, rkey, sizeof(rkey));
+    secp256k1_sha256_write(hash_ctx, &hash->inner, rkey, sizeof(rkey));
     secp256k1_memclear_explicit(rkey, sizeof(rkey));
 }
 
-static void secp256k1_hmac_sha256_write(secp256k1_hmac_sha256 *hash, const unsigned char *data, size_t size) {
-    secp256k1_sha256_write(&hash->inner, data, size);
+static void secp256k1_hmac_sha256_write(const secp256k1_hash_ctx *hash_ctx, secp256k1_hmac_sha256 *hash, const unsigned char *data, size_t size) {
+    secp256k1_sha256_write(hash_ctx, &hash->inner, data, size);
 }
 
-static void secp256k1_hmac_sha256_finalize(secp256k1_hmac_sha256 *hash, unsigned char *out32) {
+static void secp256k1_hmac_sha256_finalize(const secp256k1_hash_ctx *hash_ctx, secp256k1_hmac_sha256 *hash, unsigned char *out32) {
     unsigned char temp[32];
-    secp256k1_sha256_finalize(&hash->inner, temp);
-    secp256k1_sha256_write(&hash->outer, temp, 32);
+    secp256k1_sha256_finalize(hash_ctx, &hash->inner, temp);
+    secp256k1_sha256_write(hash_ctx, &hash->outer, temp, 32);
     secp256k1_memclear_explicit(temp, sizeof(temp));
-    secp256k1_sha256_finalize(&hash->outer, out32);
+    secp256k1_sha256_finalize(hash_ctx, &hash->outer, out32);
 }
 
 static void secp256k1_hmac_sha256_clear(secp256k1_hmac_sha256 *hash) {
     secp256k1_memclear_explicit(hash, sizeof(*hash));
 }
 
-static void secp256k1_rfc6979_hmac_sha256_initialize(secp256k1_rfc6979_hmac_sha256 *rng, const unsigned char *key, size_t keylen) {
+static void secp256k1_rfc6979_hmac_sha256_initialize(const secp256k1_hash_ctx *hash_ctx, secp256k1_rfc6979_hmac_sha256 *rng, const unsigned char *key, size_t keylen) {
     secp256k1_hmac_sha256 hmac;
     static const unsigned char zero[1] = {0x00};
     static const unsigned char one[1] = {0x01};
@@ -228,47 +261,47 @@ static void secp256k1_rfc6979_hmac_sha256_initialize(secp256k1_rfc6979_hmac_sha2
     memset(rng->k, 0x00, 32); /* RFC6979 3.2.c. */
 
     /* RFC6979 3.2.d. */
-    secp256k1_hmac_sha256_initialize(&hmac, rng->k, 32);
-    secp256k1_hmac_sha256_write(&hmac, rng->v, 32);
-    secp256k1_hmac_sha256_write(&hmac, zero, 1);
-    secp256k1_hmac_sha256_write(&hmac, key, keylen);
-    secp256k1_hmac_sha256_finalize(&hmac, rng->k);
-    secp256k1_hmac_sha256_initialize(&hmac, rng->k, 32);
-    secp256k1_hmac_sha256_write(&hmac, rng->v, 32);
-    secp256k1_hmac_sha256_finalize(&hmac, rng->v);
+    secp256k1_hmac_sha256_initialize(hash_ctx, &hmac, rng->k, 32);
+    secp256k1_hmac_sha256_write(hash_ctx, &hmac, rng->v, 32);
+    secp256k1_hmac_sha256_write(hash_ctx, &hmac, zero, 1);
+    secp256k1_hmac_sha256_write(hash_ctx, &hmac, key, keylen);
+    secp256k1_hmac_sha256_finalize(hash_ctx, &hmac, rng->k);
+    secp256k1_hmac_sha256_initialize(hash_ctx, &hmac, rng->k, 32);
+    secp256k1_hmac_sha256_write(hash_ctx, &hmac, rng->v, 32);
+    secp256k1_hmac_sha256_finalize(hash_ctx, &hmac, rng->v);
 
     /* RFC6979 3.2.f. */
-    secp256k1_hmac_sha256_initialize(&hmac, rng->k, 32);
-    secp256k1_hmac_sha256_write(&hmac, rng->v, 32);
-    secp256k1_hmac_sha256_write(&hmac, one, 1);
-    secp256k1_hmac_sha256_write(&hmac, key, keylen);
-    secp256k1_hmac_sha256_finalize(&hmac, rng->k);
-    secp256k1_hmac_sha256_initialize(&hmac, rng->k, 32);
-    secp256k1_hmac_sha256_write(&hmac, rng->v, 32);
-    secp256k1_hmac_sha256_finalize(&hmac, rng->v);
+    secp256k1_hmac_sha256_initialize(hash_ctx, &hmac, rng->k, 32);
+    secp256k1_hmac_sha256_write(hash_ctx, &hmac, rng->v, 32);
+    secp256k1_hmac_sha256_write(hash_ctx, &hmac, one, 1);
+    secp256k1_hmac_sha256_write(hash_ctx, &hmac, key, keylen);
+    secp256k1_hmac_sha256_finalize(hash_ctx, &hmac, rng->k);
+    secp256k1_hmac_sha256_initialize(hash_ctx, &hmac, rng->k, 32);
+    secp256k1_hmac_sha256_write(hash_ctx, &hmac, rng->v, 32);
+    secp256k1_hmac_sha256_finalize(hash_ctx, &hmac, rng->v);
     rng->retry = 0;
 }
 
-static void secp256k1_rfc6979_hmac_sha256_generate(secp256k1_rfc6979_hmac_sha256 *rng, unsigned char *out, size_t outlen) {
+static void secp256k1_rfc6979_hmac_sha256_generate(const secp256k1_hash_ctx *hash_ctx, secp256k1_rfc6979_hmac_sha256 *rng, unsigned char *out, size_t outlen) {
     /* RFC6979 3.2.h. */
     static const unsigned char zero[1] = {0x00};
     if (rng->retry) {
         secp256k1_hmac_sha256 hmac;
-        secp256k1_hmac_sha256_initialize(&hmac, rng->k, 32);
-        secp256k1_hmac_sha256_write(&hmac, rng->v, 32);
-        secp256k1_hmac_sha256_write(&hmac, zero, 1);
-        secp256k1_hmac_sha256_finalize(&hmac, rng->k);
-        secp256k1_hmac_sha256_initialize(&hmac, rng->k, 32);
-        secp256k1_hmac_sha256_write(&hmac, rng->v, 32);
-        secp256k1_hmac_sha256_finalize(&hmac, rng->v);
+        secp256k1_hmac_sha256_initialize(hash_ctx, &hmac, rng->k, 32);
+        secp256k1_hmac_sha256_write(hash_ctx, &hmac, rng->v, 32);
+        secp256k1_hmac_sha256_write(hash_ctx, &hmac, zero, 1);
+        secp256k1_hmac_sha256_finalize(hash_ctx, &hmac, rng->k);
+        secp256k1_hmac_sha256_initialize(hash_ctx, &hmac, rng->k, 32);
+        secp256k1_hmac_sha256_write(hash_ctx, &hmac, rng->v, 32);
+        secp256k1_hmac_sha256_finalize(hash_ctx, &hmac, rng->v);
     }
 
     while (outlen > 0) {
         secp256k1_hmac_sha256 hmac;
         size_t now = outlen;
-        secp256k1_hmac_sha256_initialize(&hmac, rng->k, 32);
-        secp256k1_hmac_sha256_write(&hmac, rng->v, 32);
-        secp256k1_hmac_sha256_finalize(&hmac, rng->v);
+        secp256k1_hmac_sha256_initialize(hash_ctx, &hmac, rng->k, 32);
+        secp256k1_hmac_sha256_write(hash_ctx, &hmac, rng->v, 32);
+        secp256k1_hmac_sha256_finalize(hash_ctx, &hmac, rng->v);
         if (now > 32) {
             now = 32;
         }
diff --git a/src/secp256k1/src/modules/ecdh/main_impl.h b/src/secp256k1/src/modules/ecdh/main_impl.h
index 9f2dfdd56a69..b0359b2c4188 100644
--- a/src/secp256k1/src/modules/ecdh/main_impl.h
+++ b/src/secp256k1/src/modules/ecdh/main_impl.h
@@ -10,20 +10,24 @@
 #include "../../../include/secp256k1_ecdh.h"
 #include "../../ecmult_const_impl.h"
 
-static int ecdh_hash_function_sha256(unsigned char *output, const unsigned char *x32, const unsigned char *y32, void *data) {
+static int ecdh_hash_function_sha256_impl(const secp256k1_hash_ctx *hash_ctx, unsigned char *output, const unsigned char *x32, const unsigned char *y32, void *data) {
     unsigned char version = (y32[31] & 0x01) | 0x02;
     secp256k1_sha256 sha;
     (void)data;
 
     secp256k1_sha256_initialize(&sha);
-    secp256k1_sha256_write(&sha, &version, 1);
-    secp256k1_sha256_write(&sha, x32, 32);
-    secp256k1_sha256_finalize(&sha, output);
+    secp256k1_sha256_write(hash_ctx, &sha, &version, 1);
+    secp256k1_sha256_write(hash_ctx, &sha, x32, 32);
+    secp256k1_sha256_finalize(hash_ctx, &sha, output);
     secp256k1_sha256_clear(&sha);
 
     return 1;
 }
 
+static int ecdh_hash_function_sha256(unsigned char *output, const unsigned char *x32, const unsigned char *y32, void *data) {
+    return ecdh_hash_function_sha256_impl(secp256k1_get_hash_context(secp256k1_context_static), output, x32, y32, data);
+}
+
 const secp256k1_ecdh_hash_function secp256k1_ecdh_hash_function_sha256 = ecdh_hash_function_sha256;
 const secp256k1_ecdh_hash_function secp256k1_ecdh_hash_function_default = ecdh_hash_function_sha256;
 
@@ -41,10 +45,6 @@ int secp256k1_ecdh(const secp256k1_context* ctx, unsigned char *output, const se
     ARG_CHECK(point != NULL);
     ARG_CHECK(scalar != NULL);
 
-    if (hashfp == NULL) {
-        hashfp = secp256k1_ecdh_hash_function_default;
-    }
-
     secp256k1_pubkey_load(ctx, &pt, point);
     secp256k1_scalar_set_b32(&s, scalar, &overflow);
 
@@ -60,7 +60,12 @@ int secp256k1_ecdh(const secp256k1_context* ctx, unsigned char *output, const se
     secp256k1_fe_get_b32(x, &pt.x);
     secp256k1_fe_get_b32(y, &pt.y);
 
-    ret = hashfp(output, x, y, data);
+    if (hashfp == NULL) {
+        /* Use ctx-aware function by default */
+        ret = ecdh_hash_function_sha256_impl(secp256k1_get_hash_context(ctx), output, x, y, data);
+    } else {
+        ret = hashfp(output, x, y, data);
+    }
 
     secp256k1_memclear_explicit(x, sizeof(x));
     secp256k1_memclear_explicit(y, sizeof(y));
diff --git a/src/secp256k1/src/modules/ecdh/tests_impl.h b/src/secp256k1/src/modules/ecdh/tests_impl.h
index cb1d953d2a3b..c75ce9ff6730 100644
--- a/src/secp256k1/src/modules/ecdh/tests_impl.h
+++ b/src/secp256k1/src/modules/ecdh/tests_impl.h
@@ -8,6 +8,7 @@
 #define SECP256K1_MODULE_ECDH_TESTS_H
 
 #include "../../unit_test.h"
+#include "../../testutil.h"
 
 static int ecdh_hash_function_test_xpassthru(unsigned char *output, const unsigned char *x, const unsigned char *y, void *data) {
     (void)y;
@@ -83,13 +84,37 @@ static void test_ecdh_generator_basepoint(void) {
         /* compute "explicitly" */
         CHECK(secp256k1_ec_pubkey_serialize(CTX, point_ser, &point_ser_len, &point[1], SECP256K1_EC_COMPRESSED) == 1);
         secp256k1_sha256_initialize(&sha);
-        secp256k1_sha256_write(&sha, point_ser, point_ser_len);
-        secp256k1_sha256_finalize(&sha, output_ser);
+        secp256k1_sha256_write(secp256k1_get_hash_context(CTX), &sha, point_ser, point_ser_len);
+        secp256k1_sha256_finalize(secp256k1_get_hash_context(CTX), &sha, output_ser);
         /* compare */
         CHECK(secp256k1_memcmp_var(output_ecdh, output_ser, 32) == 0);
     }
 }
 
+DEFINE_SHA256_TRANSFORM_PROBE(sha256_ecdh)
+static void test_ecdh_ctx_sha256(void) {
+    /* Check ctx-provided SHA256 compression override takes effect */
+    secp256k1_context *ctx = secp256k1_context_clone(CTX);
+    unsigned char out_default[65], out_custom[65];
+    const unsigned char sk[32] = {1};
+    secp256k1_pubkey pubkey;
+    CHECK(secp256k1_ec_pubkey_create(ctx, &pubkey, sk) == 1);
+
+    /* Default behavior */
+    CHECK(secp256k1_ecdh(ctx, out_default, &pubkey, sk, NULL, NULL) == 1);
+    CHECK(!sha256_ecdh_called);
+
+    /* Override SHA256 compression directly, bypassing the ctx setter sanity checks */
+    ctx->hash_ctx.fn_sha256_compression = sha256_ecdh;
+    CHECK(secp256k1_ecdh(ctx, out_custom, &pubkey, sk, NULL, NULL) == 1);
+
+    /* Outputs must differ if custom compression was used */
+    CHECK(secp256k1_memcmp_var(out_default, out_custom, 32) != 0);
+    CHECK(sha256_ecdh_called);
+
+    secp256k1_context_destroy(ctx);
+}
+
 static void test_bad_scalar(void) {
     unsigned char s_zero[32] = { 0 };
     unsigned char s_overflow[32] = { 0 };
@@ -187,6 +212,7 @@ static const struct tf_test_entry tests_ecdh[] = {
     CASE1(test_bad_scalar),
     CASE1(test_result_basepoint),
     CASE1(test_ecdh_wycheproof),
+    CASE1(test_ecdh_ctx_sha256),
 };
 
 #endif /* SECP256K1_MODULE_ECDH_TESTS_H */
diff --git a/src/secp256k1/src/modules/ellswift/main_impl.h b/src/secp256k1/src/modules/ellswift/main_impl.h
index 096f4a3c712d..27cb3db65ed9 100644
--- a/src/secp256k1/src/modules/ellswift/main_impl.h
+++ b/src/secp256k1/src/modules/ellswift/main_impl.h
@@ -307,7 +307,7 @@ static int secp256k1_ellswift_xswiftec_inv_var(secp256k1_fe *t, const secp256k1_
  * hasher is a SHA256 object to which an incrementing 4-byte counter is written to generate randomness.
  * Writing 13 bytes (4 bytes for counter, plus 9 bytes for the SHA256 padding) cannot cross a
  * 64-byte block size boundary (to make sure it only triggers a single SHA256 compression). */
-static void secp256k1_ellswift_prng(unsigned char* out32, const secp256k1_sha256 *hasher, uint32_t cnt) {
+static void secp256k1_ellswift_prng(const secp256k1_hash_ctx *hash_ctx, unsigned char* out32, const secp256k1_sha256 *hasher, uint32_t cnt) {
     secp256k1_sha256 hash = *hasher;
     unsigned char buf4[4];
 #ifdef VERIFY
@@ -317,8 +317,8 @@ static void secp256k1_ellswift_prng(unsigned char* out32, const secp256k1_sha256
     buf4[1] = cnt >> 8;
     buf4[2] = cnt >> 16;
     buf4[3] = cnt >> 24;
-    secp256k1_sha256_write(&hash, buf4, 4);
-    secp256k1_sha256_finalize(&hash, out32);
+    secp256k1_sha256_write(hash_ctx, &hash, buf4, 4);
+    secp256k1_sha256_finalize(hash_ctx, &hash, out32);
 
     /* Writing and finalizing together should trigger exactly one SHA256 compression. */
     VERIFY_CHECK(((hash.bytes) >> 6) == (blocks + 1));
@@ -330,7 +330,7 @@ static void secp256k1_ellswift_prng(unsigned char* out32, const secp256k1_sha256
  * needs encoding.
  *
  * hasher is a hasher in the secp256k1_ellswift_prng sense, with the same restrictions. */
-static void secp256k1_ellswift_xelligatorswift_var(unsigned char *u32, secp256k1_fe *t, const secp256k1_fe *x, const secp256k1_sha256 *hasher) {
+static void secp256k1_ellswift_xelligatorswift_var(const secp256k1_context *ctx, unsigned char *u32, secp256k1_fe *t, const secp256k1_fe *x, const secp256k1_sha256 *hasher) {
     /* Pool of 3-bit branch values. */
     unsigned char branch_hash[32];
     /* Number of 3-bit values in branch_hash left. */
@@ -346,14 +346,14 @@ static void secp256k1_ellswift_xelligatorswift_var(unsigned char *u32, secp256k1
         secp256k1_fe u;
         /* If the pool of branch values is empty, populate it. */
         if (branches_left == 0) {
-            secp256k1_ellswift_prng(branch_hash, hasher, cnt++);
+            secp256k1_ellswift_prng(secp256k1_get_hash_context(ctx), branch_hash, hasher, cnt++);
             branches_left = 64;
         }
         /* Take a 3-bit branch value from the branch pool (top bit is discarded). */
         --branches_left;
         branch = (branch_hash[branches_left >> 1] >> ((branches_left & 1) << 2)) & 7;
         /* Compute a new u value by hashing. */
-        secp256k1_ellswift_prng(u32, hasher, cnt++);
+        secp256k1_ellswift_prng(secp256k1_get_hash_context(ctx), u32, hasher, cnt++);
         /* overflow is not a problem (we prefer uniform u32 over uniform u). */
         secp256k1_fe_set_b32_mod(&u, u32);
         /* Since u is the output of a hash, it should practically never be 0. We could apply the
@@ -372,8 +372,8 @@ static void secp256k1_ellswift_xelligatorswift_var(unsigned char *u32, secp256k1
  * as input, and returns an encoding that matches the provided Y coordinate rather than a random
  * one.
  */
-static void secp256k1_ellswift_elligatorswift_var(unsigned char *u32, secp256k1_fe *t, const secp256k1_ge *p, const secp256k1_sha256 *hasher) {
-    secp256k1_ellswift_xelligatorswift_var(u32, t, &p->x, hasher);
+static void secp256k1_ellswift_elligatorswift_var(const secp256k1_context *ctx, unsigned char *u32, secp256k1_fe *t, const secp256k1_ge *p, const secp256k1_sha256 *hasher) {
+    secp256k1_ellswift_xelligatorswift_var(ctx, u32, t, &p->x, hasher);
     secp256k1_fe_normalize_var(t);
     if (secp256k1_fe_is_odd(t) != secp256k1_fe_is_odd(&p->y)) {
         secp256k1_fe_negate(t, t, 1);
@@ -383,17 +383,11 @@ static void secp256k1_ellswift_elligatorswift_var(unsigned char *u32, secp256k1_
 
 /** Set hash state to the BIP340 tagged hash midstate for "secp256k1_ellswift_encode". */
 static void secp256k1_ellswift_sha256_init_encode(secp256k1_sha256* hash) {
-    secp256k1_sha256_initialize(hash);
-    hash->s[0] = 0xd1a6524bul;
-    hash->s[1] = 0x028594b3ul;
-    hash->s[2] = 0x96e42f4eul;
-    hash->s[3] = 0x1037a177ul;
-    hash->s[4] = 0x1b8fcb8bul;
-    hash->s[5] = 0x56023885ul;
-    hash->s[6] = 0x2560ede1ul;
-    hash->s[7] = 0xd626b715ul;
-
-    hash->bytes = 64;
+    static const uint32_t midstate[8] = {
+        0xd1a6524bul, 0x028594b3ul, 0x96e42f4eul, 0x1037a177ul,
+        0x1b8fcb8bul, 0x56023885ul, 0x2560ede1ul, 0xd626b715ul
+    };
+    secp256k1_sha256_initialize_midstate(hash, 64, midstate);
 }
 
 int secp256k1_ellswift_encode(const secp256k1_context *ctx, unsigned char *ell64, const secp256k1_pubkey *pubkey, const unsigned char *rnd32) {
@@ -412,11 +406,11 @@ int secp256k1_ellswift_encode(const secp256k1_context *ctx, unsigned char *ell64
          * BIP340 tagged hash with tag "secp256k1_ellswift_encode". */
         secp256k1_ellswift_sha256_init_encode(&hash);
         secp256k1_eckey_pubkey_serialize33(&p, p64);
-        secp256k1_sha256_write(&hash, p64, sizeof(p64));
-        secp256k1_sha256_write(&hash, rnd32, 32);
+        secp256k1_sha256_write(secp256k1_get_hash_context(ctx), &hash, p64, sizeof(p64));
+        secp256k1_sha256_write(secp256k1_get_hash_context(ctx), &hash, rnd32, 32);
 
         /* Compute ElligatorSwift encoding and construct output. */
-        secp256k1_ellswift_elligatorswift_var(ell64, &t, &p, &hash); /* puts u in ell64[0..32] */
+        secp256k1_ellswift_elligatorswift_var(ctx, ell64, &t, &p, &hash); /* puts u in ell64[0..32] */
         secp256k1_fe_get_b32(ell64 + 32, &t); /* puts t in ell64[32..64] */
         return 1;
     }
@@ -427,17 +421,11 @@ int secp256k1_ellswift_encode(const secp256k1_context *ctx, unsigned char *ell64
 
 /** Set hash state to the BIP340 tagged hash midstate for "secp256k1_ellswift_create". */
 static void secp256k1_ellswift_sha256_init_create(secp256k1_sha256* hash) {
-    secp256k1_sha256_initialize(hash);
-    hash->s[0] = 0xd29e1bf5ul;
-    hash->s[1] = 0xf7025f42ul;
-    hash->s[2] = 0x9b024773ul;
-    hash->s[3] = 0x094cb7d5ul;
-    hash->s[4] = 0xe59ed789ul;
-    hash->s[5] = 0x03bc9786ul;
-    hash->s[6] = 0x68335b35ul;
-    hash->s[7] = 0x4e363b53ul;
-
-    hash->bytes = 64;
+    static const uint32_t midstate[8] = {
+        0xd29e1bf5ul, 0xf7025f42ul, 0x9b024773ul, 0x094cb7d5ul,
+        0xe59ed789ul, 0x03bc9786ul, 0x68335b35ul, 0x4e363b53ul
+    };
+    secp256k1_sha256_initialize_midstate(hash, 64, midstate);
 }
 
 int secp256k1_ellswift_create(const secp256k1_context *ctx, unsigned char *ell64, const unsigned char *seckey32, const unsigned char *auxrnd32) {
@@ -464,13 +452,13 @@ int secp256k1_ellswift_create(const secp256k1_context *ctx, unsigned char *ell64
     /* Set up hasher state. The used RNG is H(privkey || "\x00"*32 [|| auxrnd32] || cnt++),
      * using BIP340 tagged hash with tag "secp256k1_ellswift_create". */
     secp256k1_ellswift_sha256_init_create(&hash);
-    secp256k1_sha256_write(&hash, seckey32, 32);
-    secp256k1_sha256_write(&hash, zero32, sizeof(zero32));
+    secp256k1_sha256_write(secp256k1_get_hash_context(ctx), &hash, seckey32, 32);
+    secp256k1_sha256_write(secp256k1_get_hash_context(ctx), &hash, zero32, sizeof(zero32));
     secp256k1_declassify(ctx, &hash, sizeof(hash)); /* private key is hashed now */
-    if (auxrnd32) secp256k1_sha256_write(&hash, auxrnd32, 32);
+    if (auxrnd32) secp256k1_sha256_write(secp256k1_get_hash_context(ctx), &hash, auxrnd32, 32);
 
     /* Compute ElligatorSwift encoding and construct output. */
-    secp256k1_ellswift_elligatorswift_var(ell64, &t, &p, &hash); /* puts u in ell64[0..32] */
+    secp256k1_ellswift_elligatorswift_var(ctx, ell64, &t, &p, &hash); /* puts u in ell64[0..32] */
     secp256k1_fe_get_b32(ell64 + 32, &t); /* puts t in ell64[32..64] */
 
     secp256k1_memczero(ell64, 64, !ret);
@@ -494,50 +482,52 @@ int secp256k1_ellswift_decode(const secp256k1_context *ctx, secp256k1_pubkey *pu
     return 1;
 }
 
-static int ellswift_xdh_hash_function_prefix(unsigned char *output, const unsigned char *x32, const unsigned char *ell_a64, const unsigned char *ell_b64, void *data) {
+static int ellswift_xdh_hash_function_prefix_impl(const secp256k1_hash_ctx *hash_ctx, unsigned char *output, const unsigned char *x32, const unsigned char *ell_a64, const unsigned char *ell_b64, void *data) {
     secp256k1_sha256 sha;
 
     secp256k1_sha256_initialize(&sha);
-    secp256k1_sha256_write(&sha, data, 64);
-    secp256k1_sha256_write(&sha, ell_a64, 64);
-    secp256k1_sha256_write(&sha, ell_b64, 64);
-    secp256k1_sha256_write(&sha, x32, 32);
-    secp256k1_sha256_finalize(&sha, output);
+    secp256k1_sha256_write(hash_ctx, &sha, data, 64);
+    secp256k1_sha256_write(hash_ctx, &sha, ell_a64, 64);
+    secp256k1_sha256_write(hash_ctx, &sha, ell_b64, 64);
+    secp256k1_sha256_write(hash_ctx, &sha, x32, 32);
+    secp256k1_sha256_finalize(hash_ctx, &sha, output);
     secp256k1_sha256_clear(&sha);
 
     return 1;
 }
 
+static int ellswift_xdh_hash_function_prefix(unsigned char *output, const unsigned char *x32, const unsigned char *ell_a64, const unsigned char *ell_b64, void *data) {
+    return ellswift_xdh_hash_function_prefix_impl(secp256k1_get_hash_context(secp256k1_context_static), output, x32, ell_a64, ell_b64, data);
+}
+
 /** Set hash state to the BIP340 tagged hash midstate for "bip324_ellswift_xonly_ecdh". */
 static void secp256k1_ellswift_sha256_init_bip324(secp256k1_sha256* hash) {
-    secp256k1_sha256_initialize(hash);
-    hash->s[0] = 0x8c12d730ul;
-    hash->s[1] = 0x827bd392ul;
-    hash->s[2] = 0x9e4fb2eeul;
-    hash->s[3] = 0x207b373eul;
-    hash->s[4] = 0x2292bd7aul;
-    hash->s[5] = 0xaa5441bcul;
-    hash->s[6] = 0x15c3779ful;
-    hash->s[7] = 0xcfb52549ul;
-
-    hash->bytes = 64;
+    static const uint32_t midstate[8] = {
+        0x8c12d730ul, 0x827bd392ul, 0x9e4fb2eeul, 0x207b373eul,
+        0x2292bd7aul, 0xaa5441bcul, 0x15c3779ful, 0xcfb52549ul
+    };
+    secp256k1_sha256_initialize_midstate(hash, 64, midstate);
 }
 
-static int ellswift_xdh_hash_function_bip324(unsigned char* output, const unsigned char *x32, const unsigned char *ell_a64, const unsigned char *ell_b64, void *data) {
+static int ellswift_xdh_hash_function_bip324_impl(const secp256k1_hash_ctx *hash_ctx, unsigned char* output, const unsigned char *x32, const unsigned char *ell_a64, const unsigned char *ell_b64, void *data) {
     secp256k1_sha256 sha;
 
     (void)data;
 
     secp256k1_ellswift_sha256_init_bip324(&sha);
-    secp256k1_sha256_write(&sha, ell_a64, 64);
-    secp256k1_sha256_write(&sha, ell_b64, 64);
-    secp256k1_sha256_write(&sha, x32, 32);
-    secp256k1_sha256_finalize(&sha, output);
+    secp256k1_sha256_write(hash_ctx, &sha, ell_a64, 64);
+    secp256k1_sha256_write(hash_ctx, &sha, ell_b64, 64);
+    secp256k1_sha256_write(hash_ctx, &sha, x32, 32);
+    secp256k1_sha256_finalize(hash_ctx, &sha, output);
     secp256k1_sha256_clear(&sha);
 
     return 1;
 }
 
+static int ellswift_xdh_hash_function_bip324(unsigned char* output, const unsigned char *x32, const unsigned char *ell_a64, const unsigned char *ell_b64, void *data) {
+    return ellswift_xdh_hash_function_bip324_impl(secp256k1_get_hash_context(secp256k1_context_static), output, x32, ell_a64, ell_b64, data);
+}
+
 const secp256k1_ellswift_xdh_hash_function secp256k1_ellswift_xdh_hash_function_prefix = ellswift_xdh_hash_function_prefix;
 const secp256k1_ellswift_xdh_hash_function secp256k1_ellswift_xdh_hash_function_bip324 = ellswift_xdh_hash_function_bip324;
 
@@ -564,7 +554,7 @@ int secp256k1_ellswift_xdh(const secp256k1_context *ctx, unsigned char *output,
 
     /* Load private key (using one if invalid). */
     secp256k1_scalar_set_b32(&s, seckey32, &overflow);
-    overflow = secp256k1_scalar_is_zero(&s);
+    overflow |= secp256k1_scalar_is_zero(&s);
     secp256k1_scalar_cmov(&s, &secp256k1_scalar_one, overflow);
 
     /* Compute shared X coordinate. */
@@ -572,8 +562,14 @@ int secp256k1_ellswift_xdh(const secp256k1_context *ctx, unsigned char *output,
     secp256k1_fe_normalize(&px);
     secp256k1_fe_get_b32(sx, &px);
 
-    /* Invoke hasher */
-    ret = hashfp(output, sx, ell_a64, ell_b64, data);
+    /* Invoke hasher. Use ctx-aware function by default */
+    if (hashfp == secp256k1_ellswift_xdh_hash_function_bip324) {
+        ret = ellswift_xdh_hash_function_bip324_impl(secp256k1_get_hash_context(ctx), output, sx, ell_a64, ell_b64, data);
+    } else if (hashfp == secp256k1_ellswift_xdh_hash_function_prefix) {
+        ret = ellswift_xdh_hash_function_prefix_impl(secp256k1_get_hash_context(ctx), output, sx, ell_a64, ell_b64, data);
+    } else {
+        ret = hashfp(output, sx, ell_a64, ell_b64, data);
+    }
 
     secp256k1_memclear_explicit(sx, sizeof(sx));
     secp256k1_fe_clear(&px);
diff --git a/src/secp256k1/src/modules/ellswift/tests_impl.h b/src/secp256k1/src/modules/ellswift/tests_impl.h
index 4cc7f4b55928..7da08d50d4ff 100644
--- a/src/secp256k1/src/modules/ellswift/tests_impl.h
+++ b/src/secp256k1/src/modules/ellswift/tests_impl.h
@@ -8,6 +8,7 @@
 
 #include "../../../include/secp256k1_ellswift.h"
 #include "../../unit_test.h"
+#include "../../util.h"
 
 struct ellswift_xswiftec_inv_test {
     int enc_bitmap;
@@ -180,7 +181,7 @@ static int ellswift_xdh_hash_x32(unsigned char *output, const unsigned char *x32
 /* Run the test vectors for ellswift encoding */
 void ellswift_encoding_test_vectors_tests(void) {
     int i;
-    for (i = 0; (unsigned)i < sizeof(ellswift_xswiftec_inv_tests) / sizeof(ellswift_xswiftec_inv_tests[0]); ++i) {
+    for (i = 0; (unsigned)i < ARRAY_SIZE(ellswift_xswiftec_inv_tests); ++i) {
         const struct ellswift_xswiftec_inv_test *testcase = &ellswift_xswiftec_inv_tests[i];
         int c;
         for (c = 0; c < 8; ++c) {
@@ -200,7 +201,7 @@ void ellswift_encoding_test_vectors_tests(void) {
 /* Run the test vectors for ellswift decoding */
 void ellswift_decoding_test_vectors_tests(void) {
     int i;
-    for (i = 0; (unsigned)i < sizeof(ellswift_decode_tests) / sizeof(ellswift_decode_tests[0]); ++i) {
+    for (i = 0; (unsigned)i < ARRAY_SIZE(ellswift_decode_tests); ++i) {
         const struct ellswift_decode_test *testcase = &ellswift_decode_tests[i];
         secp256k1_pubkey pubkey;
         secp256k1_ge ge;
@@ -217,7 +218,7 @@ void ellswift_decoding_test_vectors_tests(void) {
 /* Run the test vectors for ellswift expected xdh BIP324 shared secrets */
 void ellswift_xdh_test_vectors_tests(void) {
     int i;
-    for (i = 0; (unsigned)i < sizeof(ellswift_xdh_tests_bip324) / sizeof(ellswift_xdh_tests_bip324[0]); ++i) {
+    for (i = 0; (unsigned)i < ARRAY_SIZE(ellswift_xdh_tests_bip324); ++i) {
         const struct ellswift_xdh_test *test = &ellswift_xdh_tests_bip324[i];
         unsigned char shared_secret[32];
         int ret;
@@ -431,9 +432,48 @@ void ellswift_xdh_correctness_tests(void) {
     }
 }
 
+DEFINE_SHA256_TRANSFORM_PROBE(sha256_ellswift_xdh)
+void ellswift_xdh_ctx_sha256_tests(void) {
+    /* Check ctx-provided SHA256 compression override takes effect */
+    secp256k1_context *ctx = secp256k1_context_clone(CTX);
+    unsigned char out_default[65], out_custom[65];
+    const unsigned char skA[32] = {1}, skB[32] = {2};
+    unsigned char keyA[64], keyB[64], data[64] = {0};
+    secp256k1_ellswift_xdh_hash_function hash_fn;
+    int i;
+
+    CHECK(secp256k1_ellswift_create(ctx, keyA, skA, NULL));
+    CHECK(secp256k1_ellswift_create(ctx, keyB, skB, NULL));
+
+    for (i = 0; i < 2; i++) {
+        if (i == 0) {
+            hash_fn = secp256k1_ellswift_xdh_hash_function_bip324;
+        } else {
+            hash_fn = secp256k1_ellswift_xdh_hash_function_prefix;
+        }
+        /* Default behavior. No ctx-provided SHA256 compression */
+        CHECK(secp256k1_ellswift_xdh(ctx, out_default, keyA, keyB, skA, 0, hash_fn, data));
+        CHECK(!sha256_ellswift_xdh_called);
+
+        /* Override SHA256 compression directly, bypassing the ctx setter sanity checks */
+        ctx->hash_ctx.fn_sha256_compression = sha256_ellswift_xdh;
+        CHECK(secp256k1_ellswift_xdh(ctx, out_custom, keyA, keyB, skA, 0, hash_fn, data));
+        CHECK(sha256_ellswift_xdh_called);
+        /* Outputs must differ if custom compression was used */
+        CHECK(secp256k1_memcmp_var(out_default, out_custom, 32) != 0);
+
+        /* Restore defaults */
+        sha256_ellswift_xdh_called = 0;
+        secp256k1_context_set_sha256_compression(ctx, NULL);
+    }
+
+    secp256k1_context_destroy(ctx);
+}
+
 /* Test hash initializers */
 void ellswift_hash_init_tests(void) {
     secp256k1_sha256 sha_optimized;
+    const secp256k1_hash_ctx *hash_ctx = secp256k1_get_hash_context(CTX);
     /* "secp256k1_ellswift_encode" */
     static const unsigned char encode_tag[] = {'s', 'e', 'c', 'p', '2', '5', '6', 'k', '1', '_', 'e', 'l', 'l', 's', 'w', 'i', 'f', 't', '_', 'e', 'n', 'c', 'o', 'd', 'e'};
     /* "secp256k1_ellswift_create" */
@@ -445,19 +485,46 @@ void ellswift_hash_init_tests(void) {
      * secp256k1_ellswift_sha256_init_encode has the expected
      * state. */
     secp256k1_ellswift_sha256_init_encode(&sha_optimized);
-    test_sha256_tag_midstate(&sha_optimized, encode_tag, sizeof(encode_tag));
+    test_sha256_tag_midstate(hash_ctx, &sha_optimized, encode_tag, sizeof(encode_tag));
 
     /* Check that hash initialized by
      * secp256k1_ellswift_sha256_init_create has the expected
      * state. */
     secp256k1_ellswift_sha256_init_create(&sha_optimized);
-    test_sha256_tag_midstate(&sha_optimized, create_tag, sizeof(create_tag));
+    test_sha256_tag_midstate(hash_ctx, &sha_optimized, create_tag, sizeof(create_tag));
 
     /* Check that hash initialized by
      * secp256k1_ellswift_sha256_init_bip324 has the expected
      * state. */
     secp256k1_ellswift_sha256_init_bip324(&sha_optimized);
-    test_sha256_tag_midstate(&sha_optimized, bip324_tag, sizeof(bip324_tag));
+    test_sha256_tag_midstate(hash_ctx, &sha_optimized, bip324_tag, sizeof(bip324_tag));
+}
+
+void ellswift_xdh_bad_scalar_tests(void) {
+    unsigned char s_zero[32] = { 0 };
+    unsigned char s_overflow_minus1[32] = { 0 };
+    unsigned char s_overflow_plus1[32] = { 0 };
+    unsigned char s_good[32] = { 0 };
+    unsigned char ell_a64[64], ell_b64[64];
+    unsigned char output[32];
+    secp256k1_scalar rand_scalar;
+
+    testutil_random_scalar_order(&rand_scalar);
+    secp256k1_scalar_get_b32(s_good, &rand_scalar);
+
+    CHECK(secp256k1_ellswift_create(CTX, ell_a64, s_good, NULL) == 1);
+
+    testrand256_test(ell_b64);
+    testrand256_test(ell_b64 + 32);
+
+    memcpy(s_overflow_minus1, secp256k1_group_order_bytes, 32);
+    s_overflow_minus1[31] -= 1;
+    memcpy(s_overflow_plus1, secp256k1_group_order_bytes, 32);
+    s_overflow_plus1[31] += 1;
+    CHECK(secp256k1_ellswift_xdh(CTX, output, ell_a64, ell_b64, s_zero, 0, &ellswift_xdh_hash_x32, NULL) == 0);
+    CHECK(secp256k1_ellswift_xdh(CTX, output, ell_a64, ell_b64, secp256k1_group_order_bytes, 0, &ellswift_xdh_hash_x32, NULL) == 0);
+    CHECK(secp256k1_ellswift_xdh(CTX, output, ell_a64, ell_b64, s_overflow_plus1, 0, &ellswift_xdh_hash_x32, NULL) == 0);
+    CHECK(secp256k1_ellswift_xdh(CTX, output, ell_a64, ell_b64, s_overflow_minus1, 0, &ellswift_xdh_hash_x32, NULL) == 1);
 }
 
 /* --- Test registry --- */
@@ -470,6 +537,8 @@ static const struct tf_test_entry tests_ellswift[] = {
     CASE1(ellswift_compute_shared_secret_tests),
     CASE1(ellswift_xdh_correctness_tests),
     CASE1(ellswift_hash_init_tests),
+    CASE1(ellswift_xdh_bad_scalar_tests),
+    CASE1(ellswift_xdh_ctx_sha256_tests),
 };
 
 #endif
diff --git a/src/secp256k1/src/modules/musig/keyagg.h b/src/secp256k1/src/modules/musig/keyagg.h
index a0b37252f8aa..30e77aa951d7 100644
--- a/src/secp256k1/src/modules/musig/keyagg.h
+++ b/src/secp256k1/src/modules/musig/keyagg.h
@@ -27,6 +27,6 @@ typedef struct {
 
 static int secp256k1_keyagg_cache_load(const secp256k1_context* ctx, secp256k1_keyagg_cache_internal *cache_i, const secp256k1_musig_keyagg_cache *cache);
 
-static void secp256k1_musig_keyaggcoef(secp256k1_scalar *r, const secp256k1_keyagg_cache_internal *cache_i, secp256k1_ge *pk);
+static void secp256k1_musig_keyaggcoef(const secp256k1_hash_ctx *hash_ctx, secp256k1_scalar *r, const secp256k1_keyagg_cache_internal *cache_i, secp256k1_ge *pk);
 
 #endif
diff --git a/src/secp256k1/src/modules/musig/keyagg_impl.h b/src/secp256k1/src/modules/musig/keyagg_impl.h
index e412a27eca64..f67245d56df4 100644
--- a/src/secp256k1/src/modules/musig/keyagg_impl.h
+++ b/src/secp256k1/src/modules/musig/keyagg_impl.h
@@ -62,17 +62,11 @@ static int secp256k1_keyagg_cache_load(const secp256k1_context* ctx, secp256k1_k
 /* Initializes SHA256 with fixed midstate. This midstate was computed by applying
  * SHA256 to SHA256("KeyAgg list")||SHA256("KeyAgg list"). */
 static void secp256k1_musig_keyagglist_sha256(secp256k1_sha256 *sha) {
-    secp256k1_sha256_initialize(sha);
-
-    sha->s[0] = 0xb399d5e0ul;
-    sha->s[1] = 0xc8fff302ul;
-    sha->s[2] = 0x6badac71ul;
-    sha->s[3] = 0x07c5b7f1ul;
-    sha->s[4] = 0x9701e2eful;
-    sha->s[5] = 0x2a72ecf8ul;
-    sha->s[6] = 0x201a4c7bul;
-    sha->s[7] = 0xab148a38ul;
-    sha->bytes = 64;
+    static const uint32_t midstate[8] = {
+        0xb399d5e0ul, 0xc8fff302ul, 0x6badac71ul, 0x07c5b7f1ul,
+        0x9701e2eful, 0x2a72ecf8ul, 0x201a4c7bul, 0xab148a38ul
+    };
+    secp256k1_sha256_initialize_midstate(sha, 64, midstate);
 }
 
 /* Computes pks_hash = tagged_hash(pk[0], ..., pk[np-1]) */
@@ -88,26 +82,20 @@ static int secp256k1_musig_compute_pks_hash(const secp256k1_context *ctx, unsign
             return 0;
         }
         VERIFY_CHECK(ser_len == sizeof(ser));
-        secp256k1_sha256_write(&sha, ser, sizeof(ser));
+        secp256k1_sha256_write(secp256k1_get_hash_context(ctx), &sha, ser, sizeof(ser));
     }
-    secp256k1_sha256_finalize(&sha, pks_hash);
+    secp256k1_sha256_finalize(secp256k1_get_hash_context(ctx), &sha, pks_hash);
     return 1;
 }
 
 /* Initializes SHA256 with fixed midstate. This midstate was computed by applying
  * SHA256 to SHA256("KeyAgg coefficient")||SHA256("KeyAgg coefficient"). */
 static void secp256k1_musig_keyaggcoef_sha256(secp256k1_sha256 *sha) {
-    secp256k1_sha256_initialize(sha);
-
-    sha->s[0] = 0x6ef02c5aul;
-    sha->s[1] = 0x06a480deul;
-    sha->s[2] = 0x1f298665ul;
-    sha->s[3] = 0x1d1134f2ul;
-    sha->s[4] = 0x56a0b063ul;
-    sha->s[5] = 0x52da4147ul;
-    sha->s[6] = 0xf280d9d4ul;
-    sha->s[7] = 0x4484be15ul;
-    sha->bytes = 64;
+    static const uint32_t midstate[8] = {
+        0x6ef02c5aul, 0x06a480deul, 0x1f298665ul, 0x1d1134f2ul,
+        0x56a0b063ul, 0x52da4147ul, 0xf280d9d4ul, 0x4484be15ul
+    };
+    secp256k1_sha256_initialize_midstate(sha, 64, midstate);
 }
 
 /* Compute KeyAgg coefficient which is constant 1 for the second pubkey and
@@ -115,7 +103,7 @@ static void secp256k1_musig_keyaggcoef_sha256(secp256k1_sha256 *sha) {
  * second_pk is the point at infinity in case there is no second_pk. Assumes
  * that pk is not the point at infinity and that the Y-coordinates of pk and
  * second_pk are normalized. */
-static void secp256k1_musig_keyaggcoef_internal(secp256k1_scalar *r, const unsigned char *pks_hash, secp256k1_ge *pk, const secp256k1_ge *second_pk) {
+static void secp256k1_musig_keyaggcoef_internal(const secp256k1_hash_ctx *hash_ctx, secp256k1_scalar *r, const unsigned char *pks_hash, secp256k1_ge *pk, const secp256k1_ge *second_pk) {
     VERIFY_CHECK(!secp256k1_ge_is_infinity(pk));
 
     if (!secp256k1_ge_is_infinity(second_pk)
@@ -125,20 +113,20 @@ static void secp256k1_musig_keyaggcoef_internal(secp256k1_scalar *r, const unsig
         secp256k1_sha256 sha;
         unsigned char buf[33];
         secp256k1_musig_keyaggcoef_sha256(&sha);
-        secp256k1_sha256_write(&sha, pks_hash, 32);
+        secp256k1_sha256_write(hash_ctx, &sha, pks_hash, 32);
         /* Serialization does not fail since the pk is not the point at infinity
          * (according to this function's precondition). */
         secp256k1_eckey_pubkey_serialize33(pk, buf);
-        secp256k1_sha256_write(&sha, buf, sizeof(buf));
-        secp256k1_sha256_finalize(&sha, buf);
+        secp256k1_sha256_write(hash_ctx, &sha, buf, sizeof(buf));
+        secp256k1_sha256_finalize(hash_ctx, &sha, buf);
         secp256k1_scalar_set_b32(r, buf, NULL);
     }
 }
 
 /* Assumes that pk is not the point at infinity and that the Y-coordinates of pk
  * and cache_i->second_pk are normalized. */
-static void secp256k1_musig_keyaggcoef(secp256k1_scalar *r, const secp256k1_keyagg_cache_internal *cache_i, secp256k1_ge *pk) {
-    secp256k1_musig_keyaggcoef_internal(r, cache_i->pks_hash, pk, &cache_i->second_pk);
+static void secp256k1_musig_keyaggcoef(const secp256k1_hash_ctx *hash_ctx, secp256k1_scalar *r, const secp256k1_keyagg_cache_internal *cache_i, secp256k1_ge *pk) {
+    secp256k1_musig_keyaggcoef_internal(hash_ctx, r, cache_i->pks_hash, pk, &cache_i->second_pk);
 }
 
 typedef struct {
@@ -161,7 +149,7 @@ static int secp256k1_musig_pubkey_agg_callback(secp256k1_scalar *sc, secp256k1_g
 #else
     (void) ret;
 #endif
-    secp256k1_musig_keyaggcoef_internal(sc, ctx->pks_hash, pt, &ctx->second_pk);
+    secp256k1_musig_keyaggcoef_internal(secp256k1_get_hash_context(ctx->ctx), sc, ctx->pks_hash, pt, &ctx->second_pk);
     return 1;
 }
 
diff --git a/src/secp256k1/src/modules/musig/session_impl.h b/src/secp256k1/src/modules/musig/session_impl.h
index 05c963100451..6a37bfdf8e06 100644
--- a/src/secp256k1/src/modules/musig/session_impl.h
+++ b/src/secp256k1/src/modules/musig/session_impl.h
@@ -289,54 +289,44 @@ int secp256k1_musig_partial_sig_serialize(const secp256k1_context* ctx, unsigned
 }
 
 /* Write optional inputs into the hash */
-static void secp256k1_nonce_function_musig_helper(secp256k1_sha256 *sha, unsigned int prefix_size, const unsigned char *data, unsigned char len) {
+static void secp256k1_nonce_function_musig_helper(const secp256k1_hash_ctx *hash_ctx, secp256k1_sha256 *sha, unsigned int prefix_size, const unsigned char *data, unsigned char len) {
     unsigned char zero[7] = { 0 };
     /* The spec requires length prefixes to be between 1 and 8 bytes
      * (inclusive) */
     VERIFY_CHECK(prefix_size >= 1 && prefix_size <= 8);
     /* Since the length of all input data fits in a byte, we can always pad the
      * length prefix with prefix_size - 1 zero bytes. */
-    secp256k1_sha256_write(sha, zero, prefix_size - 1);
+    secp256k1_sha256_write(hash_ctx, sha, zero, prefix_size - 1);
     if (data != NULL) {
-        secp256k1_sha256_write(sha, &len, 1);
-        secp256k1_sha256_write(sha, data, len);
+        secp256k1_sha256_write(hash_ctx, sha, &len, 1);
+        secp256k1_sha256_write(hash_ctx, sha, data, len);
     } else {
         len = 0;
-        secp256k1_sha256_write(sha, &len, 1);
+        secp256k1_sha256_write(hash_ctx, sha, &len, 1);
     }
 }
 
 /* Initializes SHA256 with fixed midstate. This midstate was computed by applying
  * SHA256 to SHA256("MuSig/aux")||SHA256("MuSig/aux"). */
 static void secp256k1_nonce_function_musig_sha256_tagged_aux(secp256k1_sha256 *sha) {
-    secp256k1_sha256_initialize(sha);
-    sha->s[0] = 0xa19e884bul;
-    sha->s[1] = 0xf463fe7eul;
-    sha->s[2] = 0x2f18f9a2ul;
-    sha->s[3] = 0xbeb0f9fful;
-    sha->s[4] = 0x0f37e8b0ul;
-    sha->s[5] = 0x06ebd26ful;
-    sha->s[6] = 0xe3b243d2ul;
-    sha->s[7] = 0x522fb150ul;
-    sha->bytes = 64;
+    static const uint32_t midstate[8] = {
+        0xa19e884bul, 0xf463fe7eul, 0x2f18f9a2ul, 0xbeb0f9fful,
+        0x0f37e8b0ul, 0x06ebd26ful, 0xe3b243d2ul, 0x522fb150ul
+    };
+    secp256k1_sha256_initialize_midstate(sha, 64, midstate);
 }
 
 /* Initializes SHA256 with fixed midstate. This midstate was computed by applying
  * SHA256 to SHA256("MuSig/nonce")||SHA256("MuSig/nonce"). */
 static void secp256k1_nonce_function_musig_sha256_tagged(secp256k1_sha256 *sha) {
-    secp256k1_sha256_initialize(sha);
-    sha->s[0] = 0x07101b64ul;
-    sha->s[1] = 0x18003414ul;
-    sha->s[2] = 0x0391bc43ul;
-    sha->s[3] = 0x0e6258eeul;
-    sha->s[4] = 0x29d26b72ul;
-    sha->s[5] = 0x8343937eul;
-    sha->s[6] = 0xb7a0a4fbul;
-    sha->s[7] = 0xff568a30ul;
-    sha->bytes = 64;
-}
-
-static void secp256k1_nonce_function_musig(secp256k1_scalar *k, const unsigned char *session_secrand, const unsigned char *msg32, const unsigned char *seckey32, const unsigned char *pk33, const unsigned char *agg_pk32, const unsigned char *extra_input32) {
+    static const uint32_t midstate[8] = {
+        0x07101b64ul, 0x18003414ul, 0x0391bc43ul, 0x0e6258eeul,
+        0x29d26b72ul, 0x8343937eul, 0xb7a0a4fbul, 0xff568a30ul
+    };
+    secp256k1_sha256_initialize_midstate(sha, 64, midstate);
+}
+
+static void secp256k1_nonce_function_musig(const secp256k1_hash_ctx *hash_ctx, secp256k1_scalar *k, const unsigned char *session_secrand, const unsigned char *msg32, const unsigned char *seckey32, const unsigned char *pk33, const unsigned char *agg_pk32, const unsigned char *extra_input32) {
     secp256k1_sha256 sha;
     unsigned char rand[32];
     unsigned char i;
@@ -344,8 +334,8 @@ static void secp256k1_nonce_function_musig(secp256k1_scalar *k, const unsigned c
 
     if (seckey32 != NULL) {
         secp256k1_nonce_function_musig_sha256_tagged_aux(&sha);
-        secp256k1_sha256_write(&sha, session_secrand, 32);
-        secp256k1_sha256_finalize(&sha, rand);
+        secp256k1_sha256_write(hash_ctx, &sha, session_secrand, 32);
+        secp256k1_sha256_finalize(hash_ctx, &sha, rand);
         for (i = 0; i < 32; i++) {
             rand[i] ^= seckey32[i];
         }
@@ -354,21 +344,21 @@ static void secp256k1_nonce_function_musig(secp256k1_scalar *k, const unsigned c
     }
 
     secp256k1_nonce_function_musig_sha256_tagged(&sha);
-    secp256k1_sha256_write(&sha, rand, sizeof(rand));
-    secp256k1_nonce_function_musig_helper(&sha, 1, pk33, 33);
-    secp256k1_nonce_function_musig_helper(&sha, 1, agg_pk32, 32);
+    secp256k1_sha256_write(hash_ctx, &sha, rand, sizeof(rand));
+    secp256k1_nonce_function_musig_helper(hash_ctx, &sha, 1, pk33, 33);
+    secp256k1_nonce_function_musig_helper(hash_ctx, &sha, 1, agg_pk32, 32);
     msg_present = msg32 != NULL;
-    secp256k1_sha256_write(&sha, &msg_present, 1);
+    secp256k1_sha256_write(hash_ctx, &sha, &msg_present, 1);
     if (msg_present) {
-        secp256k1_nonce_function_musig_helper(&sha, 8, msg32, 32);
+        secp256k1_nonce_function_musig_helper(hash_ctx, &sha, 8, msg32, 32);
     }
-    secp256k1_nonce_function_musig_helper(&sha, 4, extra_input32, 32);
+    secp256k1_nonce_function_musig_helper(hash_ctx, &sha, 4, extra_input32, 32);
 
     for (i = 0; i < 2; i++) {
         unsigned char buf[32];
         secp256k1_sha256 sha_tmp = sha;
-        secp256k1_sha256_write(&sha_tmp, &i, 1);
-        secp256k1_sha256_finalize(&sha_tmp, buf);
+        secp256k1_sha256_write(hash_ctx, &sha_tmp, &i, 1);
+        secp256k1_sha256_finalize(hash_ctx, &sha_tmp, buf);
         secp256k1_scalar_set_b32(&k[i], buf, NULL);
 
         /* Attempt to erase secret data */
@@ -417,7 +407,7 @@ static int secp256k1_musig_nonce_gen_internal(const secp256k1_context* ctx, secp
     /* A pubkey cannot be the point at infinity */
     secp256k1_eckey_pubkey_serialize33(&pk, pk_ser);
 
-    secp256k1_nonce_function_musig(k, input_nonce, msg32, seckey, pk_ser, aggpk_ser_ptr, extra_input32);
+    secp256k1_nonce_function_musig(secp256k1_get_hash_context(ctx), k, input_nonce, msg32, seckey, pk_ser, aggpk_ser_ptr, extra_input32);
     VERIFY_CHECK(!secp256k1_scalar_is_zero(&k[0]));
     VERIFY_CHECK(!secp256k1_scalar_is_zero(&k[1]));
     secp256k1_musig_secnonce_save(secnonce, k, &pk);
@@ -543,20 +533,15 @@ int secp256k1_musig_nonce_agg(const secp256k1_context* ctx, secp256k1_musig_aggn
 /* Initializes SHA256 with fixed midstate. This midstate was computed by applying
  * SHA256 to SHA256("MuSig/noncecoef")||SHA256("MuSig/noncecoef"). */
 static void secp256k1_musig_compute_noncehash_sha256_tagged(secp256k1_sha256 *sha) {
-    secp256k1_sha256_initialize(sha);
-    sha->s[0] = 0x2c7d5a45ul;
-    sha->s[1] = 0x06bf7e53ul;
-    sha->s[2] = 0x89be68a6ul;
-    sha->s[3] = 0x971254c0ul;
-    sha->s[4] = 0x60ac12d2ul;
-    sha->s[5] = 0x72846dcdul;
-    sha->s[6] = 0x6c81212ful;
-    sha->s[7] = 0xde7a2500ul;
-    sha->bytes = 64;
+    static const uint32_t midstate[8] = {
+        0x2c7d5a45ul, 0x06bf7e53ul, 0x89be68a6ul, 0x971254c0ul,
+        0x60ac12d2ul, 0x72846dcdul, 0x6c81212ful, 0xde7a2500ul
+    };
+    secp256k1_sha256_initialize_midstate(sha, 64, midstate);
 }
 
 /* tagged_hash(aggnonce[0], aggnonce[1], agg_pk, msg) */
-static void secp256k1_musig_compute_noncehash(unsigned char *noncehash, secp256k1_ge *aggnonce, const unsigned char *agg_pk32, const unsigned char *msg) {
+static void secp256k1_musig_compute_noncehash(const secp256k1_hash_ctx *hash_ctx, unsigned char *noncehash, secp256k1_ge *aggnonce, const unsigned char *agg_pk32, const unsigned char *msg) {
     unsigned char buf[33];
     secp256k1_sha256 sha;
     int i;
@@ -564,11 +549,11 @@ static void secp256k1_musig_compute_noncehash(unsigned char *noncehash, secp256k
     secp256k1_musig_compute_noncehash_sha256_tagged(&sha);
     for (i = 0; i < 2; i++) {
         secp256k1_musig_ge_serialize_ext(buf, &aggnonce[i]);
-        secp256k1_sha256_write(&sha, buf, sizeof(buf));
+        secp256k1_sha256_write(hash_ctx, &sha, buf, sizeof(buf));
     }
-    secp256k1_sha256_write(&sha, agg_pk32, 32);
-    secp256k1_sha256_write(&sha, msg, 32);
-    secp256k1_sha256_finalize(&sha, noncehash);
+    secp256k1_sha256_write(hash_ctx, &sha, agg_pk32, 32);
+    secp256k1_sha256_write(hash_ctx, &sha, msg, 32);
+    secp256k1_sha256_finalize(hash_ctx, &sha, noncehash);
 }
 
 /* out_nonce = nonce_pts[0] + b*nonce_pts[1] */
@@ -580,12 +565,12 @@ static void secp256k1_effective_nonce(secp256k1_gej *out_nonce, const secp256k1_
     secp256k1_gej_add_ge_var(out_nonce, out_nonce, &nonce_pts[0], NULL);
 }
 
-static void secp256k1_musig_nonce_process_internal(int *fin_nonce_parity, unsigned char *fin_nonce, secp256k1_scalar *b, secp256k1_ge *aggnonce_pts, const unsigned char *agg_pk32, const unsigned char *msg) {
+static void secp256k1_musig_nonce_process_internal(const secp256k1_context *ctx, int *fin_nonce_parity, unsigned char *fin_nonce, secp256k1_scalar *b, secp256k1_ge *aggnonce_pts, const unsigned char *agg_pk32, const unsigned char *msg) {
     unsigned char noncehash[32];
     secp256k1_ge fin_nonce_pt;
     secp256k1_gej fin_nonce_ptj;
 
-    secp256k1_musig_compute_noncehash(noncehash, aggnonce_pts, agg_pk32, msg);
+    secp256k1_musig_compute_noncehash(secp256k1_get_hash_context(ctx), noncehash, aggnonce_pts, agg_pk32, msg);
     secp256k1_scalar_set_b32(b, noncehash, NULL);
     /* fin_nonce = aggnonce_pts[0] + b*aggnonce_pts[1] */
     secp256k1_effective_nonce(&fin_nonce_ptj, aggnonce_pts, b);
@@ -622,8 +607,8 @@ int secp256k1_musig_nonce_process(const secp256k1_context* ctx, secp256k1_musig_
         return 0;
     }
 
-    secp256k1_musig_nonce_process_internal(&session_i.fin_nonce_parity, fin_nonce, &session_i.noncecoef, aggnonce_pts, agg_pk32, msg32);
-    secp256k1_schnorrsig_challenge(&session_i.challenge, fin_nonce, msg32, 32, agg_pk32);
+    secp256k1_musig_nonce_process_internal(ctx, &session_i.fin_nonce_parity, fin_nonce, &session_i.noncecoef, aggnonce_pts, agg_pk32, msg32);
+    secp256k1_schnorrsig_challenge(secp256k1_get_hash_context(ctx), &session_i.challenge, fin_nonce, msg32, 32, agg_pk32);
 
     /* If there is a tweak then set `challenge` times `tweak` to the `s`-part.*/
     secp256k1_scalar_set_int(&session_i.s_part, 0);
@@ -693,7 +678,7 @@ int secp256k1_musig_partial_sign(const secp256k1_context* ctx, secp256k1_musig_p
     }
 
     /* Multiply KeyAgg coefficient */
-    secp256k1_musig_keyaggcoef(&mu, &cache_i, &pk);
+    secp256k1_musig_keyaggcoef(secp256k1_get_hash_context(ctx), &mu, &cache_i, &pk);
     secp256k1_scalar_mul(&sk, &sk, &mu);
 
     if (!secp256k1_musig_session_load(ctx, &session_i, session)) {
@@ -753,7 +738,7 @@ int secp256k1_musig_partial_sig_verify(const secp256k1_context* ctx, const secp2
     /* Multiplying the challenge by the KeyAgg coefficient is equivalent
      * to multiplying the signer's public key by the coefficient, except
      * much easier to do. */
-    secp256k1_musig_keyaggcoef(&mu, &cache_i, &pkp);
+    secp256k1_musig_keyaggcoef(secp256k1_get_hash_context(ctx), &mu, &cache_i, &pkp);
     secp256k1_scalar_mul(&e, &session_i.challenge, &mu);
 
     /* Negate e if secp256k1_fe_is_odd(&cache_i.pk.y)) XOR cache_i.parity_acc.
diff --git a/src/secp256k1/src/modules/musig/tests_impl.h b/src/secp256k1/src/modules/musig/tests_impl.h
index de09c5e28078..cc6449166a78 100644
--- a/src/secp256k1/src/modules/musig/tests_impl.h
+++ b/src/secp256k1/src/modules/musig/tests_impl.h
@@ -505,12 +505,12 @@ static void musig_api_tests(void) {
     CHECK(secp256k1_musig_partial_sig_agg(CTX, pre_sig, &session, partial_sig_ptr, 2) == 1);
 }
 
-static void musig_nonce_bitflip(unsigned char **args, size_t n_flip, size_t n_bytes) {
+static void musig_nonce_bitflip(const secp256k1_hash_ctx *hash_ctx, unsigned char **args, size_t n_flip, size_t n_bytes) {
     secp256k1_scalar k1[2], k2[2];
 
-    secp256k1_nonce_function_musig(k1, args[0], args[1], args[2], args[3], args[4], args[5]);
+    secp256k1_nonce_function_musig(hash_ctx, k1, args[0], args[1], args[2], args[3], args[4], args[5]);
     testrand_flip(args[n_flip], n_bytes);
-    secp256k1_nonce_function_musig(k2, args[0], args[1], args[2], args[3], args[4], args[5]);
+    secp256k1_nonce_function_musig(hash_ctx, k2, args[0], args[1], args[2], args[3], args[4], args[5]);
     CHECK(secp256k1_scalar_eq(&k1[0], &k2[0]) == 0);
     CHECK(secp256k1_scalar_eq(&k1[1], &k2[1]) == 0);
 }
@@ -526,6 +526,7 @@ static void musig_nonce_test(void) {
     int i, j;
     secp256k1_scalar k[6][2];
 
+    const secp256k1_hash_ctx *hash_ctx = secp256k1_get_hash_context(CTX);
     testrand_bytes_test(session_secrand, sizeof(session_secrand));
     testrand_bytes_test(sk, sizeof(sk));
     testrand_bytes_test(pk, sizeof(pk));
@@ -541,12 +542,12 @@ static void musig_nonce_test(void) {
     args[4] = agg_pk;
     args[5] = extra_input;
     for (i = 0; i < COUNT; i++) {
-        musig_nonce_bitflip(args, 0, sizeof(session_secrand));
-        musig_nonce_bitflip(args, 1, sizeof(msg));
-        musig_nonce_bitflip(args, 2, sizeof(sk));
-        musig_nonce_bitflip(args, 3, sizeof(pk));
-        musig_nonce_bitflip(args, 4, sizeof(agg_pk));
-        musig_nonce_bitflip(args, 5, sizeof(extra_input));
+        musig_nonce_bitflip(hash_ctx, args, 0, sizeof(session_secrand));
+        musig_nonce_bitflip(hash_ctx, args, 1, sizeof(msg));
+        musig_nonce_bitflip(hash_ctx, args, 2, sizeof(sk));
+        musig_nonce_bitflip(hash_ctx, args, 3, sizeof(pk));
+        musig_nonce_bitflip(hash_ctx, args, 4, sizeof(agg_pk));
+        musig_nonce_bitflip(hash_ctx, args, 5, sizeof(extra_input));
     }
     /* Check that if any argument is NULL, a different nonce is produced than if
      * any other argument is NULL. */
@@ -555,12 +556,12 @@ static void musig_nonce_test(void) {
     memcpy(pk, session_secrand, sizeof(session_secrand));
     memcpy(agg_pk, session_secrand, sizeof(agg_pk));
     memcpy(extra_input, session_secrand, sizeof(extra_input));
-    secp256k1_nonce_function_musig(k[0], args[0], args[1], args[2], args[3], args[4], args[5]);
-    secp256k1_nonce_function_musig(k[1], args[0], NULL, args[2], args[3], args[4], args[5]);
-    secp256k1_nonce_function_musig(k[2], args[0], args[1], NULL, args[3], args[4], args[5]);
-    secp256k1_nonce_function_musig(k[3], args[0], args[1], args[2], NULL, args[4], args[5]);
-    secp256k1_nonce_function_musig(k[4], args[0], args[1], args[2], args[3], NULL, args[5]);
-    secp256k1_nonce_function_musig(k[5], args[0], args[1], args[2], args[3], args[4], NULL);
+    secp256k1_nonce_function_musig(hash_ctx, k[0], args[0], args[1], args[2], args[3], args[4], args[5]);
+    secp256k1_nonce_function_musig(hash_ctx, k[1], args[0], NULL, args[2], args[3], args[4], args[5]);
+    secp256k1_nonce_function_musig(hash_ctx, k[2], args[0], args[1], NULL, args[3], args[4], args[5]);
+    secp256k1_nonce_function_musig(hash_ctx, k[3], args[0], args[1], args[2], NULL, args[4], args[5]);
+    secp256k1_nonce_function_musig(hash_ctx, k[4], args[0], args[1], args[2], args[3], NULL, args[5]);
+    secp256k1_nonce_function_musig(hash_ctx, k[5], args[0], args[1], args[2], args[3], args[4], NULL);
     for (i = 0; i < 6; i++) {
         CHECK(!secp256k1_scalar_eq(&k[i][0], &k[i][1]));
         for (j = i+1; j < 6; j++) {
@@ -574,35 +575,36 @@ static void musig_nonce_test(void) {
  * state. */
 static void sha256_tag_test(void) {
     secp256k1_sha256 sha;
+    const secp256k1_hash_ctx *hash_ctx = secp256k1_get_hash_context(CTX);
     {
         /* "KeyAgg list" */
         static const unsigned char tag[] = {'K', 'e', 'y', 'A', 'g', 'g', ' ', 'l', 'i', 's', 't'};
         secp256k1_musig_keyagglist_sha256(&sha);
-        test_sha256_tag_midstate(&sha, tag, sizeof(tag));
+        test_sha256_tag_midstate(hash_ctx, &sha, tag, sizeof(tag));
     }
     {
         /* "KeyAgg coefficient" */
         static const unsigned char tag[] = {'K', 'e', 'y', 'A', 'g', 'g', ' ', 'c', 'o', 'e', 'f', 'f', 'i', 'c', 'i', 'e', 'n', 't'};
         secp256k1_musig_keyaggcoef_sha256(&sha);
-        test_sha256_tag_midstate(&sha, tag, sizeof(tag));
+        test_sha256_tag_midstate(hash_ctx, &sha, tag, sizeof(tag));
     }
     {
         /* "MuSig/aux" */
         static const unsigned char tag[] = { 'M', 'u', 'S', 'i', 'g', '/', 'a', 'u', 'x' };
         secp256k1_nonce_function_musig_sha256_tagged_aux(&sha);
-        test_sha256_tag_midstate(&sha, tag, sizeof(tag));
+        test_sha256_tag_midstate(hash_ctx, &sha, tag, sizeof(tag));
     }
     {
         /* "MuSig/nonce" */
         static const unsigned char tag[] = { 'M', 'u', 'S', 'i', 'g', '/', 'n', 'o', 'n', 'c', 'e' };
         secp256k1_nonce_function_musig_sha256_tagged(&sha);
-        test_sha256_tag_midstate(&sha, tag, sizeof(tag));
+        test_sha256_tag_midstate(hash_ctx, &sha, tag, sizeof(tag));
     }
     {
         /* "MuSig/noncecoef" */
         static const unsigned char tag[] = { 'M', 'u', 'S', 'i', 'g', '/', 'n', 'o', 'n', 'c', 'e', 'c', 'o', 'e', 'f' };
         secp256k1_musig_compute_noncehash_sha256_tagged(&sha);
-        test_sha256_tag_midstate(&sha, tag, sizeof(tag));
+        test_sha256_tag_midstate(hash_ctx, &sha, tag, sizeof(tag));
     }
 }
 
@@ -769,7 +771,7 @@ static void musig_test_vectors_keyagg(void) {
     size_t i;
     const struct musig_key_agg_vector *vector = &musig_key_agg_vector;
 
-    for (i = 0; i < sizeof(vector->valid_case)/sizeof(vector->valid_case[0]); i++) {
+    for (i = 0; i < ARRAY_SIZE(vector->valid_case); i++) {
         const struct musig_key_agg_valid_test_case *c = &vector->valid_case[i];
         enum MUSIG_ERROR error;
         secp256k1_musig_keyagg_cache keyagg_cache;
@@ -779,7 +781,7 @@ static void musig_test_vectors_keyagg(void) {
         CHECK(secp256k1_memcmp_var(agg_pk, c->expected, sizeof(agg_pk)) == 0);
     }
 
-    for (i = 0; i < sizeof(vector->error_case)/sizeof(vector->error_case[0]); i++) {
+    for (i = 0; i < ARRAY_SIZE(vector->error_case); i++) {
         const struct musig_key_agg_error_test_case *c = &vector->error_case[i];
         enum MUSIG_ERROR error;
         secp256k1_musig_keyagg_cache keyagg_cache;
@@ -793,7 +795,7 @@ static void musig_test_vectors_noncegen(void) {
     size_t i;
     const struct musig_nonce_gen_vector *vector = &musig_nonce_gen_vector;
 
-    for (i = 0; i < sizeof(vector->test_case)/sizeof(vector->test_case[0]); i++) {
+    for (i = 0; i < ARRAY_SIZE(vector->test_case); i++) {
         const struct musig_nonce_gen_test_case *c = &vector->test_case[i];
         secp256k1_musig_keyagg_cache keyagg_cache;
         secp256k1_musig_keyagg_cache *keyagg_cache_ptr = NULL;
@@ -847,7 +849,7 @@ static void musig_test_vectors_nonceagg(void) {
     int j;
     const struct musig_nonce_agg_vector *vector = &musig_nonce_agg_vector;
 
-    for (i = 0; i < sizeof(vector->valid_case)/sizeof(vector->valid_case[0]); i++) {
+    for (i = 0; i < ARRAY_SIZE(vector->valid_case); i++) {
         const struct musig_nonce_agg_test_case *c = &vector->valid_case[i];
         secp256k1_musig_pubnonce pubnonce[2];
         const secp256k1_musig_pubnonce *pubnonce_ptr[2];
@@ -862,7 +864,7 @@ static void musig_test_vectors_nonceagg(void) {
         CHECK(secp256k1_musig_aggnonce_serialize(CTX, aggnonce66, &aggnonce));
         CHECK(secp256k1_memcmp_var(aggnonce66, c->expected, 33) == 0);
     }
-    for (i = 0; i < sizeof(vector->error_case)/sizeof(vector->error_case[0]); i++) {
+    for (i = 0; i < ARRAY_SIZE(vector->error_case); i++) {
         const struct musig_nonce_agg_test_case *c = &vector->error_case[i];
         secp256k1_musig_pubnonce pubnonce[2];
         for (j = 0; j < 2; j++) {
@@ -886,7 +888,7 @@ static void musig_test_vectors_signverify(void) {
     size_t i;
     const struct musig_sign_verify_vector *vector = &musig_sign_verify_vector;
 
-    for (i = 0; i < sizeof(vector->valid_case)/sizeof(vector->valid_case[0]); i++) {
+    for (i = 0; i < ARRAY_SIZE(vector->valid_case); i++) {
         const struct musig_valid_case *c = &vector->valid_case[i];
         enum MUSIG_ERROR error;
         secp256k1_musig_keyagg_cache keyagg_cache;
@@ -914,7 +916,7 @@ static void musig_test_vectors_signverify(void) {
         CHECK(secp256k1_musig_pubnonce_parse(CTX, &pubnonce, vector->pubnonces[0]));
         CHECK(secp256k1_musig_partial_sig_verify(CTX, &partial_sig, &pubnonce, &pubkey, &keyagg_cache, &session));
     }
-    for (i = 0; i < sizeof(vector->sign_error_case)/sizeof(vector->sign_error_case[0]); i++) {
+    for (i = 0; i < ARRAY_SIZE(vector->sign_error_case); i++) {
         const struct musig_sign_error_case *c = &vector->sign_error_case[i];
         enum MUSIG_ERROR error;
         secp256k1_musig_keyagg_cache keyagg_cache;
@@ -953,7 +955,7 @@ static void musig_test_vectors_signverify(void) {
         musig_test_set_secnonce(&secnonce, vector->secnonces[c->secnonce_index], &pubkey);
         CHECK_ILLEGAL(CTX, secp256k1_musig_partial_sign(CTX, &partial_sig, &secnonce, &keypair, &keyagg_cache, &session));
     }
-    for (i = 0; i < sizeof(vector->verify_fail_case)/sizeof(vector->verify_fail_case[0]); i++) {
+    for (i = 0; i < ARRAY_SIZE(vector->verify_fail_case); i++) {
         const struct musig_verify_fail_error_case *c = &vector->verify_fail_case[i];
         enum MUSIG_ERROR error;
         secp256k1_musig_keyagg_cache keyagg_cache;
@@ -987,7 +989,7 @@ static void musig_test_vectors_signverify(void) {
         expected = c->error != MUSIG_SIG_VERIFY;
         CHECK(expected == secp256k1_musig_partial_sig_verify(CTX, &partial_sig, pubnonce, &pubkey, &keyagg_cache, &session));
     }
-    for (i = 0; i < sizeof(vector->verify_error_case)/sizeof(vector->verify_error_case[0]); i++) {
+    for (i = 0; i < ARRAY_SIZE(vector->verify_error_case); i++) {
         const struct musig_verify_fail_error_case *c = &vector->verify_error_case[i];
         enum MUSIG_ERROR error;
         secp256k1_musig_keyagg_cache keyagg_cache;
@@ -1015,7 +1017,7 @@ static void musig_test_vectors_tweak(void) {
     CHECK(secp256k1_musig_aggnonce_parse(CTX, &aggnonce, vector->aggnonce));
     CHECK(secp256k1_ec_pubkey_parse(CTX, &pubkey, vector->pubkeys[0], sizeof(vector->pubkeys[0])));
 
-    for (i = 0; i < sizeof(vector->valid_case)/sizeof(vector->valid_case[0]); i++) {
+    for (i = 0; i < ARRAY_SIZE(vector->valid_case); i++) {
         const struct musig_tweak_case *c = &vector->valid_case[i];
         enum MUSIG_ERROR error;
         secp256k1_musig_keyagg_cache keyagg_cache;
@@ -1039,7 +1041,7 @@ static void musig_test_vectors_tweak(void) {
         CHECK(secp256k1_musig_pubnonce_parse(CTX, &pubnonce, vector->pubnonces[c->nonce_indices[c->signer_index]]));
         CHECK(secp256k1_musig_partial_sig_verify(CTX, &partial_sig, &pubnonce, &pubkey, &keyagg_cache, &session));
     }
-    for (i = 0; i < sizeof(vector->error_case)/sizeof(vector->error_case[0]); i++) {
+    for (i = 0; i < ARRAY_SIZE(vector->error_case); i++) {
         const struct musig_tweak_case *c = &vector->error_case[i];
         enum MUSIG_ERROR error;
         secp256k1_musig_keyagg_cache keyagg_cache;
@@ -1052,7 +1054,7 @@ static void musig_test_vectors_sigagg(void) {
     size_t i, j;
     const struct musig_sig_agg_vector *vector = &musig_sig_agg_vector;
 
-    for (i = 0; i < sizeof(vector->valid_case)/sizeof(vector->valid_case[0]); i++) {
+    for (i = 0; i < ARRAY_SIZE(vector->valid_case); i++) {
         const struct musig_sig_agg_case *c = &vector->valid_case[i];
         enum MUSIG_ERROR error;
         unsigned char final_sig[64];
@@ -1061,8 +1063,8 @@ static void musig_test_vectors_sigagg(void) {
         secp256k1_xonly_pubkey agg_pk;
         secp256k1_musig_aggnonce aggnonce;
         secp256k1_musig_session session;
-        secp256k1_musig_partial_sig partial_sig[(sizeof(vector->psigs)/sizeof(vector->psigs[0]))];
-        const secp256k1_musig_partial_sig *partial_sig_ptr[(sizeof(vector->psigs)/sizeof(vector->psigs[0]))];
+        secp256k1_musig_partial_sig partial_sig[ARRAY_SIZE(vector->psigs)];
+        const secp256k1_musig_partial_sig *partial_sig_ptr[ARRAY_SIZE(vector->psigs)];
 
         CHECK(musig_vectors_keyagg_and_tweak(&error, &keyagg_cache, agg_pk32, vector->pubkeys, vector->tweaks, c->key_indices_len, c->key_indices, c->tweak_indices_len, c->tweak_indices, c->is_xonly));
         CHECK(secp256k1_musig_aggnonce_parse(CTX, &aggnonce, c->aggnonce));
@@ -1078,9 +1080,9 @@ static void musig_test_vectors_sigagg(void) {
         CHECK(secp256k1_xonly_pubkey_parse(CTX, &agg_pk, agg_pk32));
         CHECK(secp256k1_schnorrsig_verify(CTX, final_sig, vector->msg, sizeof(vector->msg), &agg_pk) == 1);
     }
-    for (i = 0; i < sizeof(vector->error_case)/sizeof(vector->error_case[0]); i++) {
+    for (i = 0; i < ARRAY_SIZE(vector->error_case); i++) {
         const struct musig_sig_agg_case *c = &vector->error_case[i];
-        secp256k1_musig_partial_sig partial_sig[(sizeof(vector->psigs)/sizeof(vector->psigs[0]))];
+        secp256k1_musig_partial_sig partial_sig[ARRAY_SIZE(vector->psigs)];
         for (j = 0; j < c->psig_indices_len; j++) {
             int expected = c->invalid_sig_idx != (int)j;
             CHECK(expected == secp256k1_musig_partial_sig_parse(CTX, &partial_sig[j], vector->psigs[c->psig_indices[j]]));
diff --git a/src/secp256k1/src/modules/schnorrsig/bench_impl.h b/src/secp256k1/src/modules/schnorrsig/bench_impl.h
index 93a878ede3e1..069464d0bd31 100644
--- a/src/secp256k1/src/modules/schnorrsig/bench_impl.h
+++ b/src/secp256k1/src/modules/schnorrsig/bench_impl.h
@@ -51,18 +51,18 @@ static void run_schnorrsig_bench(int iters, int argc, char** argv) {
     int d = argc == 1;
 
     data.ctx = secp256k1_context_create(SECP256K1_CONTEXT_NONE);
-    data.keypairs = (const secp256k1_keypair **)malloc(iters * sizeof(secp256k1_keypair *));
-    data.pk = (const unsigned char **)malloc(iters * sizeof(unsigned char *));
-    data.msgs = (const unsigned char **)malloc(iters * sizeof(unsigned char *));
-    data.sigs = (const unsigned char **)malloc(iters * sizeof(unsigned char *));
+    data.keypairs = malloc(iters * sizeof(secp256k1_keypair *));
+    data.pk = malloc(iters * sizeof(unsigned char *));
+    data.msgs = malloc(iters * sizeof(unsigned char *));
+    data.sigs = malloc(iters * sizeof(unsigned char *));
 
     CHECK(MSGLEN >= 4);
     for (i = 0; i < iters; i++) {
         unsigned char sk[32];
-        unsigned char *msg = (unsigned char *)malloc(MSGLEN);
-        unsigned char *sig = (unsigned char *)malloc(64);
-        secp256k1_keypair *keypair = (secp256k1_keypair *)malloc(sizeof(*keypair));
-        unsigned char *pk_char = (unsigned char *)malloc(32);
+        unsigned char *msg = malloc(MSGLEN);
+        unsigned char *sig = malloc(64);
+        secp256k1_keypair *keypair = malloc(sizeof(*keypair));
+        unsigned char *pk_char = malloc(32);
         secp256k1_xonly_pubkey pk;
         msg[0] = sk[0] = i;
         msg[1] = sk[1] = i >> 8;
diff --git a/src/secp256k1/src/modules/schnorrsig/main_impl.h b/src/secp256k1/src/modules/schnorrsig/main_impl.h
index b410b19eca16..5100557f4dd7 100644
--- a/src/secp256k1/src/modules/schnorrsig/main_impl.h
+++ b/src/secp256k1/src/modules/schnorrsig/main_impl.h
@@ -14,33 +14,21 @@
 /* Initializes SHA256 with fixed midstate. This midstate was computed by applying
  * SHA256 to SHA256("BIP0340/nonce")||SHA256("BIP0340/nonce"). */
 static void secp256k1_nonce_function_bip340_sha256_tagged(secp256k1_sha256 *sha) {
-    secp256k1_sha256_initialize(sha);
-    sha->s[0] = 0x46615b35ul;
-    sha->s[1] = 0xf4bfbff7ul;
-    sha->s[2] = 0x9f8dc671ul;
-    sha->s[3] = 0x83627ab3ul;
-    sha->s[4] = 0x60217180ul;
-    sha->s[5] = 0x57358661ul;
-    sha->s[6] = 0x21a29e54ul;
-    sha->s[7] = 0x68b07b4cul;
-
-    sha->bytes = 64;
+    static const uint32_t midstate[8] = {
+        0x46615b35ul, 0xf4bfbff7ul, 0x9f8dc671ul, 0x83627ab3ul,
+        0x60217180ul, 0x57358661ul, 0x21a29e54ul, 0x68b07b4cul
+    };
+    secp256k1_sha256_initialize_midstate(sha, 64, midstate);
 }
 
 /* Initializes SHA256 with fixed midstate. This midstate was computed by applying
  * SHA256 to SHA256("BIP0340/aux")||SHA256("BIP0340/aux"). */
 static void secp256k1_nonce_function_bip340_sha256_tagged_aux(secp256k1_sha256 *sha) {
-    secp256k1_sha256_initialize(sha);
-    sha->s[0] = 0x24dd3219ul;
-    sha->s[1] = 0x4eba7e70ul;
-    sha->s[2] = 0xca0fabb9ul;
-    sha->s[3] = 0x0fa3166dul;
-    sha->s[4] = 0x3afbe4b1ul;
-    sha->s[5] = 0x4c44df97ul;
-    sha->s[6] = 0x4aac2739ul;
-    sha->s[7] = 0x249e850aul;
-
-    sha->bytes = 64;
+    static const uint32_t midstate[8] = {
+        0x24dd3219ul, 0x4eba7e70ul, 0xca0fabb9ul, 0x0fa3166dul,
+        0x3afbe4b1ul, 0x4c44df97ul, 0x4aac2739ul, 0x249e850aul
+    };
+    secp256k1_sha256_initialize_midstate(sha, 64, midstate);
 }
 
 /* algo argument for nonce_function_bip340 to derive the nonce exactly as stated in BIP-340
@@ -49,7 +37,7 @@ static const unsigned char bip340_algo[] = {'B', 'I', 'P', '0', '3', '4', '0', '
 
 static const unsigned char schnorrsig_extraparams_magic[4] = SECP256K1_SCHNORRSIG_EXTRAPARAMS_MAGIC;
 
-static int nonce_function_bip340(unsigned char *nonce32, const unsigned char *msg, size_t msglen, const unsigned char *key32, const unsigned char *xonly_pk32, const unsigned char *algo, size_t algolen, void *data) {
+static int nonce_function_bip340_impl(const secp256k1_hash_ctx *hash_ctx, unsigned char *nonce32, const unsigned char *msg, size_t msglen, const unsigned char *key32, const unsigned char *xonly_pk32, const unsigned char *algo, size_t algolen, void *data) {
     secp256k1_sha256 sha;
     unsigned char masked_key[32];
     int i;
@@ -60,8 +48,8 @@ static int nonce_function_bip340(unsigned char *nonce32, const unsigned char *ms
 
     if (data != NULL) {
         secp256k1_nonce_function_bip340_sha256_tagged_aux(&sha);
-        secp256k1_sha256_write(&sha, data, 32);
-        secp256k1_sha256_finalize(&sha, masked_key);
+        secp256k1_sha256_write(hash_ctx, &sha, data, 32);
+        secp256k1_sha256_finalize(hash_ctx, &sha, masked_key);
         for (i = 0; i < 32; i++) {
             masked_key[i] ^= key32[i];
         }
@@ -85,48 +73,47 @@ static int nonce_function_bip340(unsigned char *nonce32, const unsigned char *ms
             && secp256k1_memcmp_var(algo, bip340_algo, algolen) == 0) {
         secp256k1_nonce_function_bip340_sha256_tagged(&sha);
     } else {
-        secp256k1_sha256_initialize_tagged(&sha, algo, algolen);
+        secp256k1_sha256_initialize_tagged(hash_ctx, &sha, algo, algolen);
     }
 
     /* Hash masked-key||pk||msg using the tagged hash as per the spec */
-    secp256k1_sha256_write(&sha, masked_key, 32);
-    secp256k1_sha256_write(&sha, xonly_pk32, 32);
-    secp256k1_sha256_write(&sha, msg, msglen);
-    secp256k1_sha256_finalize(&sha, nonce32);
+    secp256k1_sha256_write(hash_ctx, &sha, masked_key, 32);
+    secp256k1_sha256_write(hash_ctx, &sha, xonly_pk32, 32);
+    secp256k1_sha256_write(hash_ctx, &sha, msg, msglen);
+    secp256k1_sha256_finalize(hash_ctx, &sha, nonce32);
     secp256k1_sha256_clear(&sha);
     secp256k1_memclear_explicit(masked_key, sizeof(masked_key));
 
     return 1;
 }
 
+static int nonce_function_bip340(unsigned char *nonce32, const unsigned char *msg, size_t msglen, const unsigned char *key32, const unsigned char *xonly_pk32, const unsigned char *algo, size_t algolen, void *data) {
+    return nonce_function_bip340_impl(secp256k1_get_hash_context(secp256k1_context_static), nonce32, msg, msglen, key32, xonly_pk32, algo, algolen, data);
+}
+
 const secp256k1_nonce_function_hardened secp256k1_nonce_function_bip340 = nonce_function_bip340;
 
 /* Initializes SHA256 with fixed midstate. This midstate was computed by applying
  * SHA256 to SHA256("BIP0340/challenge")||SHA256("BIP0340/challenge"). */
 static void secp256k1_schnorrsig_sha256_tagged(secp256k1_sha256 *sha) {
-    secp256k1_sha256_initialize(sha);
-    sha->s[0] = 0x9cecba11ul;
-    sha->s[1] = 0x23925381ul;
-    sha->s[2] = 0x11679112ul;
-    sha->s[3] = 0xd1627e0ful;
-    sha->s[4] = 0x97c87550ul;
-    sha->s[5] = 0x003cc765ul;
-    sha->s[6] = 0x90f61164ul;
-    sha->s[7] = 0x33e9b66aul;
-    sha->bytes = 64;
+    static const uint32_t midstate[8] = {
+        0x9cecba11ul, 0x23925381ul, 0x11679112ul, 0xd1627e0ful,
+        0x97c87550ul, 0x003cc765ul, 0x90f61164ul, 0x33e9b66aul
+    };
+    secp256k1_sha256_initialize_midstate(sha, 64, midstate);
 }
 
-static void secp256k1_schnorrsig_challenge(secp256k1_scalar* e, const unsigned char *r32, const unsigned char *msg, size_t msglen, const unsigned char *pubkey32)
+static void secp256k1_schnorrsig_challenge(const secp256k1_hash_ctx *hash_ctx, secp256k1_scalar* e, const unsigned char *r32, const unsigned char *msg, size_t msglen, const unsigned char *pubkey32)
 {
     unsigned char buf[32];
     secp256k1_sha256 sha;
 
     /* tagged hash(r.x, pk.x, msg) */
     secp256k1_schnorrsig_sha256_tagged(&sha);
-    secp256k1_sha256_write(&sha, r32, 32);
-    secp256k1_sha256_write(&sha, pubkey32, 32);
-    secp256k1_sha256_write(&sha, msg, msglen);
-    secp256k1_sha256_finalize(&sha, buf);
+    secp256k1_sha256_write(hash_ctx, &sha, r32, 32);
+    secp256k1_sha256_write(hash_ctx, &sha, pubkey32, 32);
+    secp256k1_sha256_write(hash_ctx, &sha, msg, msglen);
+    secp256k1_sha256_finalize(hash_ctx, &sha, buf);
     /* Set scalar e to the challenge hash modulo the curve order as per
      * BIP340. */
     secp256k1_scalar_set_b32(e, buf, NULL);
@@ -150,10 +137,6 @@ static int secp256k1_schnorrsig_sign_internal(const secp256k1_context* ctx, unsi
     ARG_CHECK(msg != NULL || msglen == 0);
     ARG_CHECK(keypair != NULL);
 
-    if (noncefp == NULL) {
-        noncefp = secp256k1_nonce_function_bip340;
-    }
-
     ret &= secp256k1_keypair_load(ctx, &sk, &pk, keypair);
     /* Because we are signing for a x-only pubkey, the secret key is negated
      * before signing if the point corresponding to the secret key does not
@@ -164,7 +147,15 @@ static int secp256k1_schnorrsig_sign_internal(const secp256k1_context* ctx, unsi
 
     secp256k1_scalar_get_b32(seckey, &sk);
     secp256k1_fe_get_b32(pk_buf, &pk.x);
-    ret &= !!noncefp(nonce32, msg, msglen, seckey, pk_buf, bip340_algo, sizeof(bip340_algo), ndata);
+
+    /* Compute nonce */
+    if (noncefp == NULL || noncefp == secp256k1_nonce_function_bip340) {
+        /* Use context-aware nonce function by default */
+        ret &= nonce_function_bip340_impl(secp256k1_get_hash_context(ctx), nonce32, msg, msglen, seckey, pk_buf, bip340_algo, sizeof(bip340_algo), ndata);
+    } else {
+        ret &= !!noncefp(nonce32, msg, msglen, seckey, pk_buf, bip340_algo, sizeof(bip340_algo), ndata);
+    }
+
     secp256k1_scalar_set_b32(&k, nonce32, NULL);
     ret &= !secp256k1_scalar_is_zero(&k);
     secp256k1_scalar_cmov(&k, &secp256k1_scalar_one, !ret);
@@ -182,7 +173,7 @@ static int secp256k1_schnorrsig_sign_internal(const secp256k1_context* ctx, unsi
     secp256k1_fe_normalize_var(&r.x);
     secp256k1_fe_get_b32(&sig64[0], &r.x);
 
-    secp256k1_schnorrsig_challenge(&e, &sig64[0], msg, msglen, pk_buf);
+    secp256k1_schnorrsig_challenge(secp256k1_get_hash_context(ctx), &e, &sig64[0], msg, msglen, pk_buf);
     secp256k1_scalar_mul(&e, &e, &sk);
     secp256k1_scalar_add(&e, &e, &k);
     secp256k1_scalar_get_b32(&sig64[32], &e);
@@ -252,7 +243,7 @@ int secp256k1_schnorrsig_verify(const secp256k1_context* ctx, const unsigned cha
 
     /* Compute e. */
     secp256k1_fe_get_b32(buf, &pk.x);
-    secp256k1_schnorrsig_challenge(&e, &sig64[0], msg, msglen, buf);
+    secp256k1_schnorrsig_challenge(secp256k1_get_hash_context(ctx), &e, &sig64[0], msg, msglen, buf);
 
     /* Compute rj =  s*G + (-e)*pkj */
     secp256k1_scalar_negate(&e, &e);
diff --git a/src/secp256k1/src/modules/schnorrsig/tests_exhaustive_impl.h b/src/secp256k1/src/modules/schnorrsig/tests_exhaustive_impl.h
index 601b54975d01..57efe348b109 100644
--- a/src/secp256k1/src/modules/schnorrsig/tests_exhaustive_impl.h
+++ b/src/secp256k1/src/modules/schnorrsig/tests_exhaustive_impl.h
@@ -56,7 +56,7 @@ static const unsigned char invalid_pubkey_bytes[][32] = {
     }
 };
 
-#define NUM_INVALID_KEYS (sizeof(invalid_pubkey_bytes) / sizeof(invalid_pubkey_bytes[0]))
+#define NUM_INVALID_KEYS (ARRAY_SIZE(invalid_pubkey_bytes))
 
 static int secp256k1_hardened_nonce_function_smallint(unsigned char *nonce32, const unsigned char *msg,
                                                       size_t msglen,
@@ -105,7 +105,7 @@ static void test_exhaustive_schnorrsig_verify(const secp256k1_context *ctx, cons
                 secp256k1_scalar e;
                 unsigned char msg32[32];
                 testrand256(msg32);
-                secp256k1_schnorrsig_challenge(&e, sig64, msg32, sizeof(msg32), pk32);
+                secp256k1_schnorrsig_challenge(secp256k1_get_hash_context(ctx), &e, sig64, msg32, sizeof(msg32), pk32);
                 /* Only do work if we hit a challenge we haven't tried before. */
                 if (!e_done[e]) {
                     /* Iterate over the possible valid last 32 bytes in the signature.
@@ -162,7 +162,7 @@ static void test_exhaustive_schnorrsig_sign(const secp256k1_context *ctx, unsign
             while (e_count_done < EXHAUSTIVE_TEST_ORDER) {
                 secp256k1_scalar e;
                 testrand256(msg32);
-                secp256k1_schnorrsig_challenge(&e, xonly_pubkey_bytes[k - 1], msg32, sizeof(msg32), xonly_pubkey_bytes[d - 1]);
+                secp256k1_schnorrsig_challenge(secp256k1_get_hash_context(ctx), &e, xonly_pubkey_bytes[k - 1], msg32, sizeof(msg32), xonly_pubkey_bytes[d - 1]);
                 /* Only do work if we hit a challenge we haven't tried before. */
                 if (!e_done[e]) {
                     secp256k1_scalar expected_s = (actual_k + e * actual_d) % EXHAUSTIVE_TEST_ORDER;
diff --git a/src/secp256k1/src/modules/schnorrsig/tests_impl.h b/src/secp256k1/src/modules/schnorrsig/tests_impl.h
index 9a1b15f0b223..56812e7f04fd 100644
--- a/src/secp256k1/src/modules/schnorrsig/tests_impl.h
+++ b/src/secp256k1/src/modules/schnorrsig/tests_impl.h
@@ -38,18 +38,20 @@ static void run_nonce_function_bip340_tests(void) {
     unsigned char *args[5];
     int i;
 
+    const secp256k1_hash_ctx *hash_ctx = secp256k1_get_hash_context(CTX);
+
     /* Check that hash initialized by
      * secp256k1_nonce_function_bip340_sha256_tagged has the expected
      * state. */
     secp256k1_nonce_function_bip340_sha256_tagged(&sha_optimized);
-    test_sha256_tag_midstate(&sha_optimized, tag, sizeof(tag));
+    test_sha256_tag_midstate(hash_ctx, &sha_optimized, tag, sizeof(tag));
 
 
    /* Check that hash initialized by
     * secp256k1_nonce_function_bip340_sha256_tagged_aux has the expected
     * state. */
     secp256k1_nonce_function_bip340_sha256_tagged_aux(&sha_optimized);
-    test_sha256_tag_midstate(&sha_optimized, aux_tag, sizeof(aux_tag));
+    test_sha256_tag_midstate(hash_ctx, &sha_optimized, aux_tag, sizeof(aux_tag));
 
     testrand256(msg);
     testrand256(key);
@@ -162,8 +164,9 @@ static void test_schnorrsig_sha256_tagged(void) {
     unsigned char tag[] = {'B', 'I', 'P', '0', '3', '4', '0', '/', 'c', 'h', 'a', 'l', 'l', 'e', 'n', 'g', 'e'};
     secp256k1_sha256 sha;
     secp256k1_sha256 sha_optimized;
+    const secp256k1_hash_ctx *hash_ctx = secp256k1_get_hash_context(CTX);
 
-    secp256k1_sha256_initialize_tagged(&sha, (unsigned char *) tag, sizeof(tag));
+    secp256k1_sha256_initialize_tagged(hash_ctx, &sha, (unsigned char *) tag, sizeof(tag));
     secp256k1_schnorrsig_sha256_tagged(&sha_optimized);
     test_sha256_eq(&sha, &sha_optimized);
 }
@@ -849,6 +852,29 @@ static void test_schnorrsig_sign_internal(void) {
     CHECK(secp256k1_memcmp_var(sig, sig2, sizeof(sig)) == 0);
 }
 
+DEFINE_SHA256_TRANSFORM_PROBE(sha256_schnorrsig)
+static void test_schnorrsig_ctx_sha256(void) {
+    /* Check ctx-provided SHA256 compression override takes effect */
+    secp256k1_context *ctx = secp256k1_context_clone(CTX);
+    unsigned char out_default[64], out_custom[64];
+    unsigned char sk[32] = {1}, msg32[32] = {1};
+    secp256k1_keypair keypair;
+    CHECK(secp256k1_keypair_create(ctx, &keypair, sk));
+
+    /* Default behavior. No ctx-provided SHA256 compression */
+    CHECK(secp256k1_schnorrsig_sign32(ctx, out_default, msg32, &keypair, NULL));
+    CHECK(!sha256_schnorrsig_called);
+
+    /* Override SHA256 compression directly, bypassing the ctx setter sanity checks */
+    ctx->hash_ctx.fn_sha256_compression = sha256_schnorrsig;
+    CHECK(secp256k1_schnorrsig_sign32(ctx, out_custom, msg32, &keypair, NULL));
+    CHECK(sha256_schnorrsig_called);
+    /* Outputs must differ if custom compression was used */
+    CHECK(secp256k1_memcmp_var(out_default, out_custom, 64) != 0);
+
+    secp256k1_context_destroy(ctx);
+}
+
 #define N_SIGS 3
 /* Creates N_SIGS valid signatures and verifies them with verify and
  * verify_batch (TODO). Then flips some bits and checks that verification now
@@ -978,6 +1004,7 @@ static const struct tf_test_entry tests_schnorrsig[] = {
     CASE1(test_schnorrsig_sign),
     CASE1(test_schnorrsig_sign_verify),
     CASE1(test_schnorrsig_taproot),
+    CASE1(test_schnorrsig_ctx_sha256),
 };
 
 #endif
diff --git a/src/secp256k1/src/precompute_ecmult_gen.c b/src/secp256k1/src/precompute_ecmult_gen.c
index cd0fe70fc25a..a03abdb5480b 100644
--- a/src/secp256k1/src/precompute_ecmult_gen.c
+++ b/src/secp256k1/src/precompute_ecmult_gen.c
@@ -80,7 +80,7 @@ int main(int argc, char **argv) {
 
     fprintf(fp, "const secp256k1_ge_storage secp256k1_ecmult_gen_prec_table[COMB_BLOCKS][COMB_POINTS] = {\n");
     fprintf(fp, "#if 0\n");
-    for (config = 0; config < sizeof(CONFIGS) / sizeof(*CONFIGS); ++config) {
+    for (config = 0; config < ARRAY_SIZE(CONFIGS); ++config) {
         print_table(fp, CONFIGS[config][0], CONFIGS[config][1]);
         if (CONFIGS[config][0] == COMB_BLOCKS && CONFIGS[config][1] == COMB_TEETH) {
             did_current_config = 1;
diff --git a/src/secp256k1/src/secp256k1.c b/src/secp256k1/src/secp256k1.c
index ddd9849546dd..e4b80fff24c4 100644
--- a/src/secp256k1/src/secp256k1.c
+++ b/src/secp256k1/src/secp256k1.c
@@ -60,6 +60,7 @@
  * context_eq function. */
 struct secp256k1_context_struct {
     secp256k1_ecmult_gen_context ecmult_gen_ctx;
+    secp256k1_hash_ctx hash_ctx;
     secp256k1_callback illegal_callback;
     secp256k1_callback error_callback;
     int declassify;
@@ -67,6 +68,7 @@ struct secp256k1_context_struct {
 
 static const secp256k1_context secp256k1_context_static_ = {
     { 0 },
+    { secp256k1_sha256_transform },
     { secp256k1_default_illegal_callback_fn, 0 },
     { secp256k1_default_error_callback_fn, 0 },
     0
@@ -129,10 +131,11 @@ secp256k1_context* secp256k1_context_preallocated_create(void* prealloc, unsigne
     ret = (secp256k1_context*)prealloc;
     ret->illegal_callback = default_illegal_callback;
     ret->error_callback = default_error_callback;
+    secp256k1_hash_ctx_init(&ret->hash_ctx);
 
     /* Flags have been checked by secp256k1_context_preallocated_size. */
     VERIFY_CHECK((flags & SECP256K1_FLAGS_TYPE_MASK) == SECP256K1_FLAGS_TYPE_CONTEXT);
-    secp256k1_ecmult_gen_context_build(&ret->ecmult_gen_ctx);
+    secp256k1_ecmult_gen_context_build(&ret->ecmult_gen_ctx, &ret->hash_ctx);
     ret->declassify = !!(flags & SECP256K1_FLAGS_BIT_CONTEXT_DECLASSIFY);
 
     return ret;
@@ -140,7 +143,7 @@ secp256k1_context* secp256k1_context_preallocated_create(void* prealloc, unsigne
 
 secp256k1_context* secp256k1_context_create(unsigned int flags) {
     size_t const prealloc_size = secp256k1_context_preallocated_size(flags);
-    secp256k1_context* ctx = (secp256k1_context*)checked_malloc(&default_error_callback, prealloc_size);
+    secp256k1_context* ctx = checked_malloc(&default_error_callback, prealloc_size);
     if (EXPECT(secp256k1_context_preallocated_create(ctx, flags) == NULL, 0)) {
         free(ctx);
         return NULL;
@@ -168,7 +171,7 @@ secp256k1_context* secp256k1_context_clone(const secp256k1_context* ctx) {
     ARG_CHECK(secp256k1_context_is_proper(ctx));
 
     prealloc_size = secp256k1_context_preallocated_clone_size(ctx);
-    ret = (secp256k1_context*)checked_malloc(&ctx->error_callback, prealloc_size);
+    ret = checked_malloc(&ctx->error_callback, prealloc_size);
     ret = secp256k1_context_preallocated_clone(ctx, ret);
     return ret;
 }
@@ -220,6 +223,22 @@ void secp256k1_context_set_error_callback(secp256k1_context* ctx, void (*fun)(co
     ctx->error_callback.data = data;
 }
 
+void secp256k1_context_set_sha256_compression(secp256k1_context *ctx, secp256k1_sha256_compression_function fn_compression) {
+    VERIFY_CHECK(ctx != NULL);
+    ARG_CHECK_VOID(secp256k1_context_is_proper(ctx));
+    if (!fn_compression) { /* Reset hash context */
+        secp256k1_hash_ctx_init(&ctx->hash_ctx);
+        return;
+    }
+    /* Check and set */
+    ARG_CHECK_VOID(secp256k1_selftest_sha256(fn_compression));
+    ctx->hash_ctx.fn_sha256_compression = fn_compression;
+}
+
+static SECP256K1_INLINE const secp256k1_hash_ctx* secp256k1_get_hash_context(const secp256k1_context *ctx) {
+    return &ctx->hash_ctx;
+}
+
 static secp256k1_scratch_space* secp256k1_scratch_space_create(const secp256k1_context* ctx, size_t max_size) {
     VERIFY_CHECK(ctx != NULL);
     return secp256k1_scratch_create(&ctx->error_callback, max_size);
@@ -476,7 +495,7 @@ static SECP256K1_INLINE void buffer_append(unsigned char *buf, unsigned int *off
     *offset += len;
 }
 
-static int nonce_function_rfc6979(unsigned char *nonce32, const unsigned char *msg32, const unsigned char *key32, const unsigned char *algo16, void *data, unsigned int counter) {
+static int nonce_function_rfc6979_impl(const secp256k1_hash_ctx *hash_ctx, unsigned char *nonce32, const unsigned char *msg32, const unsigned char *key32, const unsigned char *algo16, void *data, unsigned int counter) {
    unsigned char keydata[112];
    unsigned int offset = 0;
    secp256k1_rfc6979_hmac_sha256 rng;
@@ -501,9 +520,9 @@ static int nonce_function_rfc6979(unsigned char *nonce32, const unsigned char *m
    if (algo16 != NULL) {
        buffer_append(keydata, &offset, algo16, 16);
    }
-   secp256k1_rfc6979_hmac_sha256_initialize(&rng, keydata, offset);
+   secp256k1_rfc6979_hmac_sha256_initialize(hash_ctx, &rng, keydata, offset);
    for (i = 0; i <= counter; i++) {
-       secp256k1_rfc6979_hmac_sha256_generate(&rng, nonce32, 32);
+       secp256k1_rfc6979_hmac_sha256_generate(hash_ctx, &rng, nonce32, 32);
    }
    secp256k1_rfc6979_hmac_sha256_finalize(&rng);
 
@@ -512,6 +531,10 @@ static int nonce_function_rfc6979(unsigned char *nonce32, const unsigned char *m
    return 1;
 }
 
+static int nonce_function_rfc6979(unsigned char *nonce32, const unsigned char *msg32, const unsigned char *key32, const unsigned char *algo16, void *data, unsigned int counter) {
+    return nonce_function_rfc6979_impl(secp256k1_get_hash_context(secp256k1_context_static), nonce32, msg32, key32, algo16, data, counter);
+}
+
 const secp256k1_nonce_function secp256k1_nonce_function_rfc6979 = nonce_function_rfc6979;
 const secp256k1_nonce_function secp256k1_nonce_function_default = nonce_function_rfc6979;
 
@@ -527,9 +550,6 @@ static int secp256k1_ecdsa_sign_inner(const secp256k1_context* ctx, secp256k1_sc
     if (recid) {
         *recid = 0;
     }
-    if (noncefp == NULL) {
-        noncefp = secp256k1_nonce_function_default;
-    }
 
     /* Fail if the secret key is invalid. */
     is_sec_valid = secp256k1_scalar_set_b32_seckey(&sec, seckey);
@@ -537,7 +557,14 @@ static int secp256k1_ecdsa_sign_inner(const secp256k1_context* ctx, secp256k1_sc
     secp256k1_scalar_set_b32(&msg, msg32, NULL);
     while (1) {
         int is_nonce_valid;
-        ret = !!noncefp(nonce32, msg32, seckey, NULL, (void*)noncedata, count);
+
+        if (noncefp == NULL) {
+            /* Use ctx-aware function by default */
+            ret = nonce_function_rfc6979_impl(secp256k1_get_hash_context(ctx), nonce32, msg32, seckey, NULL, (void*)noncedata, count);
+        } else {
+            ret = !!noncefp(nonce32, msg32, seckey, NULL, (void*)noncedata, count);
+        }
+
         if (!ret) {
             break;
         }
@@ -757,7 +784,7 @@ int secp256k1_context_randomize(secp256k1_context* ctx, const unsigned char *see
     ARG_CHECK(secp256k1_context_is_proper(ctx));
 
     if (secp256k1_ecmult_gen_context_is_built(&ctx->ecmult_gen_ctx)) {
-        secp256k1_ecmult_gen_blind(&ctx->ecmult_gen_ctx, seed32);
+        secp256k1_ecmult_gen_blind(&ctx->ecmult_gen_ctx, secp256k1_get_hash_context(ctx), seed32);
     }
     return 1;
 }
@@ -795,9 +822,9 @@ int secp256k1_tagged_sha256(const secp256k1_context* ctx, unsigned char *hash32,
     ARG_CHECK(tag != NULL);
     ARG_CHECK(msg != NULL);
 
-    secp256k1_sha256_initialize_tagged(&sha, tag, taglen);
-    secp256k1_sha256_write(&sha, msg, msglen);
-    secp256k1_sha256_finalize(&sha, hash32);
+    secp256k1_sha256_initialize_tagged(secp256k1_get_hash_context(ctx), &sha, tag, taglen);
+    secp256k1_sha256_write(secp256k1_get_hash_context(ctx), &sha, msg, msglen);
+    secp256k1_sha256_finalize(secp256k1_get_hash_context(ctx), &sha, hash32);
     secp256k1_sha256_clear(&sha);
     return 1;
 }
diff --git a/src/secp256k1/src/selftest.h b/src/secp256k1/src/selftest.h
index d083ac952481..de0e0597f50b 100644
--- a/src/secp256k1/src/selftest.h
+++ b/src/secp256k1/src/selftest.h
@@ -11,7 +11,8 @@
 
 #include <string.h>
 
-static int secp256k1_selftest_sha256(void) {
+static int secp256k1_selftest_sha256(secp256k1_sha256_compression_function fn_compression) {
+    secp256k1_hash_ctx hash_ctx;
     static const char *input63 = "For this sample, this 63-byte string will be used as input data";
     static const unsigned char output32[32] = {
         0xf0, 0x8a, 0x78, 0xcb, 0xba, 0xee, 0x08, 0x2b, 0x05, 0x2a, 0xe0, 0x70, 0x8f, 0x32, 0xfa, 0x1e,
@@ -20,13 +21,15 @@ static int secp256k1_selftest_sha256(void) {
     unsigned char out[32];
     secp256k1_sha256 hasher;
     secp256k1_sha256_initialize(&hasher);
-    secp256k1_sha256_write(&hasher, (const unsigned char*)input63, 63);
-    secp256k1_sha256_finalize(&hasher, out);
+    hash_ctx.fn_sha256_compression = fn_compression;
+    secp256k1_sha256_write(&hash_ctx, &hasher, (const unsigned char*)input63, 63);
+    secp256k1_sha256_finalize(&hash_ctx, &hasher, out);
     return secp256k1_memcmp_var(out, output32, 32) == 0;
 }
 
 static int secp256k1_selftest_passes(void) {
-    return secp256k1_selftest_sha256();
+    /* Use default sha256 compression */
+    return secp256k1_selftest_sha256(secp256k1_sha256_transform);
 }
 
 #endif /* SECP256K1_SELFTEST_H */
diff --git a/src/secp256k1/src/testrand.h b/src/secp256k1/src/testrand.h
index 3c1ed3d45dcc..215b6fc7689d 100644
--- a/src/secp256k1/src/testrand.h
+++ b/src/secp256k1/src/testrand.h
@@ -42,7 +42,4 @@ static void testrand_flip(unsigned char *b, size_t len);
 /** Initialize the test RNG using (hex encoded) array up to 16 bytes, or randomly if hexseed is NULL. */
 static void testrand_init(const char* hexseed);
 
-/** Print final test information. */
-static void testrand_finish(void);
-
 #endif /* SECP256K1_TESTRAND_H */
diff --git a/src/secp256k1/src/testrand_impl.h b/src/secp256k1/src/testrand_impl.h
index b84f5730a91e..58e71e1071cc 100644
--- a/src/secp256k1/src/testrand_impl.h
+++ b/src/secp256k1/src/testrand_impl.h
@@ -22,12 +22,13 @@ SECP256K1_INLINE static void testrand_seed(const unsigned char *seed16) {
     unsigned char out32[32];
     secp256k1_sha256 hash;
     int i;
+    const secp256k1_hash_ctx *hash_ctx = secp256k1_get_hash_context(secp256k1_context_static);
 
     /* Use SHA256(PREFIX || seed16) as initial state. */
     secp256k1_sha256_initialize(&hash);
-    secp256k1_sha256_write(&hash, PREFIX, sizeof(PREFIX));
-    secp256k1_sha256_write(&hash, seed16, 16);
-    secp256k1_sha256_finalize(&hash, out32);
+    secp256k1_sha256_write(hash_ctx, &hash, PREFIX, sizeof(PREFIX));
+    secp256k1_sha256_write(hash_ctx, &hash, seed16, 16);
+    secp256k1_sha256_finalize(hash_ctx, &hash, out32);
     for (i = 0; i < 4; ++i) {
         uint64_t s = 0;
         int j;
@@ -158,10 +159,4 @@ static void testrand_init(const char* hexseed) {
     testrand_seed(seed16);
 }
 
-static void testrand_finish(void) {
-    unsigned char run32[32];
-    testrand256(run32);
-    printf("random run = %02x%02x%02x%02x%02x%02x%02x%02x%02x%02x%02x%02x%02x%02x%02x%02x\n", run32[0], run32[1], run32[2], run32[3], run32[4], run32[5], run32[6], run32[7], run32[8], run32[9], run32[10], run32[11], run32[12], run32[13], run32[14], run32[15]);
-}
-
 #endif /* SECP256K1_TESTRAND_IMPL_H */
diff --git a/src/secp256k1/src/tests.c b/src/secp256k1/src/tests.c
index e09f5c7d2316..862bef61a7ca 100644
--- a/src/secp256k1/src/tests.c
+++ b/src/secp256k1/src/tests.c
@@ -92,7 +92,7 @@ static void run_xoshiro256pp_tests(void) {
     {
         size_t i;
         /* Sanity check that we run before the actual seeding. */
-        for (i = 0; i < sizeof(secp256k1_test_state)/sizeof(secp256k1_test_state[0]); i++) {
+        for (i = 0; i < ARRAY_SIZE(secp256k1_test_state); i++) {
             CHECK(secp256k1_test_state[i] == 0);
         }
     }
@@ -132,6 +132,7 @@ static int ecmult_gen_context_eq(const secp256k1_ecmult_gen_context *a, const se
 static int context_eq(const secp256k1_context *a, const secp256k1_context *b) {
     return a->declassify == b->declassify
             && ecmult_gen_context_eq(&a->ecmult_gen_ctx, &b->ecmult_gen_ctx)
+            && a->hash_ctx.fn_sha256_compression == b->hash_ctx.fn_sha256_compression
             && a->illegal_callback.fn == b->illegal_callback.fn
             && a->illegal_callback.data == b->illegal_callback.data
             && a->error_callback.fn == b->error_callback.fn
@@ -146,7 +147,7 @@ static void run_deprecated_context_flags_test(void) {
                              SECP256K1_CONTEXT_SIGN | SECP256K1_CONTEXT_VERIFY };
     secp256k1_context *none_ctx = secp256k1_context_create(SECP256K1_CONTEXT_NONE);
     int i;
-    for (i = 0; i < (int)(sizeof(flags)/sizeof(flags[0])); i++) {
+    for (i = 0; i < (int)(ARRAY_SIZE(flags)); i++) {
         secp256k1_context *tmp_ctx;
         CHECK(secp256k1_context_preallocated_size(SECP256K1_CONTEXT_NONE) == secp256k1_context_preallocated_size(flags[i]));
         tmp_ctx = secp256k1_context_create(flags[i]);
@@ -432,18 +433,158 @@ static void run_scratch_tests(void) {
     secp256k1_scratch_space_destroy(CTX, NULL); /* no-op */
 }
 
+/* A compression function that does nothing */
+static void invalid_sha256_compression(uint32_t *s, const unsigned char *msg, size_t rounds) {
+    (void)s; (void)msg; (void)rounds;
+}
+
+static int own_transform_called = 0;
+static void good_sha256_compression(uint32_t *s, const unsigned char *msg, size_t rounds) {
+    own_transform_called = 1;
+    secp256k1_sha256_transform(s, msg, rounds);
+}
+
+static void run_plug_sha256_compression_tests(void) {
+    secp256k1_context *ctx, *ctx_cloned;
+    secp256k1_sha256 sha;
+    unsigned char sha_out[32];
+    /* 1) Verify the context is initialized with the default compression function */
+    ctx = secp256k1_context_create(SECP256K1_CONTEXT_NONE);
+    CHECK(ctx->hash_ctx.fn_sha256_compression == secp256k1_sha256_transform);
+
+    /* 2) Verify providing a bad compression function fails during set */
+    CHECK_ILLEGAL_VOID(ctx, secp256k1_context_set_sha256_compression(ctx, invalid_sha256_compression));
+    CHECK(ctx->hash_ctx.fn_sha256_compression == secp256k1_sha256_transform);
+
+    /* 3) Provide sha256 to ctx and verify it is called when provided */
+    own_transform_called = 0;
+    secp256k1_context_set_sha256_compression(ctx, good_sha256_compression);
+    CHECK(own_transform_called);
+
+    /* 4) Verify callback makes it across clone */
+    ctx_cloned = secp256k1_context_clone(ctx);
+    CHECK(ctx_cloned->hash_ctx.fn_sha256_compression == good_sha256_compression);
+
+    /* 5) A hash operation should invoke the installed callback */
+    own_transform_called = 0;
+    secp256k1_sha256_initialize(&sha);
+    secp256k1_sha256_write(secp256k1_get_hash_context(ctx), &sha, (const unsigned char*)"a", 1);
+    secp256k1_sha256_finalize(secp256k1_get_hash_context(ctx), &sha, sha_out);
+    CHECK(own_transform_called);
+
+    /* 6) Unset sha256 and verify the default one is set again */
+    secp256k1_context_set_sha256_compression(ctx, NULL);
+    CHECK(ctx->hash_ctx.fn_sha256_compression == secp256k1_sha256_transform);
+
+    secp256k1_context_destroy(ctx);
+    secp256k1_context_destroy(ctx_cloned);
+}
+
+static void run_sha256_multi_block_compression_tests(void) {
+    secp256k1_hash_ctx hash_ctx;
+    secp256k1_sha256 sha256_one;
+    secp256k1_sha256 sha256_two;
+    unsigned char out_one[32], out_two[32];
+
+    hash_ctx.fn_sha256_compression = secp256k1_sha256_transform;
+
+    {   /* 1) Writing one 64-byte full block vs two 32-byte blocks */
+        const unsigned char data[64] = "totally serious test message to hash, definitely no random data";
+        unsigned char data32[32];
+
+        secp256k1_sha256_initialize(&sha256_one);
+        secp256k1_sha256_initialize(&sha256_two);
+
+        /* Write the 64-byte block */
+        secp256k1_sha256_write(&hash_ctx, &sha256_one, data, 64);
+        secp256k1_sha256_finalize(&hash_ctx, &sha256_one, out_one);
+
+        /* Write the two 32-byte blocks */
+        memcpy(data32, data, 32);
+        secp256k1_sha256_write(&hash_ctx, &sha256_two, data32, 32);
+        memcpy(data32, data + 32, 32);
+        secp256k1_sha256_write(&hash_ctx, &sha256_two, data32, 32);
+        secp256k1_sha256_finalize(&hash_ctx, &sha256_two, out_two);
+
+        CHECK(secp256k1_memcmp_var(out_one, out_two, 32) == 0);
+    }
+
+    {   /* 2) Writing one 80-byte block vs two 40-byte blocks */
+        const unsigned char data[80] = "Genesis: The Times 03/Jan/2009 Chancellor on brink of second bailout for banks ";
+        unsigned char data40[40];
+
+        secp256k1_sha256_initialize(&sha256_one);
+        secp256k1_sha256_initialize(&sha256_two);
+
+        /* Write the 80-byte block */
+        secp256k1_sha256_write(&hash_ctx, &sha256_one, data, 80);
+        secp256k1_sha256_finalize(&hash_ctx, &sha256_one, out_one);
+
+        /* Write the two 40-byte blocks */
+        memcpy(data40, data, 40);
+        secp256k1_sha256_write(&hash_ctx, &sha256_two, data40, 40);
+        memcpy(data40, data + 40, 40);
+        secp256k1_sha256_write(&hash_ctx, &sha256_two, data40, 40);
+        secp256k1_sha256_finalize(&hash_ctx, &sha256_two, out_two);
+
+        CHECK(secp256k1_memcmp_var(out_one, out_two, 32) == 0);
+    }
+
+    {   /* 3) Writing multiple consecutive full blocks in one write (128 bytes) */
+        unsigned char data[128];
+        unsigned char i;
+        for (i = 0; i < 128; i++) data[i] = i;
+
+        secp256k1_sha256_initialize(&sha256_one);
+        secp256k1_sha256_initialize(&sha256_two);
+
+        /* Single write of 128 bytes (two full 64-byte blocks) */
+        secp256k1_sha256_write(&hash_ctx, &sha256_one, data, 128);
+        secp256k1_sha256_finalize(&hash_ctx, &sha256_one, out_one);
+
+        /* Two separate writes of 64 bytes each */
+        secp256k1_sha256_write(&hash_ctx, &sha256_two, data, 64);
+        secp256k1_sha256_write(&hash_ctx, &sha256_two, data + 64, 64);
+        secp256k1_sha256_finalize(&hash_ctx, &sha256_two, out_two);
+
+        CHECK(secp256k1_memcmp_var(out_one, out_two, 32) == 0);
+    }
+
+    {   /* 4) Mixed small + large writes in sequence */
+        unsigned char data[150];
+        unsigned char i;
+        for (i = 0; i < 150; i++) data[i] = i;
+
+        secp256k1_sha256_initialize(&sha256_one);
+        secp256k1_sha256_initialize(&sha256_two);
+
+        /* Single write of 150 bytes */
+        secp256k1_sha256_write(&hash_ctx, &sha256_one, data, 150);
+        secp256k1_sha256_finalize(&hash_ctx, &sha256_one, out_one);
+
+        /* Split writes: 10, 64, 64, 12 bytes */
+        secp256k1_sha256_write(&hash_ctx, &sha256_two, data, 10);
+        secp256k1_sha256_write(&hash_ctx, &sha256_two, data + 10, 64);
+        secp256k1_sha256_write(&hash_ctx, &sha256_two, data + 74, 64);
+        secp256k1_sha256_write(&hash_ctx, &sha256_two, data + 138, 12);
+        secp256k1_sha256_finalize(&hash_ctx, &sha256_two, out_two);
+
+        CHECK(secp256k1_memcmp_var(out_one, out_two, 32) == 0);
+    }
+}
+
 static void run_ctz_tests(void) {
     static const uint32_t b32[] = {1, 0xffffffff, 0x5e56968f, 0xe0d63129};
     static const uint64_t b64[] = {1, 0xffffffffffffffff, 0xbcd02462139b3fc3, 0x98b5f80c769693ef};
     int shift;
     unsigned i;
-    for (i = 0; i < sizeof(b32) / sizeof(b32[0]); ++i) {
+    for (i = 0; i < ARRAY_SIZE(b32); ++i) {
         for (shift = 0; shift < 32; ++shift) {
             CHECK(secp256k1_ctz32_var_debruijn(b32[i] << shift) == shift);
             CHECK(secp256k1_ctz32_var(b32[i] << shift) == shift);
         }
     }
-    for (i = 0; i < sizeof(b64) / sizeof(b64[0]); ++i) {
+    for (i = 0; i < ARRAY_SIZE(b64); ++i) {
         for (shift = 0; shift < 64; ++shift) {
             CHECK(secp256k1_ctz64_var_debruijn(b64[i] << shift) == shift);
             CHECK(secp256k1_ctz64_var(b64[i] << shift) == shift);
@@ -454,6 +595,7 @@ static void run_ctz_tests(void) {
 /***** HASH TESTS *****/
 
 static void run_sha256_known_output_tests(void) {
+    const secp256k1_hash_ctx *hash_ctx = secp256k1_get_hash_context(CTX);
     static const char *inputs[] = {
         "", "abc", "message digest", "secure hash algorithm", "SHA256 is considered to be safe",
         "abcdbcdecdefdefgefghfghighijhijkijkljklmklmnlmnomnopnopq",
@@ -478,7 +620,7 @@ static void run_sha256_known_output_tests(void) {
     unsigned int i, ninputs;
 
     /* Skip last input vector for low iteration counts */
-    ninputs = sizeof(inputs)/sizeof(inputs[0]) - 1;
+    ninputs = ARRAY_SIZE(inputs) - 1;
     CONDITIONAL_TEST(16, "run_sha256_known_output_tests 1000000") ninputs++;
 
     for (i = 0; i < ninputs; i++) {
@@ -489,10 +631,10 @@ static void run_sha256_known_output_tests(void) {
         j = repeat[i];
         secp256k1_sha256_initialize(&hasher);
         while (j > 0) {
-            secp256k1_sha256_write(&hasher, (const unsigned char*)(inputs[i]), strlen(inputs[i]));
+            secp256k1_sha256_write(hash_ctx, &hasher, (const unsigned char*)(inputs[i]), strlen(inputs[i]));
             j--;
         }
-        secp256k1_sha256_finalize(&hasher, out);
+        secp256k1_sha256_finalize(hash_ctx, &hasher, out);
         CHECK(secp256k1_memcmp_var(out, outputs[i], 32) == 0);
         /* 2. Run: split the input bytestrings randomly before writing */
         if (strlen(inputs[i]) > 0) {
@@ -500,11 +642,11 @@ static void run_sha256_known_output_tests(void) {
             secp256k1_sha256_initialize(&hasher);
             j = repeat[i];
             while (j > 0) {
-                secp256k1_sha256_write(&hasher, (const unsigned char*)(inputs[i]), split);
-                secp256k1_sha256_write(&hasher, (const unsigned char*)(inputs[i] + split), strlen(inputs[i]) - split);
+                secp256k1_sha256_write(hash_ctx, &hasher, (const unsigned char*)(inputs[i]), split);
+                secp256k1_sha256_write(hash_ctx, &hasher, (const unsigned char*)(inputs[i] + split), strlen(inputs[i]) - split);
                 j--;
             }
-            secp256k1_sha256_finalize(&hasher, out);
+            secp256k1_sha256_finalize(hash_ctx, &hasher, out);
             CHECK(secp256k1_memcmp_var(out, outputs[i], 32) == 0);
         }
     }
@@ -602,12 +744,13 @@ static void run_sha256_counter_tests(void) {
         {0x2c, 0xf3, 0xa9, 0xf6, 0x15, 0x25, 0x80, 0x70, 0x76, 0x99, 0x7d, 0xf1, 0xc3, 0x2f, 0xa3, 0x31, 0xff, 0x92, 0x35, 0x2e, 0x8d, 0x04, 0x13, 0x33, 0xd8, 0x0d, 0xdb, 0x4a, 0xf6, 0x8c, 0x03, 0x34},
         {0xec, 0x12, 0x24, 0x9f, 0x35, 0xa4, 0x29, 0x8b, 0x9e, 0x4a, 0x95, 0xf8, 0x61, 0xaf, 0x61, 0xc5, 0x66, 0x55, 0x3e, 0x3f, 0x2a, 0x98, 0xea, 0x71, 0x16, 0x6b, 0x1c, 0xd9, 0xe4, 0x09, 0xd2, 0x8e},
     };
+    const secp256k1_hash_ctx *hash_ctx = secp256k1_get_hash_context(CTX);
     unsigned int i;
-    for (i = 0; i < sizeof(midstates)/sizeof(midstates[0]); i++) {
+    for (i = 0; i < ARRAY_SIZE(midstates); i++) {
         unsigned char out[32];
         secp256k1_sha256 hasher = midstates[i];
-        secp256k1_sha256_write(&hasher, (const unsigned char*)input, strlen(input));
-        secp256k1_sha256_finalize(&hasher, out);
+        secp256k1_sha256_write(hash_ctx, &hasher, (const unsigned char*)input, strlen(input));
+        secp256k1_sha256_finalize(hash_ctx, &hasher, out);
         CHECK(secp256k1_memcmp_var(out, outputs[i], 32) == 0);
     }
 }
@@ -624,9 +767,9 @@ static void test_sha256_eq(const secp256k1_sha256 *sha1, const secp256k1_sha256
 }
 /* Convenience function for using test_sha256_eq to verify the correctness of a
  * tagged hash midstate. This function is used by some module tests. */
-static void test_sha256_tag_midstate(secp256k1_sha256 *sha_tagged, const unsigned char *tag, size_t taglen) {
+static void test_sha256_tag_midstate(const secp256k1_hash_ctx *hash_ctx, secp256k1_sha256 *sha_tagged, const unsigned char *tag, size_t taglen) {
     secp256k1_sha256 sha;
-    secp256k1_sha256_initialize_tagged(&sha, tag, taglen);
+    secp256k1_sha256_initialize_tagged(hash_ctx, &sha, tag, taglen);
     test_sha256_eq(&sha, sha_tagged);
 }
 
@@ -656,19 +799,20 @@ static void run_hmac_sha256_tests(void) {
         {0x9b, 0x09, 0xff, 0xa7, 0x1b, 0x94, 0x2f, 0xcb, 0x27, 0x63, 0x5f, 0xbc, 0xd5, 0xb0, 0xe9, 0x44, 0xbf, 0xdc, 0x63, 0x64, 0x4f, 0x07, 0x13, 0x93, 0x8a, 0x7f, 0x51, 0x53, 0x5c, 0x3a, 0x35, 0xe2}
     };
     int i;
+    const secp256k1_hash_ctx *hash_ctx = secp256k1_get_hash_context(CTX);
     for (i = 0; i < 6; i++) {
         secp256k1_hmac_sha256 hasher;
         unsigned char out[32];
-        secp256k1_hmac_sha256_initialize(&hasher, (const unsigned char*)(keys[i]), strlen(keys[i]));
-        secp256k1_hmac_sha256_write(&hasher, (const unsigned char*)(inputs[i]), strlen(inputs[i]));
-        secp256k1_hmac_sha256_finalize(&hasher, out);
+        secp256k1_hmac_sha256_initialize(hash_ctx, &hasher, (const unsigned char*)(keys[i]), strlen(keys[i]));
+        secp256k1_hmac_sha256_write(hash_ctx, &hasher, (const unsigned char*)(inputs[i]), strlen(inputs[i]));
+        secp256k1_hmac_sha256_finalize(hash_ctx, &hasher, out);
         CHECK(secp256k1_memcmp_var(out, outputs[i], 32) == 0);
         if (strlen(inputs[i]) > 0) {
             int split = testrand_int(strlen(inputs[i]));
-            secp256k1_hmac_sha256_initialize(&hasher, (const unsigned char*)(keys[i]), strlen(keys[i]));
-            secp256k1_hmac_sha256_write(&hasher, (const unsigned char*)(inputs[i]), split);
-            secp256k1_hmac_sha256_write(&hasher, (const unsigned char*)(inputs[i] + split), strlen(inputs[i]) - split);
-            secp256k1_hmac_sha256_finalize(&hasher, out);
+            secp256k1_hmac_sha256_initialize(hash_ctx, &hasher, (const unsigned char*)(keys[i]), strlen(keys[i]));
+            secp256k1_hmac_sha256_write(hash_ctx, &hasher, (const unsigned char*)(inputs[i]), split);
+            secp256k1_hmac_sha256_write(hash_ctx, &hasher, (const unsigned char*)(inputs[i] + split), strlen(inputs[i]) - split);
+            secp256k1_hmac_sha256_finalize(hash_ctx, &hasher, out);
             CHECK(secp256k1_memcmp_var(out, outputs[i], 32) == 0);
         }
     }
@@ -689,27 +833,28 @@ static void run_rfc6979_hmac_sha256_tests(void) {
         {0x75, 0x97, 0x88, 0x7c, 0xbd, 0x76, 0x32, 0x1f, 0x32, 0xe3, 0x04, 0x40, 0x67, 0x9a, 0x22, 0xcf, 0x7f, 0x8d, 0x9d, 0x2e, 0xac, 0x39, 0x0e, 0x58, 0x1f, 0xea, 0x09, 0x1c, 0xe2, 0x02, 0xba, 0x94}
     };
 
+    const secp256k1_hash_ctx *hash_ctx = secp256k1_get_hash_context(CTX);
     secp256k1_rfc6979_hmac_sha256 rng;
     unsigned char out[32];
     int i;
 
-    secp256k1_rfc6979_hmac_sha256_initialize(&rng, key1, 64);
+    secp256k1_rfc6979_hmac_sha256_initialize(hash_ctx, &rng, key1, 64);
     for (i = 0; i < 3; i++) {
-        secp256k1_rfc6979_hmac_sha256_generate(&rng, out, 32);
+        secp256k1_rfc6979_hmac_sha256_generate(hash_ctx, &rng, out, 32);
         CHECK(secp256k1_memcmp_var(out, out1[i], 32) == 0);
     }
     secp256k1_rfc6979_hmac_sha256_finalize(&rng);
 
-    secp256k1_rfc6979_hmac_sha256_initialize(&rng, key1, 65);
+    secp256k1_rfc6979_hmac_sha256_initialize(hash_ctx, &rng, key1, 65);
     for (i = 0; i < 3; i++) {
-        secp256k1_rfc6979_hmac_sha256_generate(&rng, out, 32);
+        secp256k1_rfc6979_hmac_sha256_generate(hash_ctx, &rng, out, 32);
         CHECK(secp256k1_memcmp_var(out, out1[i], 32) != 0);
     }
     secp256k1_rfc6979_hmac_sha256_finalize(&rng);
 
-    secp256k1_rfc6979_hmac_sha256_initialize(&rng, key2, 64);
+    secp256k1_rfc6979_hmac_sha256_initialize(hash_ctx, &rng, key2, 64);
     for (i = 0; i < 3; i++) {
-        secp256k1_rfc6979_hmac_sha256_generate(&rng, out, 32);
+        secp256k1_rfc6979_hmac_sha256_generate(hash_ctx, &rng, out, 32);
         CHECK(secp256k1_memcmp_var(out, out2[i], 32) == 0);
     }
     secp256k1_rfc6979_hmac_sha256_finalize(&rng);
@@ -739,6 +884,20 @@ static void run_tagged_sha256_tests(void) {
     CHECK(secp256k1_memcmp_var(hash32, hash_expected, sizeof(hash32)) == 0);
 }
 
+static void run_sha256_initialize_midstate_tests(void) {
+    /* Midstate for the tagged hash with tag "sha256_midstate_test_tag". */
+    static const unsigned char tag[] = "sha256_midstate_test_tag";
+    static const uint32_t midstate[8] = {
+        0xa9ec59eaul, 0x9b4c2ffful, 0x400821e2ul, 0x0dcf3847ul,
+        0xbe7ea179ul, 0xa5772bdcul, 0x7d29bfe3ul, 0xa486b855ul
+    };
+    const secp256k1_hash_ctx *hash_ctx = secp256k1_get_hash_context(CTX);
+    secp256k1_sha256 sha;
+
+    secp256k1_sha256_initialize_midstate(&sha, 64, midstate);
+    test_sha256_tag_midstate(hash_ctx, &sha, tag, sizeof(tag) - 1);
+}
+
 /***** MODINV TESTS *****/
 
 /* Compute the modular inverse of (odd) x mod 2^64. */
@@ -1649,7 +1808,7 @@ static void run_modinv_tests(void) {
     int i, j, ok;
 
     /* Test known inputs/outputs */
-    for (i = 0; (size_t)i < sizeof(CASES) / sizeof(CASES[0]); ++i) {
+    for (i = 0; (size_t)i < ARRAY_SIZE(CASES); ++i) {
         uint16_t out[16];
         test_modinv32_uint16(out, CASES[i][0], CASES[i][1]);
         for (j = 0; j < 16; ++j) CHECK(out[j] == CASES[i][2][j]);
@@ -2193,8 +2352,58 @@ static void run_scalar_set_b32_seckey_tests(void) {
     CHECK(secp256k1_scalar_set_b32_seckey(&s2, b32) == 0);
 }
 
+static void test_scalar_check_overflow(void) {
+    secp256k1_scalar s;
+    const secp256k1_scalar n_minus_1 = SECP256K1_SCALAR_CONST(
+        0xFFFFFFFFUL, 0xFFFFFFFFUL, 0xFFFFFFFFUL, 0xFFFFFFFEUL,
+        0xBAAEDCE6UL, 0xAF48A03BUL, 0xBFD25E8CUL, 0xD0364140UL
+    );
+    const secp256k1_scalar n = SECP256K1_SCALAR_CONST(
+        0xFFFFFFFFUL, 0xFFFFFFFFUL, 0xFFFFFFFFUL, 0xFFFFFFFEUL,
+        0xBAAEDCE6UL, 0xAF48A03BUL, 0xBFD25E8CUL, 0xD0364141UL
+    );
+    const secp256k1_scalar n_plus_1 = SECP256K1_SCALAR_CONST(
+        0xFFFFFFFFUL, 0xFFFFFFFFUL, 0xFFFFFFFFUL, 0xFFFFFFFEUL,
+        0xBAAEDCE6UL, 0xAF48A03BUL, 0xBFD25E8CUL, 0xD0364142UL
+    );
+    const secp256k1_scalar max = SECP256K1_SCALAR_CONST(
+        0xFFFFFFFFUL, 0xFFFFFFFFUL, 0xFFFFFFFFUL, 0xFFFFFFFFUL,
+        0xFFFFFFFFUL, 0xFFFFFFFFUL, 0xFFFFFFFFUL, 0xFFFFFFFFUL
+    );
+
+    int i;
+
+    secp256k1_scalar_set_int(&s, 0);
+    CHECK(secp256k1_scalar_check_overflow(&s) == 0);
+    CHECK(secp256k1_scalar_check_overflow(&n_minus_1) == 0);
+    CHECK(secp256k1_scalar_check_overflow(&n) == 1);
+    CHECK(secp256k1_scalar_check_overflow(&n_plus_1) == 1);
+    CHECK(secp256k1_scalar_check_overflow(&max) == 1);
+
+    for (i = 0; i < 2 * COUNT; i++) {
+        int expected_overflow;
+        int overflow = 0;
+        unsigned char b32[32];
+
+        testrand256(b32);
+
+        /* Force top bits to be 0xFF sometimes to ensure we hit overflows */
+        if (i % 2 == 0) {
+            memset(b32, 0xFF, 16);
+        }
+
+        expected_overflow = (secp256k1_memcmp_var(b32, secp256k1_group_order_bytes, 32) >= 0);
+
+        secp256k1_scalar_set_b32(&s, b32, &overflow);
+        CHECK(overflow == expected_overflow);
+    }
+}
+
 static void run_scalar_tests(void) {
     int i;
+
+    test_scalar_check_overflow();
+
     for (i = 0; i < 128 * COUNT; i++) {
         scalar_test();
     }
@@ -2247,7 +2456,7 @@ static void run_scalar_tests(void) {
             SECP256K1_SCALAR_CONST(0x7ffffffful, 0xfffffffful, 0xfffffffful, 0xfffffffful, 0xfffffffful, 0xfffffffful, 0xfffffffful, 0xfffffffful),
         };
         unsigned n;
-        for (n = 0; n < sizeof(HALF_TESTS) / sizeof(HALF_TESTS[0]); ++n) {
+        for (n = 0; n < ARRAY_SIZE(HALF_TESTS); ++n) {
             secp256k1_scalar s;
             secp256k1_scalar_half(&s, &HALF_TESTS[n]);
             secp256k1_scalar_add(&s, &s, &s);
@@ -2258,15 +2467,6 @@ static void run_scalar_tests(void) {
         }
     }
 
-    {
-        /* Does check_overflow check catch all ones? */
-        static const secp256k1_scalar overflowed = SECP256K1_SCALAR_CONST(
-            0xFFFFFFFFUL, 0xFFFFFFFFUL, 0xFFFFFFFFUL, 0xFFFFFFFFUL,
-            0xFFFFFFFFUL, 0xFFFFFFFFUL, 0xFFFFFFFFUL, 0xFFFFFFFFUL
-        );
-        CHECK(secp256k1_scalar_check_overflow(&overflowed));
-    }
-
     {
         /* Static test vectors.
          * These were reduced from ~10^12 random vectors based on comparison-decision
@@ -3524,7 +3724,7 @@ static void run_inverse_tests(void)
     secp256k1_scalar x_scalar;
     memset(b32, 0, sizeof(b32));
     /* Test fixed test cases through test_inverse_{scalar,field}, both ways. */
-    for (i = 0; (size_t)i < sizeof(fe_cases)/sizeof(fe_cases[0]); ++i) {
+    for (i = 0; (size_t)i < ARRAY_SIZE(fe_cases); ++i) {
         for (var = 0; var <= 1; ++var) {
             test_inverse_field(&x_fe, &fe_cases[i][0], var);
             CHECK(fe_equal(&x_fe, &fe_cases[i][1]));
@@ -3532,7 +3732,7 @@ static void run_inverse_tests(void)
             CHECK(fe_equal(&x_fe, &fe_cases[i][0]));
         }
     }
-    for (i = 0; (size_t)i < sizeof(scalar_cases)/sizeof(scalar_cases[0]); ++i) {
+    for (i = 0; (size_t)i < ARRAY_SIZE(scalar_cases); ++i) {
         for (var = 0; var <= 1; ++var) {
             test_inverse_scalar(&x_scalar, &scalar_cases[i][0], var);
             CHECK(secp256k1_scalar_eq(&x_scalar, &scalar_cases[i][1]));
@@ -3676,8 +3876,8 @@ static void test_ge(void) {
      *   negation, and then those two again but with randomized Z coordinate.
      * - The same is then done for lambda*p1 and lambda^2*p1.
      */
-    secp256k1_ge *ge = (secp256k1_ge *)checked_malloc(&CTX->error_callback, sizeof(secp256k1_ge) * (1 + 4 * runs));
-    secp256k1_gej *gej = (secp256k1_gej *)checked_malloc(&CTX->error_callback, sizeof(secp256k1_gej) * (1 + 4 * runs));
+    secp256k1_ge *ge = checked_malloc(&CTX->error_callback, sizeof(secp256k1_ge) * (1 + 4 * runs));
+    secp256k1_gej *gej = checked_malloc(&CTX->error_callback, sizeof(secp256k1_gej) * (1 + 4 * runs));
     secp256k1_fe zf, r;
     secp256k1_fe zfi2, zfi3;
 
@@ -3811,7 +4011,7 @@ static void test_ge(void) {
     /* Test adding all points together in random order equals infinity. */
     {
         secp256k1_gej sum = SECP256K1_GEJ_CONST_INFINITY;
-        secp256k1_gej *gej_shuffled = (secp256k1_gej *)checked_malloc(&CTX->error_callback, (4 * runs + 1) * sizeof(secp256k1_gej));
+        secp256k1_gej *gej_shuffled = checked_malloc(&CTX->error_callback, (4 * runs + 1) * sizeof(secp256k1_gej));
         for (i = 0; i < 4 * runs + 1; i++) {
             gej_shuffled[i] = gej[i];
         }
@@ -3832,8 +4032,8 @@ static void test_ge(void) {
 
     /* Test batch gej -> ge conversion without known z ratios. */
     {
-        secp256k1_ge *ge_set_all_var = (secp256k1_ge *)checked_malloc(&CTX->error_callback, (4 * runs + 1) * sizeof(secp256k1_ge));
-        secp256k1_ge *ge_set_all = (secp256k1_ge *)checked_malloc(&CTX->error_callback, (4 * runs + 1) * sizeof(secp256k1_ge));
+        secp256k1_ge *ge_set_all_var = checked_malloc(&CTX->error_callback, (4 * runs + 1) * sizeof(secp256k1_ge));
+        secp256k1_ge *ge_set_all = checked_malloc(&CTX->error_callback, (4 * runs + 1) * sizeof(secp256k1_ge));
         secp256k1_ge_set_all_gej_var(&ge_set_all_var[0], &gej[0], 4 * runs + 1);
         for (i = 0; i < 4 * runs + 1; i++) {
             secp256k1_fe s;
@@ -4326,11 +4526,19 @@ static void test_point_times_order(const secp256k1_gej *point) {
     CHECK(secp256k1_ge_is_valid_var(&res3) == 0);
     /* check zero/one edge cases */
     secp256k1_ecmult(&res1, point, &secp256k1_scalar_zero, &secp256k1_scalar_zero);
+    secp256k1_ecmult(&res2, point, &secp256k1_scalar_zero, NULL);
     secp256k1_ge_set_gej(&res3, &res1);
+    CHECK(secp256k1_gej_is_infinity(&res1));
+    CHECK(secp256k1_gej_is_infinity(&res2));
     CHECK(secp256k1_ge_is_infinity(&res3));
+
     secp256k1_ecmult(&res1, point, &secp256k1_scalar_one, &secp256k1_scalar_zero);
+    secp256k1_ecmult(&res2, point, &secp256k1_scalar_one, NULL);
     secp256k1_ge_set_gej(&res3, &res1);
     CHECK(secp256k1_gej_eq_ge_var(point, &res3));
+    secp256k1_ge_set_gej(&res3, &res2);
+    CHECK(secp256k1_gej_eq_ge_var(point, &res3));
+
     secp256k1_ecmult(&res1, point, &secp256k1_scalar_zero, &secp256k1_scalar_one);
     secp256k1_ge_set_gej(&res3, &res1);
     CHECK(secp256k1_ge_eq_var(&secp256k1_ge_const_g, &res3));
@@ -4408,7 +4616,7 @@ static void run_ecmult_near_split_bound(void) {
     int i;
     unsigned j;
     for (i = 0; i < 4*COUNT; ++i) {
-        for (j = 0; j < sizeof(scalars_near_split_bounds) / sizeof(scalars_near_split_bounds[0]); ++j) {
+        for (j = 0; j < ARRAY_SIZE(scalars_near_split_bounds); ++j) {
             test_ecmult_target(&scalars_near_split_bounds[j], 0);
             test_ecmult_target(&scalars_near_split_bounds[j], 1);
             test_ecmult_target(&scalars_near_split_bounds[j], 2);
@@ -4532,7 +4740,7 @@ static void ecmult_const_edges(void) {
     secp256k1_ge point;
     secp256k1_gej res;
     size_t i;
-    size_t cases = 1 + sizeof(scalars_near_split_bounds) / sizeof(scalars_near_split_bounds[0]);
+    size_t cases = 1 + ARRAY_SIZE(scalars_near_split_bounds);
 
     /* We are trying to reach the following edge cases (variables are defined as
      * in ecmult_const_impl.h):
@@ -5175,8 +5383,8 @@ static void test_ecmult_multi_batch_size_helper(void) {
 static void test_ecmult_multi_batching(void) {
     static const int n_points = 2*ECMULT_PIPPENGER_THRESHOLD;
     secp256k1_scalar scG;
-    secp256k1_scalar *sc = (secp256k1_scalar *)checked_malloc(&CTX->error_callback, sizeof(secp256k1_scalar) * n_points);
-    secp256k1_ge *pt = (secp256k1_ge *)checked_malloc(&CTX->error_callback, sizeof(secp256k1_ge) * n_points);
+    secp256k1_scalar *sc = checked_malloc(&CTX->error_callback, sizeof(secp256k1_scalar) * n_points);
+    secp256k1_ge *pt = checked_malloc(&CTX->error_callback, sizeof(secp256k1_ge) * n_points);
     secp256k1_gej r;
     secp256k1_gej r2;
     ecmult_multi_data data;
@@ -5426,32 +5634,33 @@ static int test_ecmult_accumulate_cb(secp256k1_scalar* sc, secp256k1_ge* pt, siz
 }
 
 static void test_ecmult_accumulate(secp256k1_sha256* acc, const secp256k1_scalar* x, secp256k1_scratch* scratch) {
-    /* Compute x*G in 6 different ways, serialize it uncompressed, and feed it into acc. */
-    secp256k1_gej rj1, rj2, rj3, rj4, rj5, rj6, gj, infj;
+    /* Compute x*G in many different ways, serialize it uncompressed, and feed it into acc. */
+    secp256k1_gej gj, infj;
     secp256k1_ge r;
+    secp256k1_gej rj[7];
     unsigned char bytes[65];
+    size_t i;
     secp256k1_gej_set_ge(&gj, &secp256k1_ge_const_g);
     secp256k1_gej_set_infinity(&infj);
-    secp256k1_ecmult_gen(&CTX->ecmult_gen_ctx, &rj1, x);
-    secp256k1_ecmult(&rj2, &gj, x, &secp256k1_scalar_zero);
-    secp256k1_ecmult(&rj3, &infj, &secp256k1_scalar_zero, x);
-    CHECK(secp256k1_ecmult_multi_var(&CTX->error_callback, scratch, &rj4, x, NULL, NULL, 0));
-    CHECK(secp256k1_ecmult_multi_var(&CTX->error_callback, scratch, &rj5, &secp256k1_scalar_zero, test_ecmult_accumulate_cb, (void*)x, 1));
-    secp256k1_ecmult_const(&rj6, &secp256k1_ge_const_g, x);
-    secp256k1_ge_set_gej_var(&r, &rj1);
-    CHECK(secp256k1_gej_eq_ge_var(&rj2, &r));
-    CHECK(secp256k1_gej_eq_ge_var(&rj3, &r));
-    CHECK(secp256k1_gej_eq_ge_var(&rj4, &r));
-    CHECK(secp256k1_gej_eq_ge_var(&rj5, &r));
-    CHECK(secp256k1_gej_eq_ge_var(&rj6, &r));
+    secp256k1_ecmult_gen(&CTX->ecmult_gen_ctx, &rj[0], x);
+    secp256k1_ecmult(&rj[1], &gj, x, NULL);
+    secp256k1_ecmult(&rj[2], &gj, x, &secp256k1_scalar_zero);
+    secp256k1_ecmult(&rj[3], &infj, &secp256k1_scalar_zero, x);
+    CHECK(secp256k1_ecmult_multi_var(&CTX->error_callback, scratch, &rj[4], x, NULL, NULL, 0));
+    CHECK(secp256k1_ecmult_multi_var(&CTX->error_callback, scratch, &rj[5], &secp256k1_scalar_zero, test_ecmult_accumulate_cb, (void*)x, 1));
+    secp256k1_ecmult_const(&rj[6], &secp256k1_ge_const_g, x);
+    secp256k1_ge_set_gej_var(&r, &rj[0]);
+    for (i = 0; i < ARRAY_SIZE(rj); i++) {
+        CHECK(secp256k1_gej_eq_ge_var(&rj[i], &r));
+    }
     if (secp256k1_ge_is_infinity(&r)) {
         /* Store infinity as 0x00 */
         const unsigned char zerobyte[1] = {0};
-        secp256k1_sha256_write(acc, zerobyte, 1);
+        secp256k1_sha256_write(secp256k1_get_hash_context(CTX), acc, zerobyte, 1);
     } else {
         /* Store other points using their uncompressed serialization. */
         secp256k1_eckey_pubkey_serialize65(&r, bytes);
-        secp256k1_sha256_write(acc, bytes, sizeof(bytes));
+        secp256k1_sha256_write(secp256k1_get_hash_context(CTX), acc, bytes, sizeof(bytes));
     }
 }
 
@@ -5493,7 +5702,7 @@ static void test_ecmult_constants_2bit(void) {
             test_ecmult_accumulate(&acc, &x, scratch);
         }
     }
-    secp256k1_sha256_finalize(&acc, b32);
+    secp256k1_sha256_finalize(secp256k1_get_hash_context(CTX), &acc, b32);
     CHECK(secp256k1_memcmp_var(b32, expected32, 32) == 0);
 
     secp256k1_scratch_space_destroy(CTX, scratch);
@@ -5512,6 +5721,7 @@ static void test_ecmult_constants_sha(uint32_t prefix, size_t iter, const unsign
     unsigned char b32[32];
     unsigned char inp[6];
     size_t i;
+    const secp256k1_hash_ctx *hash_ctx = secp256k1_get_hash_context(CTX);
     secp256k1_scratch_space *scratch = secp256k1_scratch_space_create(CTX, 65536);
 
     inp[0] = prefix & 0xFF;
@@ -5531,12 +5741,12 @@ static void test_ecmult_constants_sha(uint32_t prefix, size_t iter, const unsign
         inp[4] = i & 0xff;
         inp[5] = (i >> 8) & 0xff;
         secp256k1_sha256_initialize(&gen);
-        secp256k1_sha256_write(&gen, inp, sizeof(inp));
-        secp256k1_sha256_finalize(&gen, b32);
+        secp256k1_sha256_write(hash_ctx, &gen, inp, sizeof(inp));
+        secp256k1_sha256_finalize(hash_ctx, &gen, b32);
         secp256k1_scalar_set_b32(&x, b32, NULL);
         test_ecmult_accumulate(&acc, &x, scratch);
     }
-    secp256k1_sha256_finalize(&acc, b32);
+    secp256k1_sha256_finalize(hash_ctx, &acc, b32);
     CHECK(secp256k1_memcmp_var(b32, expected32, 32) == 0);
 
     secp256k1_scratch_space_destroy(CTX, scratch);
@@ -5590,7 +5800,7 @@ static void test_ecmult_gen_blind(void) {
     testrand256(seed32);
     b = CTX->ecmult_gen_ctx.scalar_offset;
     p = CTX->ecmult_gen_ctx.ge_offset;
-    secp256k1_ecmult_gen_blind(&CTX->ecmult_gen_ctx, seed32);
+    secp256k1_ecmult_gen_blind(&CTX->ecmult_gen_ctx, secp256k1_get_hash_context(CTX), seed32);
     CHECK(!secp256k1_scalar_eq(&b, &CTX->ecmult_gen_ctx.scalar_offset));
     secp256k1_ecmult_gen(&CTX->ecmult_gen_ctx, &pgej2, &key);
     CHECK(!gej_xyz_equals_gej(&pgej, &pgej2));
@@ -5603,10 +5813,10 @@ static void test_ecmult_gen_blind_reset(void) {
     /* Test ecmult_gen() blinding reset and confirm that the blinding is consistent. */
     secp256k1_scalar b;
     secp256k1_ge p1, p2;
-    secp256k1_ecmult_gen_blind(&CTX->ecmult_gen_ctx, 0);
+    secp256k1_ecmult_gen_blind(&CTX->ecmult_gen_ctx, secp256k1_get_hash_context(CTX), 0);
     b = CTX->ecmult_gen_ctx.scalar_offset;
     p1 = CTX->ecmult_gen_ctx.ge_offset;
-    secp256k1_ecmult_gen_blind(&CTX->ecmult_gen_ctx, 0);
+    secp256k1_ecmult_gen_blind(&CTX->ecmult_gen_ctx, secp256k1_get_hash_context(CTX), 0);
     CHECK(secp256k1_scalar_eq(&b, &CTX->ecmult_gen_ctx.scalar_offset));
     p2 = CTX->ecmult_gen_ctx.ge_offset;
     CHECK(secp256k1_ge_eq_var(&p1, &p2));
@@ -5684,7 +5894,7 @@ static void run_endomorphism_tests(void) {
         testutil_random_scalar_order_test(&full);
         test_scalar_split(&full);
     }
-    for (i = 0; i < sizeof(scalars_near_split_bounds) / sizeof(scalars_near_split_bounds[0]); ++i) {
+    for (i = 0; i < ARRAY_SIZE(scalars_near_split_bounds); ++i) {
         test_scalar_split(&scalars_near_split_bounds[i]);
     }
 }
@@ -7068,7 +7278,7 @@ static void run_ecdsa_der_parse(void) {
 }
 
 /* Tests several edge cases. */
-static void test_ecdsa_edge_cases(void) {
+static void run_ecdsa_edge_cases(void) {
     int t;
     secp256k1_ecdsa_signature sig;
 
@@ -7401,8 +7611,25 @@ static void test_ecdsa_edge_cases(void) {
     }
 }
 
-static void run_ecdsa_edge_cases(void) {
-    test_ecdsa_edge_cases();
+DEFINE_SHA256_TRANSFORM_PROBE(sha256_ecdsa)
+static void ecdsa_ctx_sha256(void) {
+    /* Check ctx-provided SHA256 compression override takes effect */
+    secp256k1_context *ctx = secp256k1_context_clone(CTX);
+    secp256k1_ecdsa_signature out_default, out_custom;
+    unsigned char sk[32] = {1}, msg32[32] = {1};
+
+    /* Default behavior. No ctx-provided SHA256 compression */
+    CHECK(secp256k1_ecdsa_sign(ctx, &out_default, msg32, sk, NULL, NULL));
+    CHECK(!sha256_ecdsa_called);
+
+    /* Override SHA256 compression directly, bypassing the ctx setter sanity checks */
+    ctx->hash_ctx.fn_sha256_compression = sha256_ecdsa;
+    CHECK(secp256k1_ecdsa_sign(ctx, &out_custom, msg32, sk, NULL, NULL));
+    CHECK(sha256_ecdsa_called);
+    /* Outputs must differ if custom compression was used */
+    CHECK(secp256k1_memcmp_var(out_default.data, out_custom.data, 64) != 0);
+
+    secp256k1_context_destroy(ctx);
 }
 
 /** Wycheproof tests
@@ -7413,6 +7640,7 @@ static void test_ecdsa_wycheproof(void) {
     #include "wycheproof/ecdsa_secp256k1_sha256_bitcoin_test.h"
 
     int t;
+    const secp256k1_hash_ctx *hash_ctx = secp256k1_get_hash_context(CTX);
     for (t = 0; t < SECP256K1_ECDSA_WYCHEPROOF_NUMBER_TESTVECTORS; t++) {
         secp256k1_ecdsa_signature signature;
         secp256k1_sha256 hasher;
@@ -7427,8 +7655,8 @@ static void test_ecdsa_wycheproof(void) {
 
         secp256k1_sha256_initialize(&hasher);
         msg = &wycheproof_ecdsa_messages[testvectors[t].msg_offset];
-        secp256k1_sha256_write(&hasher, msg, testvectors[t].msg_len);
-        secp256k1_sha256_finalize(&hasher, out);
+        secp256k1_sha256_write(hash_ctx, &hasher, msg, testvectors[t].msg_len);
+        secp256k1_sha256_finalize(hash_ctx, &hasher, out);
 
         sig = &wycheproof_ecdsa_signatures[testvectors[t].sig_offset];
         if (secp256k1_ecdsa_signature_parse_der(CTX, &signature, sig, testvectors[t].sig_len) == 1) {
@@ -7692,6 +7920,8 @@ static const struct tf_test_entry tests_general[] = {
     CASE(all_static_context_tests),
     CASE(deprecated_context_flags_test),
     CASE(scratch_tests),
+    CASE(plug_sha256_compression_tests),
+    CASE(sha256_multi_block_compression_tests),
 };
 
 static const struct tf_test_entry tests_integer[] = {
@@ -7709,6 +7939,7 @@ static const struct tf_test_entry tests_hash[] = {
     CASE(hmac_sha256_tests),
     CASE(rfc6979_hmac_sha256_tests),
     CASE(tagged_sha256_tests),
+    CASE(sha256_initialize_midstate_tests),
 };
 
 static const struct tf_test_entry tests_scalar[] = {
@@ -7761,6 +7992,7 @@ static const struct tf_test_entry tests_ecdsa[] = {
     CASE(ecdsa_end_to_end),
     CASE(ecdsa_edge_cases),
     CASE(ecdsa_wycheproof),
+    CASE1(ecdsa_ctx_sha256),
 };
 
 static const struct tf_test_entry tests_utils[] = {
@@ -7837,7 +8069,7 @@ static int teardown(void) {
 int main(int argc, char **argv) {
     struct tf_framework tf = {0};
     tf.registry_modules = registry_modules;
-    tf.num_modules = sizeof(registry_modules) / sizeof(registry_modules[0]);
+    tf.num_modules = ARRAY_SIZE(registry_modules);
     tf.registry_no_rng = &registry_modules_no_rng;
 
     /* Add context creation/destruction functions */
@@ -7848,4 +8080,3 @@ int main(int argc, char **argv) {
     if (tf_init(&tf, argc, argv) != 0) return EXIT_FAILURE;
     return tf_run(&tf);
 }
-
diff --git a/src/secp256k1/src/tests_exhaustive.c b/src/secp256k1/src/tests_exhaustive.c
index 13bda6119d7b..68d4bec3f071 100644
--- a/src/secp256k1/src/tests_exhaustive.c
+++ b/src/secp256k1/src/tests_exhaustive.c
@@ -459,8 +459,6 @@ int main(int argc, char** argv) {
         secp256k1_context_destroy(ctx);
     }
 
-    testrand_finish();
-
     printf("no problems found\n");
     return EXIT_SUCCESS;
 }
diff --git a/src/secp256k1/src/testutil.h b/src/secp256k1/src/testutil.h
index 93ee3d58b5be..8fa69a02c96b 100644
--- a/src/secp256k1/src/testutil.h
+++ b/src/secp256k1/src/testutil.h
@@ -11,6 +11,15 @@
 #include "testrand.h"
 #include "util.h"
 
+/* Helper for when we need to check that the ctx-provided sha256 compression was called */
+#define DEFINE_SHA256_TRANSFORM_PROBE(name)                                     \
+    static int name##_called = 0;                                               \
+    static void name(uint32_t *s, const unsigned char *msg, size_t rounds) {    \
+        name##_called = 1;                                                      \
+        secp256k1_sha256_transform(s, msg, rounds);                             \
+        s[0] ^= 0xdeadbeef; /* intentional perturbation for testing */          \
+    }
+
 /* group order of the secp256k1 curve in 32-byte big endian representation */
 static const unsigned char secp256k1_group_order_bytes[32] = {
     0xff, 0xff, 0xff, 0xff, 0xff, 0xff, 0xff, 0xff,
diff --git a/src/secp256k1/src/unit_test.h b/src/secp256k1/src/unit_test.h
index bf301e539219..5259efbfb64c 100644
--- a/src/secp256k1/src/unit_test.h
+++ b/src/secp256k1/src/unit_test.h
@@ -6,6 +6,8 @@
 #ifndef SECP256K1_UNIT_TEST_H
 #define SECP256K1_UNIT_TEST_H
 
+#include "util.h"
+
 /* --------------------------------------------------------- */
 /* Configurable constants                                    */
 /* --------------------------------------------------------- */
@@ -27,7 +29,7 @@
 #define MAKE_TEST_MODULE(name) { \
     #name, \
     tests_##name, \
-    sizeof(tests_##name) / sizeof(tests_##name[0]) \
+    ARRAY_SIZE(tests_##name) \
 }
 
 /* Macro to wrap a test internal function with a COUNT loop (iterations number) */
diff --git a/src/secp256k1/src/util.h b/src/secp256k1/src/util.h
index 46ab381077cb..5d03e4c76dd7 100644
--- a/src/secp256k1/src/util.h
+++ b/src/secp256k1/src/util.h
@@ -181,6 +181,8 @@ static SECP256K1_INLINE void *checked_malloc(const secp256k1_callback* cb, size_
 
 #define ROUND_TO_ALIGN(size) (CEIL_DIV(size, ALIGNMENT) * ALIGNMENT)
 
+#define ARRAY_SIZE(arr) (sizeof(arr) / sizeof((arr)[0]))
+
 /* Macro for restrict, when available and not in a VERIFY build. */
 #if defined(SECP256K1_BUILD) && defined(VERIFY)
 # define SECP256K1_RESTRICT
diff --git a/src/serialize.h b/src/serialize.h
index 21b3325f7a7a..4c33311c1c9e 100644
--- a/src/serialize.h
+++ b/src/serialize.h
@@ -11,6 +11,7 @@
 #include <compat/endian.h>
 #include <prevector.h>
 #include <span.h>
+#include <util/overflow.h>
 
 #include <algorithm>
 #include <concepts>
@@ -21,6 +22,7 @@
 #include <map>
 #include <memory>
 #include <set>
+#include <span>
 #include <string>
 #include <utility>
 #include <vector>
@@ -425,7 +427,7 @@ template<typename Stream, VarIntMode Mode, typename I>
 void WriteVarInt(Stream& os, I n)
 {
     CheckVarIntMode<Mode, I>();
-    unsigned char tmp[(sizeof(n)*8+6)/7];
+    unsigned char tmp[CeilDiv(sizeof(n) * 8, 7u)];
     int len=0;
     while(true) {
         tmp[len] = (n & 0x7F) | (len ? 0x80 : 0x00);
diff --git a/src/streams.h b/src/streams.h
index f70adcf74a71..d6d6d57fb935 100644
--- a/src/streams.h
+++ b/src/streams.h
@@ -124,6 +124,38 @@ class SpanReader
     }
 };
 
+/** Minimal stream for writing to an existing span of bytes.
+ */
+class SpanWriter
+{
+private:
+    std::span<std::byte> m_dest;
+
+public:
+    explicit SpanWriter(std::span<std::byte> dest) : m_dest{dest} {}
+    template <typename... Args>
+    SpanWriter(std::span<std::byte> dest, Args&&... args) : SpanWriter{dest}
+    {
+        ::SerializeMany(*this, std::forward<Args>(args)...);
+    }
+
+    void write(std::span<const std::byte> src)
+    {
+        if (src.size() > m_dest.size()) {
+            throw std::ios_base::failure("SpanWriter::write(): exceeded buffer size");
+        }
+        memcpy(m_dest.data(), src.data(), src.size());
+        m_dest = m_dest.subspan(src.size());
+    }
+
+    template<typename T>
+    SpanWriter& operator<<(const T& obj)
+    {
+        ::Serialize(*this, obj);
+        return *this;
+    }
+};
+
 /** Double ended buffer combining vector and stream-like interfaces.
  *
  * >> and << read and write unformatted data using the above serialization templates.
diff --git a/src/support/allocators/pool.h b/src/support/allocators/pool.h
index d4ce68b970ec..e4b1acc6d637 100644
--- a/src/support/allocators/pool.h
+++ b/src/support/allocators/pool.h
@@ -15,6 +15,7 @@
 #include <utility>
 
 #include <util/check.h>
+#include <util/overflow.h>
 
 /**
  * A memory resource similar to std::pmr::unsynchronized_pool_resource, but
@@ -127,7 +128,7 @@ class PoolResource final
      */
     [[nodiscard]] static constexpr std::size_t NumElemAlignBytes(std::size_t bytes)
     {
-        return (bytes + ELEM_ALIGN_BYTES - 1) / ELEM_ALIGN_BYTES + (bytes == 0);
+        return CeilDiv(bytes, ELEM_ALIGN_BYTES) + (bytes == 0);
     }
 
     /**
diff --git a/src/sync.cpp b/src/sync.cpp
index e59f86b94fca..6d740866d498 100644
--- a/src/sync.cpp
+++ b/src/sync.cpp
@@ -4,8 +4,10 @@
 
 #include <sync.h>
 
+#include <logging/timer.h>
 #include <tinyformat.h>
 #include <util/log.h>
+#include <util/stdmutex.h>
 #include <util/strencodings.h>
 #include <util/threadnames.h>
 
@@ -19,6 +21,19 @@
 #include <utility>
 #include <vector>
 
+#ifdef DEBUG_LOCKCONTENTION
+
+template <typename LockType>
+void ContendedLock(std::string_view name, std::string_view file, int nLine, LockType& lock)
+{
+    LOG_TIME_MICROS_WITH_CATEGORY(strprintf("lock contention %s, %s:%d", name, file, nLine), BCLog::LOCK);
+    lock.lock();
+}
+template void ContendedLock(std::string_view name, std::string_view file, int nLine, std::unique_lock<std::mutex>& lock);
+template void ContendedLock(std::string_view name, std::string_view file, int nLine, std::unique_lock<std::recursive_mutex>& lock);
+
+#endif
+
 #ifdef DEBUG_LOCKORDER
 //
 // Early deadlock detection.
@@ -73,10 +88,10 @@ using LockOrders = std::map<LockPair, LockStack>;
 using InvLockOrders = std::set<LockPair>;
 
 struct LockData {
-    LockStacks m_lock_stacks;
-    LockOrders lockorders;
-    InvLockOrders invlockorders;
-    std::mutex dd_mutex;
+    LockStacks m_lock_stacks GUARDED_BY(dd_mutex);
+    LockOrders lockorders GUARDED_BY(dd_mutex);
+    InvLockOrders invlockorders GUARDED_BY(dd_mutex);
+    StdMutex dd_mutex;
 };
 
 LockData& GetLockData() {
@@ -152,7 +167,7 @@ static void push_lock(MutexType* c, const CLockLocation& locklocation)
         std::is_base_of_v<std::recursive_mutex, MutexType>;
 
     LockData& lockdata = GetLockData();
-    std::lock_guard<std::mutex> lock(lockdata.dd_mutex);
+    STDLOCK(lockdata.dd_mutex);
 
     LockStack& lock_stack = lockdata.m_lock_stacks[std::this_thread::get_id()];
     lock_stack.emplace_back(c, locklocation);
@@ -192,7 +207,7 @@ static void push_lock(MutexType* c, const CLockLocation& locklocation)
 static void pop_lock()
 {
     LockData& lockdata = GetLockData();
-    std::lock_guard<std::mutex> lock(lockdata.dd_mutex);
+    STDLOCK(lockdata.dd_mutex);
 
     LockStack& lock_stack = lockdata.m_lock_stacks[std::this_thread::get_id()];
     lock_stack.pop_back();
@@ -212,7 +227,7 @@ template void EnterCritical(const char*, const char*, int, std::recursive_mutex*
 void CheckLastCritical(void* cs, std::string& lockname, const char* guardname, const char* file, int line)
 {
     LockData& lockdata = GetLockData();
-    std::lock_guard<std::mutex> lock(lockdata.dd_mutex);
+    STDLOCK(lockdata.dd_mutex);
 
     const LockStack& lock_stack = lockdata.m_lock_stacks[std::this_thread::get_id()];
     if (!lock_stack.empty()) {
@@ -243,7 +258,7 @@ void LeaveCritical()
 static std::string LocksHeld()
 {
     LockData& lockdata = GetLockData();
-    std::lock_guard<std::mutex> lock(lockdata.dd_mutex);
+    STDLOCK(lockdata.dd_mutex);
 
     const LockStack& lock_stack = lockdata.m_lock_stacks[std::this_thread::get_id()];
     std::string result;
@@ -255,7 +270,7 @@ static std::string LocksHeld()
 static bool LockHeld(void* mutex)
 {
     LockData& lockdata = GetLockData();
-    std::lock_guard<std::mutex> lock(lockdata.dd_mutex);
+    STDLOCK(lockdata.dd_mutex);
 
     const LockStack& lock_stack = lockdata.m_lock_stacks[std::this_thread::get_id()];
     for (const LockStackItem& i : lock_stack) {
@@ -288,7 +303,7 @@ template void AssertLockNotHeldInternal(const char*, const char*, int, Recursive
 void DeleteLock(void* cs)
 {
     LockData& lockdata = GetLockData();
-    std::lock_guard<std::mutex> lock(lockdata.dd_mutex);
+    STDLOCK(lockdata.dd_mutex);
     const LockPair item = std::make_pair(cs, nullptr);
     LockOrders::iterator it = lockdata.lockorders.lower_bound(item);
     while (it != lockdata.lockorders.end() && it->first.first == cs) {
@@ -307,7 +322,7 @@ void DeleteLock(void* cs)
 bool LockStackEmpty()
 {
     LockData& lockdata = GetLockData();
-    std::lock_guard<std::mutex> lock(lockdata.dd_mutex);
+    STDLOCK(lockdata.dd_mutex);
     const auto it = lockdata.m_lock_stacks.find(std::this_thread::get_id());
     if (it == lockdata.m_lock_stacks.end()) {
         return true;
diff --git a/src/sync.h b/src/sync.h
index 548b51d9d168..123184d44f61 100644
--- a/src/sync.h
+++ b/src/sync.h
@@ -6,10 +6,8 @@
 #ifndef BITCOIN_SYNC_H
 #define BITCOIN_SYNC_H
 
-#ifdef DEBUG_LOCKCONTENTION
-#include <logging/timer.h>
-#endif
-
+// This header declares threading primitives compatible with Clang
+// Thread Safety Analysis and provides appropriate annotation macros.
 #include <threadsafety.h> // IWYU pragma: export
 #include <util/macros.h>
 
@@ -77,6 +75,16 @@ inline void DeleteLock(void* cs) {}
 inline bool LockStackEmpty() { return true; }
 #endif
 
+/*
+ * Called when a mutex fails to lock immediately because it is held by another
+ * thread, or spuriously. Responsible for locking the lock before returning.
+ */
+#ifdef DEBUG_LOCKCONTENTION
+
+template <typename LockType>
+void ContendedLock(std::string_view name, std::string_view file, int nLine, LockType& lock);
+#endif
+
 /**
  * Template mixin that adds -Wthread-safety locking annotations and lock order
  * checking to a subset of the mutex API.
@@ -151,10 +159,12 @@ class SCOPED_LOCKABLE UniqueLock : public MutexType::unique_lock
     {
         EnterCritical(pszName, pszFile, nLine, Base::mutex());
 #ifdef DEBUG_LOCKCONTENTION
-        if (Base::try_lock()) return;
-        LOG_TIME_MICROS_WITH_CATEGORY(strprintf("lock contention %s, %s:%d", pszName, pszFile, nLine), BCLog::LOCK);
-#endif
+        if (!Base::try_lock()) {
+            ContendedLock(pszName, pszFile, nLine, static_cast<Base&>(*this));
+        }
+#else
         Base::lock();
+#endif
     }
 
     bool TryEnter(const char* pszName, const char* pszFile, int nLine)
diff --git a/src/test/CMakeLists.txt b/src/test/CMakeLists.txt
index 7d9dccba8ef7..1365d6c147a6 100644
--- a/src/test/CMakeLists.txt
+++ b/src/test/CMakeLists.txt
@@ -25,6 +25,7 @@ add_executable(test_bitcoin
   blockmanager_tests.cpp
   bloom_tests.cpp
   bswap_tests.cpp
+  btcsignals_tests.cpp
   caches_tests.cpp
   chain_tests.cpp
   chainstate_write_tests.cpp
@@ -195,7 +196,7 @@ function(add_boost_test source_file)
   list(REMOVE_ITEM test_suite_macro "mock_process")
   foreach(test_suite_name IN LISTS test_suite_macro)
     add_test(NAME ${test_suite_name}
-      COMMAND test_bitcoin --run_test=${test_suite_name} --catch_system_error=no --log_level=test_suite -- DEBUG_LOG_OUT
+      COMMAND test_bitcoin --run_test=${test_suite_name} --catch_system_error=no --log_level=test_suite -- -printtoconsole=1
     )
     set_property(TEST ${test_suite_name} PROPERTY
       SKIP_REGULAR_EXPRESSION
diff --git a/src/test/addrman_tests.cpp b/src/test/addrman_tests.cpp
index a085c1f5a98e..cd1c651a08c2 100644
--- a/src/test/addrman_tests.cpp
+++ b/src/test/addrman_tests.cpp
@@ -12,6 +12,7 @@
 #include <random.h>
 #include <test/data/asmap.raw.h>
 #include <test/util/setup_common.h>
+#include <test/util/time.h>
 #include <util/asmap.h>
 #include <util/string.h>
 
@@ -93,6 +94,42 @@ BOOST_AUTO_TEST_CASE(addrman_simple)
     BOOST_CHECK(addrman->Size() >= 1);
 }
 
+
+BOOST_AUTO_TEST_CASE(addrman_terrible_many_failures)
+{
+    auto now = Now<NodeSeconds>();
+    SetMockTime(now - (ADDRMAN_MIN_FAIL + 24h));
+
+    auto addrman{std::make_unique<AddrMan>(EMPTY_NETGROUPMAN, DETERMINISTIC, GetCheckRatio(m_node))};
+
+    CNetAddr source{ResolveIP("250.1.2.1")};
+    CAddress addr{CAddress(ResolveService("250.250.2.1", 8333), NODE_NONE)};
+    addr.nTime = Now<NodeSeconds>();
+
+    BOOST_CHECK(addrman->Add({addr}, source));
+    BOOST_CHECK(addrman->Good(addr));
+
+    SetMockTime(now);
+
+    CAddress addr_helper{CAddress(ResolveService("251.252.2.3", 8333), NODE_NONE)};
+    addr_helper.nTime = Now<NodeSeconds>();
+    BOOST_CHECK(addrman->Add({addr_helper}, source));
+    BOOST_CHECK(addrman->Good(addr_helper));
+
+    for (int i = 0; i < ADDRMAN_MAX_FAILURES; ++i) {
+        // Use a time > 60s ago so IsTerrible doesn't bail out at the "tried in the last minute" check
+        addrman->Attempt(addr, /*fCountFailure=*/true, Now<NodeSeconds>() - 61s);
+    }
+
+    std::vector<CAddress> filtered{addrman->GetAddr(/*max_addresses=*/0, /*max_pct=*/0, /*network=*/std::nullopt)};
+    BOOST_CHECK_EQUAL(filtered.size(), 1U);
+    BOOST_CHECK_EQUAL(filtered[0].ToStringAddrPort(), "251.252.2.3:8333");
+
+    std::vector<CAddress> unfiltered{addrman->GetAddr(/*max_addresses=*/0, /*max_pct=*/0, /*network=*/std::nullopt, /*filtered=*/false)};
+    BOOST_CHECK_EQUAL(unfiltered.size(), 2U);
+}
+
+
 BOOST_AUTO_TEST_CASE(addrman_penalty_self_announcement)
 {
     SetMockTime(Now<NodeSeconds>());
@@ -994,7 +1031,8 @@ BOOST_AUTO_TEST_CASE(addrman_evictionworks)
     BOOST_CHECK_EQUAL(addrman->SelectTriedCollision().first.ToStringAddrPort(), "250.1.1.36:0");
 
     // Eviction is also successful if too much time has passed since last try
-    SetMockTime(GetTime() + 4 * 60 *60);
+    NodeClockContext clock_ctx{};
+    clock_ctx += 4h;
     addrman->ResolveCollisions();
     BOOST_CHECK(addrman->SelectTriedCollision().first.ToStringAddrPort() == "[::]:0");
     //Now 19 is in tried again, and 36 back to new
diff --git a/src/test/argsman_tests.cpp b/src/test/argsman_tests.cpp
index e91ae5e96f3a..c8802d3641ca 100644
--- a/src/test/argsman_tests.cpp
+++ b/src/test/argsman_tests.cpp
@@ -51,22 +51,9 @@ BOOST_AUTO_TEST_CASE(util_datadir)
 
 struct TestArgsManager : public ArgsManager
 {
-    TestArgsManager() { m_network_only_args.clear(); }
     void ReadConfigString(const std::string& str_config)
     {
-        std::istringstream streamConfig(str_config);
-        {
-            LOCK(cs_args);
-            m_settings.ro_config.clear();
-            m_config_sections.clear();
-        }
-        std::string error;
-        BOOST_REQUIRE(ReadConfigStream(streamConfig, "", error));
-    }
-    void SetNetworkOnlyArg(const std::string& arg)
-    {
-        LOCK(cs_args);
-        m_network_only_args.insert(arg);
+        BOOST_REQUIRE(ArgsManager::ReadConfigString(str_config));
     }
     void SetupArgs(const std::vector<std::pair<std::string, unsigned int>>& args)
     {
@@ -74,12 +61,9 @@ struct TestArgsManager : public ArgsManager
             AddArg(arg.first, "", arg.second, OptionsCategory::OPTIONS);
         }
     }
-    using ArgsManager::GetSetting;
-    using ArgsManager::GetSettingsList;
+
+    // make protected methods available for testing
     using ArgsManager::ReadConfigStream;
-    using ArgsManager::cs_args;
-    using ArgsManager::m_network;
-    using ArgsManager::m_settings;
 };
 
 //! Test GetSetting and GetArg type coercion, negation, and default value handling.
@@ -217,29 +201,34 @@ BOOST_AUTO_TEST_CASE(util_ParseParameters)
     const char *argv_test[] = {"-ignored", "-a", "-b", "-ccc=argument", "-ccc=multiple", "f", "-d=e"};
 
     std::string error;
-    LOCK(testArgs.cs_args);
     testArgs.SetupArgs({a, b, ccc, d});
     BOOST_CHECK(testArgs.ParseParameters(0, argv_test, error));
-    BOOST_CHECK(testArgs.m_settings.command_line_options.empty() && testArgs.m_settings.ro_config.empty());
+    testArgs.LockSettings([&](const common::Settings& s) {
+        BOOST_CHECK(s.command_line_options.empty() && s.ro_config.empty());
+    });
 
     BOOST_CHECK(testArgs.ParseParameters(1, argv_test, error));
-    BOOST_CHECK(testArgs.m_settings.command_line_options.empty() && testArgs.m_settings.ro_config.empty());
+    testArgs.LockSettings([&](const common::Settings& s) {
+        BOOST_CHECK(s.command_line_options.empty() && s.ro_config.empty());
+    });
 
     BOOST_CHECK(testArgs.ParseParameters(7, argv_test, error));
     // expectation: -ignored is ignored (program name argument),
     // -a, -b and -ccc end up in map, -d ignored because it is after
     // a non-option argument (non-GNU option parsing)
-    BOOST_CHECK(testArgs.m_settings.command_line_options.size() == 3 && testArgs.m_settings.ro_config.empty());
     BOOST_CHECK(testArgs.IsArgSet("-a") && testArgs.IsArgSet("-b") && testArgs.IsArgSet("-ccc")
                 && !testArgs.IsArgSet("f") && !testArgs.IsArgSet("-d"));
-    BOOST_CHECK(testArgs.m_settings.command_line_options.contains("a") && testArgs.m_settings.command_line_options.contains("b") && testArgs.m_settings.command_line_options.contains("ccc")
-                && !testArgs.m_settings.command_line_options.contains("f") && !testArgs.m_settings.command_line_options.contains("d"));
-
-    BOOST_CHECK(testArgs.m_settings.command_line_options["a"].size() == 1);
-    BOOST_CHECK(testArgs.m_settings.command_line_options["a"].front().get_str() == "");
-    BOOST_CHECK(testArgs.m_settings.command_line_options["ccc"].size() == 2);
-    BOOST_CHECK(testArgs.m_settings.command_line_options["ccc"].front().get_str() == "argument");
-    BOOST_CHECK(testArgs.m_settings.command_line_options["ccc"].back().get_str() == "multiple");
+    testArgs.LockSettings([&](const common::Settings& s) {
+        BOOST_CHECK(s.command_line_options.size() == 3 && s.ro_config.empty());
+        BOOST_CHECK(s.command_line_options.contains("a") && s.command_line_options.contains("b") && s.command_line_options.contains("ccc")
+                    && !s.command_line_options.contains("f") && !s.command_line_options.contains("d"));
+
+        BOOST_CHECK(s.command_line_options.at("a").size() == 1);
+        BOOST_CHECK(s.command_line_options.at("a").front().get_str() == "");
+        BOOST_CHECK(s.command_line_options.at("ccc").size() == 2);
+        BOOST_CHECK(s.command_line_options.at("ccc").front().get_str() == "argument");
+        BOOST_CHECK(s.command_line_options.at("ccc").back().get_str() == "multiple");
+    });
     BOOST_CHECK(testArgs.GetArgs("-ccc").size() == 2);
 }
 
@@ -331,7 +320,6 @@ BOOST_AUTO_TEST_CASE(util_GetBoolArg)
     const char *argv_test[] = {
         "ignored", "-a", "-nob", "-c=0", "-d=1", "-e=false", "-f=true"};
     std::string error;
-    LOCK(testArgs.cs_args);
     testArgs.SetupArgs({a, b, c, d, e, f});
     BOOST_CHECK(testArgs.ParseParameters(7, argv_test, error));
 
@@ -340,8 +328,9 @@ BOOST_AUTO_TEST_CASE(util_GetBoolArg)
         BOOST_CHECK(testArgs.IsArgSet({'-', opt}) || !opt);
 
     // Nothing else should be in the map
-    BOOST_CHECK(testArgs.m_settings.command_line_options.size() == 6 &&
-                testArgs.m_settings.ro_config.empty());
+    testArgs.LockSettings([&](const common::Settings& s) {
+        BOOST_CHECK(s.command_line_options.size() == 6 && s.ro_config.empty());
+    });
 
     // The -no prefix should get stripped on the way in.
     BOOST_CHECK(!testArgs.IsArgSet("-nob"));
@@ -437,7 +426,6 @@ BOOST_AUTO_TEST_CASE(util_ReadConfigStream)
        "iii=2\n";
 
     TestArgsManager test_args;
-    LOCK(test_args.cs_args);
     const auto a = std::make_pair("-a", ArgsManager::ALLOW_ANY);
     const auto b = std::make_pair("-b", ArgsManager::ALLOW_ANY);
     const auto ccc = std::make_pair("-ccc", ArgsManager::ALLOW_ANY);
@@ -454,24 +442,26 @@ BOOST_AUTO_TEST_CASE(util_ReadConfigStream)
     // expectation: a, b, ccc, d, fff, ggg, h, i end up in map
     // so do sec1.ccc, sec1.d, sec1.h, sec2.ccc, sec2.iii
 
-    BOOST_CHECK(test_args.m_settings.command_line_options.empty());
-    BOOST_CHECK(test_args.m_settings.ro_config.size() == 3);
-    BOOST_CHECK(test_args.m_settings.ro_config[""].size() == 8);
-    BOOST_CHECK(test_args.m_settings.ro_config["sec1"].size() == 3);
-    BOOST_CHECK(test_args.m_settings.ro_config["sec2"].size() == 2);
-
-    BOOST_CHECK(test_args.m_settings.ro_config[""].contains("a"));
-    BOOST_CHECK(test_args.m_settings.ro_config[""].contains("b"));
-    BOOST_CHECK(test_args.m_settings.ro_config[""].contains("ccc"));
-    BOOST_CHECK(test_args.m_settings.ro_config[""].contains("d"));
-    BOOST_CHECK(test_args.m_settings.ro_config[""].contains("fff"));
-    BOOST_CHECK(test_args.m_settings.ro_config[""].contains("ggg"));
-    BOOST_CHECK(test_args.m_settings.ro_config[""].contains("h"));
-    BOOST_CHECK(test_args.m_settings.ro_config[""].contains("i"));
-    BOOST_CHECK(test_args.m_settings.ro_config["sec1"].contains("ccc"));
-    BOOST_CHECK(test_args.m_settings.ro_config["sec1"].contains("h"));
-    BOOST_CHECK(test_args.m_settings.ro_config["sec2"].contains("ccc"));
-    BOOST_CHECK(test_args.m_settings.ro_config["sec2"].contains("iii"));
+    test_args.LockSettings([&](const common::Settings& s) {
+        BOOST_CHECK(s.command_line_options.empty());
+        BOOST_CHECK(s.ro_config.size() == 3);
+        BOOST_CHECK(s.ro_config.at("").size() == 8);
+        BOOST_CHECK(s.ro_config.at("sec1").size() == 3);
+        BOOST_CHECK(s.ro_config.at("sec2").size() == 2);
+
+        BOOST_CHECK(s.ro_config.at("").contains("a"));
+        BOOST_CHECK(s.ro_config.at("").contains("b"));
+        BOOST_CHECK(s.ro_config.at("").contains("ccc"));
+        BOOST_CHECK(s.ro_config.at("").contains("d"));
+        BOOST_CHECK(s.ro_config.at("").contains("fff"));
+        BOOST_CHECK(s.ro_config.at("").contains("ggg"));
+        BOOST_CHECK(s.ro_config.at("").contains("h"));
+        BOOST_CHECK(s.ro_config.at("").contains("i"));
+        BOOST_CHECK(s.ro_config.at("sec1").contains("ccc"));
+        BOOST_CHECK(s.ro_config.at("sec1").contains("h"));
+        BOOST_CHECK(s.ro_config.at("sec2").contains("ccc"));
+        BOOST_CHECK(s.ro_config.at("sec2").contains("iii"));
+    });
 
     BOOST_CHECK(test_args.IsArgSet("-a"));
     BOOST_CHECK(test_args.IsArgSet("-b"));
@@ -579,9 +569,12 @@ BOOST_AUTO_TEST_CASE(util_ReadConfigStream)
 
     // Test section only options
 
-    test_args.SetNetworkOnlyArg("-d");
-    test_args.SetNetworkOnlyArg("-ccc");
-    test_args.SetNetworkOnlyArg("-h");
+    const auto ccc2 = std::make_pair("-ccc", ArgsManager::ALLOW_ANY | ArgsManager::NETWORK_ONLY);
+    const auto d2 = std::make_pair("-d", ArgsManager::ALLOW_ANY | ArgsManager::NETWORK_ONLY);
+    const auto h2 = std::make_pair("-h", ArgsManager::ALLOW_ANY | ArgsManager::NETWORK_ONLY);
+    test_args.ClearArgs();
+    test_args.SetupArgs({a, b, ccc2, d2, e, fff, ggg, h2, i, iii});
+    test_args.ReadConfigString(str_config);
 
     test_args.SelectConfigNetwork(ChainTypeToString(ChainType::MAIN));
     BOOST_CHECK(test_args.GetArg("-d", "xxx") == "e");
@@ -604,25 +597,26 @@ BOOST_AUTO_TEST_CASE(util_ReadConfigStream)
 BOOST_AUTO_TEST_CASE(util_GetArg)
 {
     TestArgsManager testArgs;
-    LOCK(testArgs.cs_args);
-    testArgs.m_settings.command_line_options.clear();
-    testArgs.m_settings.command_line_options["strtest1"] = {"string..."};
-    // strtest2 undefined on purpose
-    testArgs.m_settings.command_line_options["inttest1"] = {"12345"};
-    testArgs.m_settings.command_line_options["inttest2"] = {"81985529216486895"};
-    // inttest3 undefined on purpose
-    testArgs.m_settings.command_line_options["booltest1"] = {""};
-    // booltest2 undefined on purpose
-    testArgs.m_settings.command_line_options["booltest3"] = {"0"};
-    testArgs.m_settings.command_line_options["booltest4"] = {"1"};
-
-    // priorities
-    testArgs.m_settings.command_line_options["pritest1"] = {"a", "b"};
-    testArgs.m_settings.ro_config[""]["pritest2"] = {"a", "b"};
-    testArgs.m_settings.command_line_options["pritest3"] = {"a"};
-    testArgs.m_settings.ro_config[""]["pritest3"] = {"b"};
-    testArgs.m_settings.command_line_options["pritest4"] = {"a","b"};
-    testArgs.m_settings.ro_config[""]["pritest4"] = {"c","d"};
+    testArgs.LockSettings([&](common::Settings& s) {
+        s.command_line_options.clear();
+        s.command_line_options["strtest1"] = {"string..."};
+        // strtest2 undefined on purpose
+        s.command_line_options["inttest1"] = {"12345"};
+        s.command_line_options["inttest2"] = {"81985529216486895"};
+        // inttest3 undefined on purpose
+        s.command_line_options["booltest1"] = {""};
+        // booltest2 undefined on purpose
+        s.command_line_options["booltest3"] = {"0"};
+        s.command_line_options["booltest4"] = {"1"};
+
+        // priorities
+        s.command_line_options["pritest1"] = {"a", "b"};
+        s.ro_config[""]["pritest2"] = {"a", "b"};
+        s.command_line_options["pritest3"] = {"a"};
+        s.ro_config[""]["pritest3"] = {"b"};
+        s.command_line_options["pritest4"] = {"a","b"};
+        s.ro_config[""]["pritest4"] = {"c","d"};
+    });
 
     BOOST_CHECK_EQUAL(testArgs.GetArg("strtest1", "default"), "string...");
     BOOST_CHECK_EQUAL(testArgs.GetArg("strtest2", "default"), "default");
@@ -815,16 +809,16 @@ BOOST_FIXTURE_TEST_CASE(util_ArgsMerge, ArgsMergeTestingSetup)
     ForEachMergeSetup([&](const ActionList& arg_actions, const ActionList& conf_actions, bool soft_set, bool force_set,
                           const std::string& section, const std::string& network, bool net_specific) {
         TestArgsManager parser;
-        LOCK(parser.cs_args);
 
         std::string desc = "net=";
         desc += network;
-        parser.m_network = network;
+        parser.SelectConfigNetwork(network);
 
         const std::string& name = net_specific ? "wallet" : "server";
         const std::string key = "-" + name;
-        parser.AddArg(key, name, ArgsManager::ALLOW_ANY, OptionsCategory::OPTIONS);
-        if (net_specific) parser.SetNetworkOnlyArg(key);
+        unsigned int flags = ArgsManager::ALLOW_ANY;
+        if (net_specific) flags |= ArgsManager::NETWORK_ONLY;
+        parser.AddArg(key, name, flags, OptionsCategory::OPTIONS);
 
         auto args = GetValues(arg_actions, section, name, "a");
         std::vector<const char*> argv = {"ignored"};
@@ -949,7 +943,6 @@ BOOST_FIXTURE_TEST_CASE(util_ChainMerge, ChainMergeTestingSetup)
 
     ForEachMergeSetup([&](const ActionList& arg_actions, const ActionList& conf_actions) {
         TestArgsManager parser;
-        LOCK(parser.cs_args);
         parser.AddArg("-regtest", "regtest", ArgsManager::ALLOW_ANY, OptionsCategory::OPTIONS);
         parser.AddArg("-testnet4", "testnet4", ArgsManager::ALLOW_ANY, OptionsCategory::OPTIONS);
 
@@ -1027,14 +1020,14 @@ BOOST_AUTO_TEST_CASE(util_ReadWriteSettings)
     // Test writing setting.
     TestArgsManager args1;
     args1.ForceSetArg("-datadir", fs::PathToString(m_path_root));
-    args1.LockSettings([&](common::Settings& settings) { settings.rw_settings["name"] = "value"; });
+    args1.LockSettings([&](common::Settings& s) { s.rw_settings["name"] = "value"; });
     args1.WriteSettingsFile();
 
     // Test reading setting.
     TestArgsManager args2;
     args2.ForceSetArg("-datadir", fs::PathToString(m_path_root));
     args2.ReadSettingsFile();
-    args2.LockSettings([&](common::Settings& settings) { BOOST_CHECK_EQUAL(settings.rw_settings["name"].get_str(), "value"); });
+    args2.LockSettings([&](common::Settings& s) { BOOST_CHECK_EQUAL(s.rw_settings["name"].get_str(), "value"); });
 
     // Test error logging, and remove previously written setting.
     {
diff --git a/src/test/banman_tests.cpp b/src/test/banman_tests.cpp
index 2b0c62189c6a..d1e79e357742 100644
--- a/src/test/banman_tests.cpp
+++ b/src/test/banman_tests.cpp
@@ -8,16 +8,16 @@
 #include <streams.h>
 #include <test/util/logging.h>
 #include <test/util/setup_common.h>
+#include <test/util/time.h>
 #include <util/readwritefile.h>
 
-
 #include <boost/test/unit_test.hpp>
 
 BOOST_FIXTURE_TEST_SUITE(banman_tests, BasicTestingSetup)
 
 BOOST_AUTO_TEST_CASE(file)
 {
-    SetMockTime(777s);
+    NodeClockContext clock_ctx{777s};
     const fs::path banlist_path{m_args.GetDataDirBase() / "banlist_test"};
     {
         const std::string entries_write{
diff --git a/src/test/bech32_tests.cpp b/src/test/bech32_tests.cpp
index c9eed3857146..795510cfa21b 100644
--- a/src/test/bech32_tests.cpp
+++ b/src/test/bech32_tests.cpp
@@ -4,7 +4,7 @@
 // file COPYING or http://www.opensource.org/licenses/mit-license.php.
 
 #include <bech32.h>
-#include <test/util/str.h>
+#include <util/strencodings.h>
 
 #include <boost/test/unit_test.hpp>
 
diff --git a/src/test/btcsignals_tests.cpp b/src/test/btcsignals_tests.cpp
new file mode 100644
index 000000000000..b3203ebeb231
--- /dev/null
+++ b/src/test/btcsignals_tests.cpp
@@ -0,0 +1,280 @@
+// Copyright (c) The Bitcoin Core developers
+// Distributed under the MIT software license, see the accompanying
+// file COPYING or http://www.opensource.org/licenses/mit-license.php.
+
+#include <btcsignals.h>
+#include <test/util/setup_common.h>
+
+#include <boost/test/unit_test.hpp>
+
+#include <semaphore>
+
+namespace {
+
+
+struct MoveOnlyData {
+    MoveOnlyData(int data) : m_data(data) {}
+    MoveOnlyData(MoveOnlyData&&) = default;
+
+    MoveOnlyData& operator=(MoveOnlyData&&) = delete;
+    MoveOnlyData(const MoveOnlyData&) = delete;
+    MoveOnlyData& operator=(const MoveOnlyData&) = delete;
+
+    int m_data;
+};
+
+MoveOnlyData MoveOnlyReturnCallback(int val)
+{
+    return {val};
+}
+
+void IncrementCallback(int& val)
+{
+    val++;
+}
+void SquareCallback(int& val)
+{
+    val *= val;
+}
+
+bool ReturnTrue()
+{
+    return true;
+}
+bool ReturnFalse()
+{
+    return false;
+}
+
+} // anonymous namespace
+
+BOOST_FIXTURE_TEST_SUITE(btcsignals_tests, BasicTestingSetup)
+
+/* Callbacks should always be executed in the order in which they were added
+ */
+BOOST_AUTO_TEST_CASE(callback_order)
+{
+    btcsignals::signal<void(int&)> sig0;
+    sig0.connect(IncrementCallback);
+    sig0.connect(SquareCallback);
+    int val{3};
+    sig0(val);
+    BOOST_CHECK_EQUAL(val, 16);
+    BOOST_CHECK(!sig0.empty());
+}
+
+BOOST_AUTO_TEST_CASE(disconnects)
+{
+    btcsignals::signal<void(int&)> sig0;
+    auto conn0 = sig0.connect(IncrementCallback);
+    auto conn1 = sig0.connect(SquareCallback);
+    conn1.disconnect();
+    BOOST_CHECK(!sig0.empty());
+    int val{3};
+    sig0(val);
+    BOOST_CHECK_EQUAL(val, 4);
+
+    BOOST_CHECK(!sig0.empty());
+    conn0.disconnect();
+    BOOST_CHECK(sig0.empty());
+    sig0(val);
+    BOOST_CHECK_EQUAL(val, 4);
+
+    conn0 = sig0.connect(IncrementCallback);
+    conn1 = sig0.connect(IncrementCallback);
+    BOOST_CHECK(!sig0.empty());
+    sig0(val);
+    BOOST_CHECK_EQUAL(val, 6);
+    conn1.disconnect();
+
+    BOOST_CHECK(conn0.connected());
+    {
+        btcsignals::scoped_connection scope(conn0);
+    }
+    BOOST_CHECK(!conn0.connected());
+    BOOST_CHECK(sig0.empty());
+    sig0(val);
+    BOOST_CHECK_EQUAL(val, 6);
+}
+
+/* Check that move-only return types work correctly
+ */
+BOOST_AUTO_TEST_CASE(moveonly_return)
+{
+    btcsignals::signal<MoveOnlyData(int)> sig0;
+    sig0.connect(MoveOnlyReturnCallback);
+    int data{3};
+    auto ret = sig0(data);
+    BOOST_CHECK_EQUAL(ret->m_data, 3);
+}
+
+/* The result of the signal invocation should always be the result of the last
+ * enabled callback.
+ */
+BOOST_AUTO_TEST_CASE(return_value)
+{
+    btcsignals::signal<bool()> sig0;
+    decltype(sig0)::result_type ret;
+    ret = sig0();
+    BOOST_CHECK(!ret);
+    {
+        btcsignals::scoped_connection conn0 = sig0.connect(ReturnTrue);
+        ret = sig0();
+        BOOST_CHECK(ret && *ret == true);
+    }
+    ret = sig0();
+    BOOST_CHECK(!ret);
+    {
+        btcsignals::scoped_connection conn1 = sig0.connect(ReturnTrue);
+        btcsignals::scoped_connection conn0 = sig0.connect(ReturnFalse);
+        ret = sig0();
+        BOOST_CHECK(ret && *ret == false);
+        conn0.disconnect();
+        ret = sig0();
+        BOOST_CHECK(ret && *ret == true);
+    }
+    ret = sig0();
+    BOOST_CHECK(!ret);
+}
+
+/* Test the thread-safety of connect/disconnect/empty/connected/callbacks.
+ * Connect sig0 to an incrementor function and loop in a thread.
+ * Meanwhile, in another thread, inject and call new increment callbacks.
+ * Both threads are constantly calling empty/connected.
+ * Though the end-result is undefined due to a non-deterministic number of
+ * total callbacks executed, this should all be completely threadsafe.
+ * Sanitizers should pick up any buggy data race behavior (if present).
+ */
+BOOST_AUTO_TEST_CASE(thread_safety)
+{
+    btcsignals::signal<void()> sig0;
+    std::atomic<uint32_t> val{0};
+    auto conn0 = sig0.connect([&val] {
+        val++;
+    });
+
+    std::thread incrementor([&conn0, &sig0] {
+        for (int i = 0; i < 1000; i++) {
+            sig0();
+        }
+        // Because these calls are purposely happening on both threads at the
+        // same time, these must be asserts rather than BOOST_CHECKs to prevent
+        // a race inside of BOOST_CHECK itself (writing to the log).
+        assert(!sig0.empty());
+        assert(conn0.connected());
+    });
+
+    std::thread extra_increment_injector([&conn0, &sig0, &val] {
+        static constexpr size_t num_extra_conns{1000};
+        std::vector<btcsignals::scoped_connection> extra_conns;
+        extra_conns.reserve(num_extra_conns);
+        for (size_t i = 0; i < num_extra_conns; i++) {
+            BOOST_CHECK(!sig0.empty());
+            BOOST_CHECK(conn0.connected());
+            extra_conns.emplace_back(sig0.connect([&val] {
+                val++;
+            }));
+            sig0();
+        }
+    });
+    incrementor.join();
+    extra_increment_injector.join();
+    conn0.disconnect();
+    BOOST_CHECK(sig0.empty());
+
+    // sig will have been called 2000 times, and at least 1000 of those will
+    // have been executing multiple incrementing callbacks. So while val is
+    // probably MUCH bigger, it's guaranteed to be at least 3000.
+    BOOST_CHECK_GE(val.load(), 3000);
+}
+
+/* Test that connection and disconnection works from within signal
+ * callbacks.
+ */
+BOOST_AUTO_TEST_CASE(recursion_safety)
+{
+    btcsignals::connection conn0, conn1, conn2;
+    btcsignals::signal<void()> sig0;
+    bool nonrecursive_callback_ran{false};
+    bool recursive_callback_ran{false};
+
+    conn0 = sig0.connect([&] {
+        BOOST_CHECK(!sig0.empty());
+        nonrecursive_callback_ran = true;
+    });
+    BOOST_CHECK(!nonrecursive_callback_ran);
+    sig0();
+    BOOST_CHECK(nonrecursive_callback_ran);
+    BOOST_CHECK(conn0.connected());
+
+    nonrecursive_callback_ran = false;
+    conn1 = sig0.connect([&] {
+        nonrecursive_callback_ran = true;
+        conn1.disconnect();
+    });
+    BOOST_CHECK(!nonrecursive_callback_ran);
+    BOOST_CHECK(conn0.connected());
+    BOOST_CHECK(conn1.connected());
+    sig0();
+    BOOST_CHECK(nonrecursive_callback_ran);
+    BOOST_CHECK(conn0.connected());
+    BOOST_CHECK(!conn1.connected());
+
+    nonrecursive_callback_ran = false;
+    conn1 = sig0.connect([&] {
+        conn2 = sig0.connect([&] {
+            BOOST_CHECK(conn0.connected());
+            recursive_callback_ran = true;
+            conn0.disconnect();
+            conn2.disconnect();
+        });
+        nonrecursive_callback_ran = true;
+        conn1.disconnect();
+    });
+    BOOST_CHECK(!nonrecursive_callback_ran);
+    BOOST_CHECK(!recursive_callback_ran);
+    BOOST_CHECK(conn0.connected());
+    BOOST_CHECK(conn1.connected());
+    BOOST_CHECK(!conn2.connected());
+    sig0();
+    BOOST_CHECK(nonrecursive_callback_ran);
+    BOOST_CHECK(!recursive_callback_ran);
+    BOOST_CHECK(conn0.connected());
+    BOOST_CHECK(!conn1.connected());
+    BOOST_CHECK(conn2.connected());
+    sig0();
+    BOOST_CHECK(recursive_callback_ran);
+    BOOST_CHECK(!conn0.connected());
+    BOOST_CHECK(!conn1.connected());
+    BOOST_CHECK(!conn2.connected());
+}
+
+/* Test that disconnection from another thread works in real time
+ */
+BOOST_AUTO_TEST_CASE(disconnect_thread_safety)
+{
+    btcsignals::connection conn0, conn1, conn2;
+    btcsignals::signal<void(int&)> sig0;
+    std::binary_semaphore done1{0};
+    std::binary_semaphore done2{0};
+    int val{0};
+
+    conn0 = sig0.connect([&](int&) {
+        conn1.disconnect();
+        done1.release();
+        done2.acquire();
+    });
+    conn1 = sig0.connect(IncrementCallback);
+    conn2 = sig0.connect(IncrementCallback);
+    std::thread thr([&] {
+        done1.acquire();
+        conn2.disconnect();
+        done2.release();
+    });
+    sig0(val);
+    thr.join();
+    BOOST_CHECK_EQUAL(val, 0);
+}
+
+
+BOOST_AUTO_TEST_SUITE_END()
diff --git a/src/test/chainstate_write_tests.cpp b/src/test/chainstate_write_tests.cpp
index 4a79cd8a4639..d0925b6192f6 100644
--- a/src/test/chainstate_write_tests.cpp
+++ b/src/test/chainstate_write_tests.cpp
@@ -3,6 +3,7 @@
 // file COPYING or http://www.opensource.org/licenses/mit-license.php.
 
 #include <test/util/setup_common.h>
+#include <test/util/time.h>
 #include <validation.h>
 #include <validationinterface.h>
 
@@ -30,6 +31,7 @@ BOOST_FIXTURE_TEST_CASE(chainstate_write_interval, TestingSetup)
     m_node.validation_signals->RegisterSharedValidationInterface(sub);
     auto& chainstate{Assert(m_node.chainman)->ActiveChainstate()};
     BlockValidationState state_dummy{};
+    NodeClockContext clock_ctx{};
 
     // The first periodic flush sets m_next_write and does not flush
     chainstate.FlushStateToDisk(state_dummy, FlushStateMode::PERIODIC);
@@ -37,12 +39,12 @@ BOOST_FIXTURE_TEST_CASE(chainstate_write_interval, TestingSetup)
     BOOST_CHECK(!sub->m_did_flush);
 
     // The periodic flush interval is between 50 and 70 minutes (inclusive)
-    SetMockTime(GetTime<std::chrono::minutes>() + DATABASE_WRITE_INTERVAL_MIN - 1min);
+    clock_ctx += DATABASE_WRITE_INTERVAL_MIN - 1min;
     chainstate.FlushStateToDisk(state_dummy, FlushStateMode::PERIODIC);
     m_node.validation_signals->SyncWithValidationInterfaceQueue();
     BOOST_CHECK(!sub->m_did_flush);
 
-    SetMockTime(GetTime<std::chrono::minutes>() + DATABASE_WRITE_INTERVAL_MAX);
+    clock_ctx += DATABASE_WRITE_INTERVAL_MAX;
     chainstate.FlushStateToDisk(state_dummy, FlushStateMode::PERIODIC);
     m_node.validation_signals->SyncWithValidationInterfaceQueue();
     BOOST_CHECK(sub->m_did_flush);
diff --git a/src/test/checkqueue_tests.cpp b/src/test/checkqueue_tests.cpp
index 2d13a267607c..3e2fc83ff28e 100644
--- a/src/test/checkqueue_tests.cpp
+++ b/src/test/checkqueue_tests.cpp
@@ -21,16 +21,16 @@
 #include <vector>
 
 /**
- * Identical to TestingSetup but excludes lock contention logging if
+ * Identical to BasicTestingSetup but excludes lock contention logging if
  * `DEBUG_LOCKCONTENTION` is defined, as some of these tests are designed to be
  * heavily contested to trigger race conditions or other issues.
  */
-struct NoLockLoggingTestingSetup : public TestingSetup {
+struct NoLockLoggingTestingSetup : public BasicTestingSetup {
     NoLockLoggingTestingSetup()
 #ifdef DEBUG_LOCKCONTENTION
-        : TestingSetup{ChainType::MAIN, {.extra_args = { "-debugexclude=lock" } }} {}
+        : BasicTestingSetup{ChainType::MAIN, {.extra_args = { "-debugexclude=lock" } }} {}
 #else
-        : TestingSetup{ChainType::MAIN} {}
+        : BasicTestingSetup{ChainType::MAIN} {}
 #endif
 };
 
diff --git a/src/test/coins_tests.cpp b/src/test/coins_tests.cpp
index 8321bf6a18cf..2a180f25936a 100644
--- a/src/test/coins_tests.cpp
+++ b/src/test/coins_tests.cpp
@@ -38,14 +38,14 @@ bool operator==(const Coin &a, const Coin &b) {
            a.out == b.out;
 }
 
-class CCoinsViewTest : public CCoinsView
+class CCoinsViewTest : public CoinsViewEmpty
 {
     FastRandomContext& m_rng;
     uint256 hashBestBlock_;
     std::map<COutPoint, Coin> map_;
 
 public:
-    CCoinsViewTest(FastRandomContext& rng) : m_rng{rng} {}
+    explicit CCoinsViewTest(FastRandomContext& rng) : m_rng{rng} {}
 
     std::optional<Coin> GetCoin(const COutPoint& outpoint) const override
     {
@@ -55,7 +55,7 @@ class CCoinsViewTest : public CCoinsView
 
     uint256 GetBestBlock() const override { return hashBestBlock_; }
 
-    void BatchWrite(CoinsViewCacheCursor& cursor, const uint256& hashBlock) override
+    void BatchWrite(CoinsViewCacheCursor& cursor, const uint256& block_hash) override
     {
         for (auto it{cursor.Begin()}; it != cursor.End(); it = cursor.NextAndMaybeErase(*it)){
             if (it->second.IsDirty()) {
@@ -67,8 +67,8 @@ class CCoinsViewTest : public CCoinsView
                 }
             }
         }
-        if (!hashBlock.IsNull())
-            hashBestBlock_ = hashBlock;
+        if (!block_hash.IsNull())
+            hashBestBlock_ = block_hash;
     }
 };
 
@@ -677,8 +677,7 @@ class SingleEntryCacheTest
         }
     }
 
-    CCoinsView root;
-    CCoinsViewCacheTest base{&root};
+    CCoinsViewCacheTest base{&CoinsViewEmpty::Get()};
     CCoinsViewCacheTest cache{&base};
 };
 
@@ -910,7 +909,7 @@ void TestFlushBehavior(
         for (auto i = all_caches.rbegin(); i != all_caches.rend(); ++i) {
             auto& cache = *i;
             cache->SanityCheck();
-            // hashBlock must be filled before flushing to disk; value is
+            // block_hash must be filled before flushing to disk; value is
             // unimportant here. This is normally done during connect/disconnect block.
             cache->SetBestBlock(m_rng.rand256());
             erase ? cache->Flush() : cache->Sync();
@@ -1087,8 +1086,7 @@ BOOST_AUTO_TEST_CASE(coins_resource_is_used)
 
 BOOST_AUTO_TEST_CASE(ccoins_addcoin_exception_keeps_usage_balanced)
 {
-    CCoinsView root;
-    CCoinsViewCacheTest cache{&root};
+    CCoinsViewCacheTest cache{&CoinsViewEmpty::Get()};
 
     const COutPoint outpoint{Txid::FromUint256(m_rng.rand256()), m_rng.rand32()};
 
@@ -1105,8 +1103,7 @@ BOOST_AUTO_TEST_CASE(ccoins_addcoin_exception_keeps_usage_balanced)
 
 BOOST_AUTO_TEST_CASE(ccoins_emplace_duplicate_keeps_usage_balanced)
 {
-    CCoinsView root;
-    CCoinsViewCacheTest cache{&root};
+    CCoinsViewCacheTest cache{&CoinsViewEmpty::Get()};
 
     const COutPoint outpoint{Txid::FromUint256(m_rng.rand256()), m_rng.rand32()};
 
diff --git a/src/test/denialofservice_tests.cpp b/src/test/denialofservice_tests.cpp
index 776a18788e32..9709eacd8b7b 100644
--- a/src/test/denialofservice_tests.cpp
+++ b/src/test/denialofservice_tests.cpp
@@ -16,6 +16,7 @@
 #include <test/util/net.h>
 #include <test/util/random.h>
 #include <test/util/setup_common.h>
+#include <test/util/time.h>
 #include <util/string.h>
 #include <util/time.h>
 #include <validation.h>
@@ -90,17 +91,17 @@ BOOST_AUTO_TEST_CASE(outbound_slow_chain_eviction)
     }
     connman.FlushSendBuffer(dummyNode1);
 
-    int64_t nStartTime = GetTime();
-    // Wait 21 minutes
-    SetMockTime(nStartTime+21*60);
+    NodeClockContext clock_ctx{};
+    clock_ctx += 21min;
+
     BOOST_CHECK(peerman.SendMessages(dummyNode1)); // should result in getheaders
     {
         LOCK(dummyNode1.cs_vSend);
         const auto& [to_send, _more, _msg_type] = dummyNode1.m_transport->GetBytesToSend(false);
         BOOST_CHECK(!to_send.empty());
     }
-    // Wait 3 more minutes
-    SetMockTime(nStartTime+24*60);
+
+    clock_ctx += 3min;
     BOOST_CHECK(peerman.SendMessages(dummyNode1)); // should result in disconnect
     BOOST_CHECK(dummyNode1.fDisconnect == true);
 
@@ -151,9 +152,9 @@ BOOST_FIXTURE_TEST_CASE(stale_tip_peer_management, OutboundTest)
     CConnman::Options options;
     options.m_max_automatic_connections = DEFAULT_MAX_PEER_CONNECTIONS;
 
-    const auto time_init{GetTime<std::chrono::seconds>()};
-    SetMockTime(time_init);
-    const auto time_later{time_init + 3 * std::chrono::seconds{m_node.chainman->GetConsensus().nPowTargetSpacing} + 1s};
+    const auto time_init{Now<NodeSeconds>()};
+    NodeClockContext clock_ctx{time_init};
+    const auto delta{3 * std::chrono::seconds{m_node.chainman->GetConsensus().nPowTargetSpacing} + 1s};
     connman->Init(options);
     std::vector<CNode *> vNodes;
 
@@ -169,7 +170,7 @@ BOOST_FIXTURE_TEST_CASE(stale_tip_peer_management, OutboundTest)
         BOOST_CHECK(node->fDisconnect == false);
     }
 
-    SetMockTime(time_later);
+    clock_ctx += delta;
 
     // Now tip should definitely be stale, and we should look for an extra
     // outbound peer
@@ -184,9 +185,9 @@ BOOST_FIXTURE_TEST_CASE(stale_tip_peer_management, OutboundTest)
     // If we add one more peer, something should get marked for eviction
     // on the next check (since we're mocking the time to be in the future, the
     // required time connected check should be satisfied).
-    SetMockTime(time_init);
+    clock_ctx.set(time_init);
     AddRandomOutboundPeer(id, vNodes, *peerLogic, *connman, ConnectionType::OUTBOUND_FULL_RELAY);
-    SetMockTime(time_later);
+    clock_ctx += delta;
 
     peerLogic->CheckForStaleTipAndEvictPeers();
     for (int i = 0; i < max_outbound_full_relay; ++i) {
@@ -212,9 +213,9 @@ BOOST_FIXTURE_TEST_CASE(stale_tip_peer_management, OutboundTest)
 
     // Add an onion peer, that will be protected because it is the only one for
     // its network, so another peer gets disconnected instead.
-    SetMockTime(time_init);
+    clock_ctx.set(time_init);
     AddRandomOutboundPeer(id, vNodes, *peerLogic, *connman, ConnectionType::OUTBOUND_FULL_RELAY, /*onion_peer=*/true);
-    SetMockTime(time_later);
+    clock_ctx += delta;
     peerLogic->CheckForStaleTipAndEvictPeers();
 
     for (int i = 0; i < max_outbound_full_relay - 2; ++i) {
@@ -225,9 +226,9 @@ BOOST_FIXTURE_TEST_CASE(stale_tip_peer_management, OutboundTest)
     BOOST_CHECK(vNodes[max_outbound_full_relay]->fDisconnect == false);
 
     // Add a second onion peer which won't be protected
-    SetMockTime(time_init);
+    clock_ctx.set(time_init);
     AddRandomOutboundPeer(id, vNodes, *peerLogic, *connman, ConnectionType::OUTBOUND_FULL_RELAY, /*onion_peer=*/true);
-    SetMockTime(time_later);
+    clock_ctx += delta;
     peerLogic->CheckForStaleTipAndEvictPeers();
 
     BOOST_CHECK(vNodes.back()->fDisconnect == true);
@@ -246,7 +247,7 @@ BOOST_FIXTURE_TEST_CASE(block_relay_only_eviction, OutboundTest)
     auto peerLogic = PeerManager::make(*connman, *m_node.addrman, nullptr, *m_node.chainman, *m_node.mempool, *m_node.warnings, {});
 
     constexpr int max_outbound_block_relay{MAX_BLOCK_RELAY_ONLY_CONNECTIONS};
-    constexpr int64_t MINIMUM_CONNECT_TIME{30};
+    constexpr auto MINIMUM_CONNECT_TIME{30s};
     CConnman::Options options;
     options.m_max_automatic_connections = DEFAULT_MAX_PEER_CONNECTIONS;
 
@@ -273,7 +274,8 @@ BOOST_FIXTURE_TEST_CASE(block_relay_only_eviction, OutboundTest)
     }
     BOOST_CHECK(vNodes.back()->fDisconnect == false);
 
-    SetMockTime(GetTime() + MINIMUM_CONNECT_TIME + 1);
+    NodeClockContext clock_ctx{};
+    clock_ctx += MINIMUM_CONNECT_TIME;
     peerLogic->CheckForStaleTipAndEvictPeers();
     for (int i = 0; i < max_outbound_block_relay; ++i) {
         BOOST_CHECK(vNodes[i]->fDisconnect == false);
@@ -411,8 +413,7 @@ BOOST_AUTO_TEST_CASE(DoS_bantime)
     auto peerLogic = PeerManager::make(*connman, *m_node.addrman, banman.get(), *m_node.chainman, *m_node.mempool, *m_node.warnings, {});
 
     banman->ClearBanned();
-    int64_t nStartTime = GetTime();
-    SetMockTime(nStartTime); // Overrides future calls to GetTime()
+    const NodeClockContext clock_ctx{}; // keep mocktime constant
 
     CAddress addr(ip(0xa0b0c001), NODE_NONE);
     NodeId id{0};
diff --git a/src/test/disconnected_transactions.cpp b/src/test/disconnected_transactions.cpp
index a363fe8197de..076d81cfb351 100644
--- a/src/test/disconnected_transactions.cpp
+++ b/src/test/disconnected_transactions.cpp
@@ -7,10 +7,10 @@
 #include <kernel/disconnected_transactions.h>
 #include <test/util/setup_common.h>
 
-BOOST_FIXTURE_TEST_SUITE(disconnected_transactions, TestChain100Setup)
+BOOST_AUTO_TEST_SUITE(disconnected_transactions)
 
 //! Tests that DisconnectedBlockTransactions limits its own memory properly
-BOOST_AUTO_TEST_CASE(disconnectpool_memory_limits)
+BOOST_FIXTURE_TEST_CASE(disconnectpool_memory_limits, TestChain100Setup)
 {
     // Use the coinbase transactions from TestChain100Setup. It doesn't matter whether these
     // transactions would realistically be in a block together, they just need distinct txids and
diff --git a/src/test/fuzz/addrman.cpp b/src/test/fuzz/addrman.cpp
index 88260b272f2e..750480285de9 100644
--- a/src/test/fuzz/addrman.cpp
+++ b/src/test/fuzz/addrman.cpp
@@ -14,6 +14,7 @@
 #include <test/fuzz/util.h>
 #include <test/fuzz/util/net.h>
 #include <test/util/setup_common.h>
+#include <test/util/time.h>
 #include <util/asmap.h>
 #include <util/chaintype.h>
 
@@ -116,7 +117,7 @@ FUZZ_TARGET(addrman, .init = initialize_addrman)
 {
     SeedRandomStateForTest(SeedRand::ZEROS);
     FuzzedDataProvider fuzzed_data_provider(buffer.data(), buffer.size());
-    SetMockTime(ConsumeTime(fuzzed_data_provider));
+    NodeClockContext clock_ctx{ConsumeTime(fuzzed_data_provider)};
     NetGroupManager netgroupman{ConsumeNetGroupManager(fuzzed_data_provider)};
     auto addr_man_ptr = std::make_unique<AddrManDeterministic>(netgroupman, fuzzed_data_provider, GetCheckRatio());
     if (fuzzed_data_provider.ConsumeBool()) {
@@ -144,7 +145,7 @@ FUZZ_TARGET(addrman, .init = initialize_addrman)
                     addresses.push_back(ConsumeAddress(fuzzed_data_provider));
                 }
                 auto net_addr = ConsumeNetAddr(fuzzed_data_provider);
-                auto time_penalty = ConsumeDuration(fuzzed_data_provider, /*min=*/0s, /*max=*/100000000s);
+                auto time_penalty = ConsumeDuration<std::chrono::seconds>(fuzzed_data_provider, /*min=*/0s, /*max=*/100000000s);
                 addr_man.Add(addresses, net_addr, time_penalty);
             },
             [&] {
@@ -201,7 +202,7 @@ FUZZ_TARGET(addrman_serdeser, .init = initialize_addrman)
 {
     SeedRandomStateForTest(SeedRand::ZEROS);
     FuzzedDataProvider fuzzed_data_provider(buffer.data(), buffer.size());
-    SetMockTime(ConsumeTime(fuzzed_data_provider));
+    NodeClockContext clock_ctx{ConsumeTime(fuzzed_data_provider)};
 
     NetGroupManager netgroupman{ConsumeNetGroupManager(fuzzed_data_provider)};
     AddrManDeterministic addr_man1{netgroupman, fuzzed_data_provider, GetCheckRatio()};
diff --git a/src/test/fuzz/banman.cpp b/src/test/fuzz/banman.cpp
index e65b4da03abf..aa7e76b90c79 100644
--- a/src/test/fuzz/banman.cpp
+++ b/src/test/fuzz/banman.cpp
@@ -10,6 +10,7 @@
 #include <test/fuzz/util.h>
 #include <test/fuzz/util/net.h>
 #include <test/util/setup_common.h>
+#include <test/util/time.h>
 #include <util/fs.h>
 #include <util/readwritefile.h>
 
@@ -44,7 +45,7 @@ FUZZ_TARGET(banman, .init = initialize_banman)
 {
     SeedRandomStateForTest(SeedRand::ZEROS);
     FuzzedDataProvider fuzzed_data_provider{buffer.data(), buffer.size()};
-    SetMockTime(ConsumeTime(fuzzed_data_provider));
+    NodeClockContext clock_ctx{ConsumeTime(fuzzed_data_provider)};
     fs::path banlist_file = gArgs.GetDataDirNet() / "fuzzed_banlist";
 
     const bool start_with_corrupted_banlist{fuzzed_data_provider.ConsumeBool()};
@@ -124,7 +125,7 @@ FUZZ_TARGET(banman, .init = initialize_banman)
         }
         if (!force_read_and_write_to_err) {
             ban_man.DumpBanlist();
-            SetMockTime(ConsumeTime(fuzzed_data_provider));
+            clock_ctx.set(ConsumeTime(fuzzed_data_provider));
             banmap_t banmap;
             ban_man.GetBanned(banmap);
             BanMan ban_man_read{banlist_file, /*client_interface=*/nullptr, /*default_ban_time=*/0};
diff --git a/src/test/fuzz/bech32.cpp b/src/test/fuzz/bech32.cpp
index 8c43bbbbd5b3..ae8e73cb419a 100644
--- a/src/test/fuzz/bech32.cpp
+++ b/src/test/fuzz/bech32.cpp
@@ -5,7 +5,6 @@
 #include <bech32.h>
 #include <test/fuzz/fuzz.h>
 #include <test/fuzz/FuzzedDataProvider.h>
-#include <test/util/str.h>
 #include <util/strencodings.h>
 
 #include <cassert>
diff --git a/src/test/fuzz/block_index_tree.cpp b/src/test/fuzz/block_index_tree.cpp
index 5112a7e0f2ea..0e333cd62881 100644
--- a/src/test/fuzz/block_index_tree.cpp
+++ b/src/test/fuzz/block_index_tree.cpp
@@ -12,6 +12,7 @@
 #include <test/fuzz/fuzz.h>
 #include <test/fuzz/util.h>
 #include <test/util/setup_common.h>
+#include <test/util/time.h>
 #include <test/util/validation.h>
 #include <validation.h>
 
@@ -41,7 +42,7 @@ void initialize_block_index_tree()
 FUZZ_TARGET(block_index_tree, .init = initialize_block_index_tree)
 {
     FuzzedDataProvider fuzzed_data_provider(buffer.data(), buffer.size());
-    SetMockTime(ConsumeTime(fuzzed_data_provider));
+    NodeClockContext clock_ctx{ConsumeTime(fuzzed_data_provider)};
     auto& chainman = static_cast<TestChainstateManager&>(*g_setup->m_node.chainman);
     auto& blockman = static_cast<TestBlockManager&>(chainman.m_blockman);
     CBlockIndex* genesis = chainman.ActiveChainstate().m_chain[0];
diff --git a/src/test/fuzz/coins_view.cpp b/src/test/fuzz/coins_view.cpp
index a47dc3706c87..c11581d2d3c3 100644
--- a/src/test/fuzz/coins_view.cpp
+++ b/src/test/fuzz/coins_view.cpp
@@ -90,9 +90,11 @@ void initialize_coins_view()
     static const auto testing_setup = MakeNoLogFileContext<>();
 }
 
-void TestCoinsView(FuzzedDataProvider& fuzzed_data_provider, CCoinsViewCache& coins_view_cache, CCoinsView& backend_coins_view, bool is_db)
+void TestCoinsView(FuzzedDataProvider& fuzzed_data_provider, CCoinsViewCache& coins_view_cache, CCoinsView* backend_coins_view)
 {
+    const bool is_db{dynamic_cast<CCoinsViewDB*>(backend_coins_view) != nullptr};
     bool good_data{true};
+    auto* original_backend{backend_coins_view};
 
     if (is_db) coins_view_cache.SetBestBlock(uint256::ONE);
     COutPoint random_out_point;
@@ -124,15 +126,13 @@ void TestCoinsView(FuzzedDataProvider& fuzzed_data_provider, CCoinsViewCache& co
             },
             [&] {
                 uint256 best_block{ConsumeUInt256(fuzzed_data_provider)};
-                // Set best block hash to non-null to satisfy the assertion in CCoinsViewDB::BatchWrite().
+                // `CCoinsViewDB::BatchWrite()` requires a non-null best block.
                 if (is_db && best_block.IsNull()) best_block = uint256::ONE;
                 coins_view_cache.SetBestBlock(best_block);
             },
             [&] {
-                {
-                    const auto reset_guard{coins_view_cache.CreateResetGuard()};
-                }
-                // Set best block hash to non-null to satisfy the assertion in CCoinsViewDB::BatchWrite().
+                (void)coins_view_cache.CreateResetGuard();
+                // Reset() clears the best block, so reseed db-backed caches.
                 if (is_db) {
                     const uint256 best_block{ConsumeUInt256(fuzzed_data_provider)};
                     if (best_block.IsNull()) {
@@ -150,10 +150,16 @@ void TestCoinsView(FuzzedDataProvider& fuzzed_data_provider, CCoinsViewCache& co
                 coins_view_cache.Uncache(random_out_point);
             },
             [&] {
-                if (fuzzed_data_provider.ConsumeBool()) {
-                    backend_coins_view = CCoinsView{};
+                const bool use_original_backend{fuzzed_data_provider.ConsumeBool()};
+                if (use_original_backend && backend_coins_view != original_backend) {
+                    // FRESH flags valid against the empty backend may be invalid
+                    // against the original backend, so reset before restoring it.
+                    (void)coins_view_cache.CreateResetGuard();
+                    // Reset() clears the best block; db backends require a non-null hash.
+                    if (is_db) coins_view_cache.SetBestBlock(uint256::ONE);
                 }
-                coins_view_cache.SetBackend(backend_coins_view);
+                backend_coins_view = use_original_backend ? original_backend : &CoinsViewEmpty::Get();
+                coins_view_cache.SetBackend(*backend_coins_view);
             },
             [&] {
                 const std::optional<COutPoint> opt_out_point = ConsumeDeserializable<COutPoint>(fuzzed_data_provider);
@@ -232,13 +238,12 @@ void TestCoinsView(FuzzedDataProvider& fuzzed_data_provider, CCoinsViewCache& co
     }
 
     {
-        if (is_db) {
-            std::unique_ptr<CCoinsViewCursor> coins_view_cursor = backend_coins_view.Cursor();
-            assert(!!coins_view_cursor);
+        if (is_db && backend_coins_view == original_backend) {
+            assert(backend_coins_view->Cursor());
         }
-        (void)backend_coins_view.EstimateSize();
-        (void)backend_coins_view.GetBestBlock();
-        (void)backend_coins_view.GetHeadBlocks();
+        (void)backend_coins_view->EstimateSize();
+        (void)backend_coins_view->GetBestBlock();
+        (void)backend_coins_view->GetHeadBlocks();
     }
 
     if (fuzzed_data_provider.ConsumeBool()) {
@@ -267,7 +272,7 @@ void TestCoinsView(FuzzedDataProvider& fuzzed_data_provider, CCoinsViewCache& co
                 AddCoins(coins_view_cache, transaction, height, check_for_overwrite);
             },
             [&] {
-                (void)AreInputsStandard(CTransaction{random_mutable_transaction}, coins_view_cache);
+                (void)ValidateInputsStandardness(CTransaction{random_mutable_transaction}, coins_view_cache);
             },
             [&] {
                 TxValidationState state;
@@ -328,11 +333,11 @@ void TestCoinsView(FuzzedDataProvider& fuzzed_data_provider, CCoinsViewCache& co
             assert(!exists_using_access_coin && !exists_using_have_coin_in_cache && !exists_using_have_coin);
         }
         // If HaveCoin on the backend is true, it must also be on the cache if the coin wasn't spent.
-        const bool exists_using_have_coin_in_backend = backend_coins_view.HaveCoin(random_out_point);
+        const bool exists_using_have_coin_in_backend = backend_coins_view->HaveCoin(random_out_point);
         if (!coin_using_access_coin.IsSpent() && exists_using_have_coin_in_backend) {
             assert(exists_using_have_coin);
         }
-        if (auto coin{backend_coins_view.GetCoin(random_out_point)}) {
+        if (auto coin{backend_coins_view->GetCoin(random_out_point)}) {
             assert(exists_using_have_coin_in_backend);
             // Note we can't assert that `coin_using_get_coin == *coin` because the coin in
             // the cache may have been modified but not yet flushed.
@@ -345,9 +350,8 @@ void TestCoinsView(FuzzedDataProvider& fuzzed_data_provider, CCoinsViewCache& co
 FUZZ_TARGET(coins_view, .init = initialize_coins_view)
 {
     FuzzedDataProvider fuzzed_data_provider{buffer.data(), buffer.size()};
-    CCoinsView backend_coins_view;
-    CCoinsViewCache coins_view_cache{&backend_coins_view, /*deterministic=*/true};
-    TestCoinsView(fuzzed_data_provider, coins_view_cache, backend_coins_view, /*is_db=*/false);
+    CCoinsViewCache coins_view_cache{&CoinsViewEmpty::Get(), /*deterministic=*/true};
+    TestCoinsView(fuzzed_data_provider, coins_view_cache, &CoinsViewEmpty::Get());
 }
 
 FUZZ_TARGET(coins_view_db, .init = initialize_coins_view)
@@ -360,7 +364,7 @@ FUZZ_TARGET(coins_view_db, .init = initialize_coins_view)
     };
     CCoinsViewDB backend_coins_view{std::move(db_params), CoinsViewOptions{}};
     CCoinsViewCache coins_view_cache{&backend_coins_view, /*deterministic=*/true};
-    TestCoinsView(fuzzed_data_provider, coins_view_cache, backend_coins_view, /*is_db=*/true);
+    TestCoinsView(fuzzed_data_provider, coins_view_cache, &backend_coins_view);
 }
 
 // Creates a CoinsViewOverlay and a MutationGuardCoinsViewCache as the base.
@@ -370,8 +374,7 @@ FUZZ_TARGET(coins_view_db, .init = initialize_coins_view)
 FUZZ_TARGET(coins_view_overlay, .init = initialize_coins_view)
 {
     FuzzedDataProvider fuzzed_data_provider{buffer.data(), buffer.size()};
-    CCoinsView backend_base_coins_view;
-    MutationGuardCoinsViewCache backend_cache{&backend_base_coins_view, /*deterministic=*/true};
+    MutationGuardCoinsViewCache backend_cache{&CoinsViewEmpty::Get(), /*deterministic=*/true};
     CoinsViewOverlay coins_view_cache{&backend_cache, /*deterministic=*/true};
-    TestCoinsView(fuzzed_data_provider, coins_view_cache, backend_cache, /*is_db=*/false);
+    TestCoinsView(fuzzed_data_provider, coins_view_cache, &backend_cache);
 }
diff --git a/src/test/fuzz/coinscache_sim.cpp b/src/test/fuzz/coinscache_sim.cpp
index c8534e4f60c8..9d41a6c058b1 100644
--- a/src/test/fuzz/coinscache_sim.cpp
+++ b/src/test/fuzz/coinscache_sim.cpp
@@ -139,7 +139,7 @@ struct CacheLevel
  *
  * The initial state consists of the empty UTXO set.
  */
-class CoinsViewBottom final : public CCoinsView
+class CoinsViewBottom final : public CoinsViewEmpty
 {
     std::map<COutPoint, Coin> m_data;
 
@@ -153,11 +153,6 @@ class CoinsViewBottom final : public CCoinsView
         return std::nullopt;
     }
 
-    uint256 GetBestBlock() const final { return {}; }
-    std::vector<uint256> GetHeadBlocks() const final { return {}; }
-    std::unique_ptr<CCoinsViewCursor> Cursor() const final { return {}; }
-    size_t EstimateSize() const final { return m_data.size(); }
-
     void BatchWrite(CoinsViewCacheCursor& cursor, const uint256&) final
     {
         for (auto it{cursor.Begin()}; it != cursor.End(); it = cursor.NextAndMaybeErase(*it)) {
@@ -252,7 +247,7 @@ FUZZ_TARGET(coinscache_sim)
         CallOneOf(
             provider,
 
-            [&]() { // GetCoin
+            [&]() { // PeekCoin/GetCoin
                 uint32_t outpointidx = provider.ConsumeIntegralInRange<uint32_t>(0, NUM_OUTPOINTS - 1);
                 // Look up in simulation data.
                 auto sim = lookup(outpointidx);
diff --git a/src/test/fuzz/connman.cpp b/src/test/fuzz/connman.cpp
index 4a8b7b2155f5..1b0859d6ffe4 100644
--- a/src/test/fuzz/connman.cpp
+++ b/src/test/fuzz/connman.cpp
@@ -15,6 +15,7 @@
 #include <test/fuzz/util/net.h>
 #include <test/fuzz/util/threadinterrupt.h>
 #include <test/util/setup_common.h>
+#include <test/util/time.h>
 #include <util/translation.h>
 
 #include <cstdint>
@@ -40,7 +41,7 @@ FUZZ_TARGET(connman, .init = initialize_connman)
 {
     SeedRandomStateForTest(SeedRand::ZEROS);
     FuzzedDataProvider fuzzed_data_provider{buffer.data(), buffer.size()};
-    SetMockTime(ConsumeTime(fuzzed_data_provider));
+    NodeClockContext clock_ctx{ConsumeTime(fuzzed_data_provider)};
     auto netgroupman{ConsumeNetGroupManager(fuzzed_data_provider)};
     auto addr_man_ptr{std::make_unique<AddrManDeterministic>(netgroupman, fuzzed_data_provider, GetCheckRatio())};
     if (fuzzed_data_provider.ConsumeBool()) {
@@ -79,6 +80,18 @@ FUZZ_TARGET(connman, .init = initialize_connman)
     CConnman::Options options;
     options.m_msgproc = &net_events;
     options.nMaxOutboundLimit = max_outbound_limit;
+
+    auto consume_whitelist = [&]() {
+        std::vector<NetWhitelistPermissions> result(fuzzed_data_provider.ConsumeIntegralInRange<size_t>(0, 3));
+        for (auto& entry : result) {
+            entry.m_flags = ConsumeWeakEnum(fuzzed_data_provider, ALL_NET_PERMISSION_FLAGS);
+            entry.m_subnet = ConsumeSubNet(fuzzed_data_provider);
+        }
+        return result;
+    };
+    options.vWhitelistedRangeIncoming = consume_whitelist();
+    options.vWhitelistedRangeOutgoing = consume_whitelist();
+
     connman.Init(options);
 
     CNetAddr random_netaddr;
@@ -89,6 +102,8 @@ FUZZ_TARGET(connman, .init = initialize_connman)
 
     LIMITED_WHILE(fuzzed_data_provider.ConsumeBool(), 100) {
         CNode& p2p_node{*ConsumeNodeAsUniquePtr(fuzzed_data_provider).release()};
+        // Simulate post-handshake state.
+        p2p_node.fSuccessfullyConnected = true;
         connman.AddTestNode(p2p_node);
     }
 
diff --git a/src/test/fuzz/deserialize.cpp b/src/test/fuzz/deserialize.cpp
index 70cad07d69d9..1329f471c708 100644
--- a/src/test/fuzz/deserialize.cpp
+++ b/src/test/fuzz/deserialize.cpp
@@ -38,18 +38,13 @@
 using kernel::CBlockFileInfo;
 using node::SnapshotMetadata;
 
-namespace {
-const BasicTestingSetup* g_setup;
-} // namespace
-
 void initialize_deserialize()
 {
     static const auto testing_setup = MakeNoLogFileContext<>();
-    g_setup = testing_setup.get();
 }
 
 #define FUZZ_TARGET_DESERIALIZE(name, code)                \
-    FUZZ_TARGET(name, .init = initialize_deserialize)         \
+    FUZZ_TARGET(name, .init = initialize_deserialize)      \
     {                                                      \
         try {                                              \
             code                                           \
diff --git a/src/test/fuzz/fuzz.cpp b/src/test/fuzz/fuzz.cpp
index d4d826956dba..7fba26ddb0b3 100644
--- a/src/test/fuzz/fuzz.cpp
+++ b/src/test/fuzz/fuzz.cpp
@@ -37,8 +37,6 @@
 __AFL_FUZZ_INIT();
 #endif
 
-const std::function<void(const std::string&)> G_TEST_LOG_FUN{};
-
 /**
  * A copy of the command line arguments that start with `--`.
  * First `LLVMFuzzerInitialize()` is called, which saves the arguments to `g_args`.
diff --git a/src/test/fuzz/headerssync.cpp b/src/test/fuzz/headerssync.cpp
index f6e574f4044d..f54ea980e4e5 100644
--- a/src/test/fuzz/headerssync.cpp
+++ b/src/test/fuzz/headerssync.cpp
@@ -9,6 +9,7 @@
 #include <test/fuzz/fuzz.h>
 #include <test/fuzz/util.h>
 #include <test/util/setup_common.h>
+#include <test/util/time.h>
 #include <uint256.h>
 #include <util/chaintype.h>
 #include <util/time.h>
@@ -59,7 +60,7 @@ FUZZ_TARGET(headers_sync_state, .init = initialize_headers_sync_state_fuzz)
     CBlockHeader genesis_header{Params().GenesisBlock()};
     CBlockIndex start_index(genesis_header);
 
-    SetMockTime(ConsumeTime(fuzzed_data_provider, /*min=*/start_index.GetMedianTimePast()));
+    NodeClockContext clock_ctx{ConsumeTime(fuzzed_data_provider, /*min=*/start_index.GetMedianTimePast())};
 
     const uint256 genesis_hash = genesis_header.GetHash();
     start_index.phashBlock = &genesis_hash;
diff --git a/src/test/fuzz/i2p.cpp b/src/test/fuzz/i2p.cpp
index 9888e7a0b697..d262e1d0f319 100644
--- a/src/test/fuzz/i2p.cpp
+++ b/src/test/fuzz/i2p.cpp
@@ -13,6 +13,7 @@
 #include <test/fuzz/util/net.h>
 #include <test/fuzz/util/threadinterrupt.h>
 #include <test/util/setup_common.h>
+#include <test/util/time.h>
 #include <util/fs_helpers.h>
 #include <util/threadinterrupt.h>
 
@@ -26,7 +27,7 @@ FUZZ_TARGET(i2p, .init = initialize_i2p)
     SeedRandomStateForTest(SeedRand::ZEROS);
     FuzzedDataProvider fuzzed_data_provider{buffer.data(), buffer.size()};
 
-    SetMockTime(ConsumeTime(fuzzed_data_provider));
+    NodeClockContext clock_ctx{ConsumeTime(fuzzed_data_provider)};
 
     // Mock CreateSock() to create FuzzedSock.
     auto CreateSockOrig = CreateSock;
@@ -60,7 +61,7 @@ FUZZ_TARGET(i2p, .init = initialize_i2p)
         }
     }
 
-    fs::remove_all(private_key_path);
+    fs::remove(private_key_path);
 
     CreateSock = CreateSockOrig;
 }
diff --git a/src/test/fuzz/load_external_block_file.cpp b/src/test/fuzz/load_external_block_file.cpp
index 06eccf01bd92..8b86f70dd237 100644
--- a/src/test/fuzz/load_external_block_file.cpp
+++ b/src/test/fuzz/load_external_block_file.cpp
@@ -9,6 +9,7 @@
 #include <test/fuzz/fuzz.h>
 #include <test/fuzz/util.h>
 #include <test/util/setup_common.h>
+#include <test/util/time.h>
 #include <util/time.h>
 #include <validation.h>
 
@@ -28,7 +29,7 @@ void initialize_load_external_block_file()
 FUZZ_TARGET(load_external_block_file, .init = initialize_load_external_block_file)
 {
     FuzzedDataProvider fuzzed_data_provider{buffer.data(), buffer.size()};
-    SetMockTime(ConsumeTime(fuzzed_data_provider));
+    NodeClockContext clock_ctx{ConsumeTime(fuzzed_data_provider)};
     FuzzedFileProvider fuzzed_file_provider{fuzzed_data_provider};
     AutoFile fuzzed_block_file{fuzzed_file_provider.open()};
     if (fuzzed_block_file.IsNull()) {
diff --git a/src/test/fuzz/mini_miner.cpp b/src/test/fuzz/mini_miner.cpp
index 6a5c164985ae..77f9e682e7f9 100644
--- a/src/test/fuzz/mini_miner.cpp
+++ b/src/test/fuzz/mini_miner.cpp
@@ -6,10 +6,11 @@
 #include <test/fuzz/fuzz.h>
 #include <test/fuzz/util.h>
 #include <test/fuzz/util/mempool.h>
+#include <test/util/mining.h>
 #include <test/util/script.h>
 #include <test/util/setup_common.h>
+#include <test/util/time.h>
 #include <test/util/txmempool.h>
-#include <test/util/mining.h>
 
 #include <node/miner.h>
 #include <node/mini_miner.h>
@@ -26,12 +27,10 @@
 
 namespace {
 
-const TestingSetup* g_setup;
 std::deque<COutPoint> g_available_coins;
 void initialize_miner()
 {
     static const auto testing_setup = MakeNoLogFileContext<const TestingSetup>();
-    g_setup = testing_setup.get();
     for (uint32_t i = 0; i < uint32_t{100}; ++i) {
         g_available_coins.emplace_back(Txid::FromUint256(uint256::ZERO), i);
     }
@@ -42,7 +41,7 @@ FUZZ_TARGET(mini_miner, .init = initialize_miner)
 {
     SeedRandomStateForTest(SeedRand::ZEROS);
     FuzzedDataProvider fuzzed_data_provider{buffer.data(), buffer.size()};
-    SetMockTime(ConsumeTime(fuzzed_data_provider));
+    NodeClockContext clock_ctx{ConsumeTime(fuzzed_data_provider)};
     bilingual_str error;
     CTxMemPool pool{CTxMemPool::Options{}, error};
     Assert(error.empty());
diff --git a/src/test/fuzz/net.cpp b/src/test/fuzz/net.cpp
index 7b6615bca715..20fbae1594bd 100644
--- a/src/test/fuzz/net.cpp
+++ b/src/test/fuzz/net.cpp
@@ -14,6 +14,7 @@
 #include <test/fuzz/util/net.h>
 #include <test/util/net.h>
 #include <test/util/setup_common.h>
+#include <test/util/time.h>
 #include <util/asmap.h>
 #include <util/chaintype.h>
 #include <util/time.h>
@@ -31,7 +32,7 @@ void initialize_net()
 FUZZ_TARGET(net, .init = initialize_net)
 {
     FuzzedDataProvider fuzzed_data_provider(buffer.data(), buffer.size());
-    SetMockTime(ConsumeTime(fuzzed_data_provider));
+    NodeClockContext clock_ctx{ConsumeTime(fuzzed_data_provider)};
     CNode node{ConsumeNode(fuzzed_data_provider)};
     node.SetCommonVersion(fuzzed_data_provider.ConsumeIntegral<int>());
     if (const auto service_opt =
@@ -80,7 +81,7 @@ FUZZ_TARGET(net, .init = initialize_net)
 FUZZ_TARGET(local_address, .init = initialize_net)
 {
     FuzzedDataProvider fuzzed_data_provider(buffer.data(), buffer.size());
-    SetMockTime(ConsumeTime(fuzzed_data_provider));
+    NodeClockContext clock_ctx{ConsumeTime(fuzzed_data_provider)};
     CService service{ConsumeService(fuzzed_data_provider)};
     CNode node{ConsumeNode(fuzzed_data_provider)};
     {
diff --git a/src/test/fuzz/node_eviction.cpp b/src/test/fuzz/node_eviction.cpp
index 04eab335365f..2ecc91a05e3b 100644
--- a/src/test/fuzz/node_eviction.cpp
+++ b/src/test/fuzz/node_eviction.cpp
@@ -19,13 +19,14 @@ FUZZ_TARGET(node_eviction)
 {
     FuzzedDataProvider fuzzed_data_provider{buffer.data(), buffer.size()};
     std::vector<NodeEvictionCandidate> eviction_candidates;
-    LIMITED_WHILE(fuzzed_data_provider.ConsumeBool(), 10000) {
+    LIMITED_WHILE(fuzzed_data_provider.ConsumeBool(), 10000)
+    {
         eviction_candidates.push_back({
             /*id=*/fuzzed_data_provider.ConsumeIntegral<NodeId>(),
-            /*m_connected=*/std::chrono::seconds{fuzzed_data_provider.ConsumeIntegral<int64_t>()},
-            /*m_min_ping_time=*/std::chrono::microseconds{fuzzed_data_provider.ConsumeIntegral<int64_t>()},
-            /*m_last_block_time=*/std::chrono::seconds{fuzzed_data_provider.ConsumeIntegral<int64_t>()},
-            /*m_last_tx_time=*/std::chrono::seconds{fuzzed_data_provider.ConsumeIntegral<int64_t>()},
+            /*m_connected=*/ConsumeTime(fuzzed_data_provider).time_since_epoch(),
+            /*m_min_ping_time=*/ConsumeDuration<decltype(NodeEvictionCandidate::m_min_ping_time)>(fuzzed_data_provider, /*min=*/std::chrono::years{-1}, /*max=*/decltype(CNode::m_min_ping_time.load())::max()),
+            /*m_last_block_time=*/ConsumeTime(fuzzed_data_provider).time_since_epoch(),
+            /*m_last_tx_time=*/ConsumeTime(fuzzed_data_provider).time_since_epoch(),
             /*fRelevantServices=*/fuzzed_data_provider.ConsumeBool(),
             /*m_relay_txs=*/fuzzed_data_provider.ConsumeBool(),
             /*fBloomFilter=*/fuzzed_data_provider.ConsumeBool(),
diff --git a/src/test/fuzz/p2p_handshake.cpp b/src/test/fuzz/p2p_handshake.cpp
index 7ca0a06a8b0e..421aacd86671 100644
--- a/src/test/fuzz/p2p_handshake.cpp
+++ b/src/test/fuzz/p2p_handshake.cpp
@@ -17,6 +17,7 @@
 #include <test/util/mining.h>
 #include <test/util/net.h>
 #include <test/util/setup_common.h>
+#include <test/util/time.h>
 #include <test/util/validation.h>
 #include <util/time.h>
 #include <validationinterface.h>
@@ -44,7 +45,7 @@ FUZZ_TARGET(p2p_handshake, .init = ::initialize)
 
     auto& connman = static_cast<ConnmanTestMsg&>(*g_setup->m_node.connman);
     auto& chainman = static_cast<TestChainstateManager&>(*g_setup->m_node.chainman);
-    SetMockTime(1610000000); // any time to successfully reset ibd
+    NodeClockContext clock_ctx{1610000000s}; // any time to successfully reset ibd
     chainman.ResetIbd();
 
     node::Warnings warnings{};
@@ -80,10 +81,11 @@ FUZZ_TARGET(p2p_handshake, .init = ::initialize)
             continue;
         }
 
-        SetMockTime(GetTime() +
+        clock_ctx += std::chrono::seconds{
                     fuzzed_data_provider.ConsumeIntegralInRange<int64_t>(
                         -std::chrono::seconds{10min}.count(), // Allow mocktime to go backwards slightly
-                        std::chrono::seconds{TIMEOUT_INTERVAL}.count()));
+                        std::chrono::seconds{TIMEOUT_INTERVAL}.count()),
+        };
 
         CSerializedNetMsg net_msg;
         net_msg.m_type = PickValue(fuzzed_data_provider, ALL_NET_MESSAGE_TYPES);
diff --git a/src/test/fuzz/p2p_headers_presync.cpp b/src/test/fuzz/p2p_headers_presync.cpp
index 25a83fef4eaa..704e447fe695 100644
--- a/src/test/fuzz/p2p_headers_presync.cpp
+++ b/src/test/fuzz/p2p_headers_presync.cpp
@@ -176,7 +176,7 @@ FUZZ_TARGET(p2p_headers_presync, .init = initialize)
 
     ChainstateManager& chainman = *g_testing_setup->m_node.chainman;
     CBlockHeader base{chainman.GetParams().GenesisBlock()};
-    SetMockTime(base.nTime);
+    const NodeClockContext clock_ctx{base.Time()};
 
     LOCK(NetEventsInterface::g_msgproc_mutex);
 
diff --git a/src/test/fuzz/partially_downloaded_block.cpp b/src/test/fuzz/partially_downloaded_block.cpp
index 0bbe99915f59..12fdb8f7d2e1 100644
--- a/src/test/fuzz/partially_downloaded_block.cpp
+++ b/src/test/fuzz/partially_downloaded_block.cpp
@@ -12,6 +12,7 @@
 #include <test/fuzz/util.h>
 #include <test/fuzz/util/mempool.h>
 #include <test/util/setup_common.h>
+#include <test/util/time.h>
 #include <test/util/txmempool.h>
 #include <txmempool.h>
 #include <util/check.h>
@@ -47,7 +48,7 @@ FUZZ_TARGET(partially_downloaded_block, .init = initialize_pdb)
 {
     SeedRandomStateForTest(SeedRand::ZEROS);
     FuzzedDataProvider fuzzed_data_provider{buffer.data(), buffer.size()};
-    SetMockTime(ConsumeTime(fuzzed_data_provider));
+    NodeClockContext clock_ctx{ConsumeTime(fuzzed_data_provider)};
 
     auto block{ConsumeDeserializable<CBlock>(fuzzed_data_provider, TX_WITH_WITNESS)};
     if (!block || block->vtx.size() == 0 ||
diff --git a/src/test/fuzz/process_message.cpp b/src/test/fuzz/process_message.cpp
index bd3c4ec9e94b..5f54857ea5fa 100644
--- a/src/test/fuzz/process_message.cpp
+++ b/src/test/fuzz/process_message.cpp
@@ -18,6 +18,7 @@
 #include <test/util/mining.h>
 #include <test/util/net.h>
 #include <test/util/setup_common.h>
+#include <test/util/time.h>
 #include <test/util/validation.h>
 #include <util/check.h>
 #include <util/time.h>
@@ -45,7 +46,6 @@ void ResetChainman(TestingSetup& setup)
         options.include_dummy_extranonce = true;
         MineBlock(setup.m_node, options);
     }
-    setup.m_node.validation_signals->SyncWithValidationInterfaceQueue();
 }
 } // namespace
 
@@ -75,7 +75,7 @@ FUZZ_TARGET(process_message, .init = initialize_process_message)
     connman.Reset();
     auto& chainman{static_cast<TestChainstateManager&>(*node.chainman)};
     const auto block_index_size{WITH_LOCK(chainman.GetMutex(), return chainman.BlockIndex().size())};
-    SetMockTime(1610000000); // any time to successfully reset ibd
+    NodeClockContext clock_ctx{1610000000s}; // any time to successfully reset ibd
     chainman.ResetIbd();
     chainman.DisableNextWrite();
 
@@ -100,13 +100,15 @@ FUZZ_TARGET(process_message, .init = initialize_process_message)
     if (!LIMIT_TO_MESSAGE_TYPE.empty() && random_message_type != LIMIT_TO_MESSAGE_TYPE) {
         return;
     }
+
+    node.validation_signals->RegisterValidationInterface(node.peerman.get());
+
     CNode& p2p_node = *ConsumeNodeAsUniquePtr(fuzzed_data_provider).release();
 
     connman.AddTestNode(p2p_node);
     FillNode(fuzzed_data_provider, connman, p2p_node);
 
-    const auto mock_time = ConsumeTime(fuzzed_data_provider);
-    SetMockTime(mock_time);
+    clock_ctx.set(ConsumeTime(fuzzed_data_provider));
 
     CSerializedNetMsg net_msg;
     net_msg.m_type = random_message_type;
@@ -125,6 +127,7 @@ FUZZ_TARGET(process_message, .init = initialize_process_message)
         node.peerman->SendMessages(p2p_node);
     }
     node.validation_signals->SyncWithValidationInterfaceQueue();
+    node.validation_signals->UnregisterValidationInterface(node.peerman.get());
     node.connman->StopNodes();
     if (block_index_size != WITH_LOCK(chainman.GetMutex(), return chainman.BlockIndex().size())) {
         // Reuse the global chainman, but reset it when it is dirty
diff --git a/src/test/fuzz/process_messages.cpp b/src/test/fuzz/process_messages.cpp
index 287529733643..9f33b0df24bb 100644
--- a/src/test/fuzz/process_messages.cpp
+++ b/src/test/fuzz/process_messages.cpp
@@ -17,6 +17,7 @@
 #include <test/util/mining.h>
 #include <test/util/net.h>
 #include <test/util/setup_common.h>
+#include <test/util/time.h>
 #include <test/util/validation.h>
 #include <util/time.h>
 #include <validationinterface.h>
@@ -40,7 +41,6 @@ void ResetChainman(TestingSetup& setup)
     for (int i = 0; i < 2 * COINBASE_MATURITY; i++) {
         MineBlock(setup.m_node, options);
     }
-    setup.m_node.validation_signals->SyncWithValidationInterfaceQueue();
 }
 } // namespace
 
@@ -65,7 +65,7 @@ FUZZ_TARGET(process_messages, .init = initialize_process_messages)
     connman.Reset();
     auto& chainman{static_cast<TestChainstateManager&>(*node.chainman)};
     const auto block_index_size{WITH_LOCK(chainman.GetMutex(), return chainman.BlockIndex().size())};
-    SetMockTime(1610000000); // any time to successfully reset ibd
+    NodeClockContext clock_ctx{1610000000s}; // any time to successfully reset ibd
     chainman.ResetIbd();
     chainman.DisableNextWrite();
 
@@ -84,6 +84,8 @@ FUZZ_TARGET(process_messages, .init = initialize_process_messages)
     connman.SetMsgProc(node.peerman.get());
     connman.SetAddrman(*node.addrman);
 
+    node.validation_signals->RegisterValidationInterface(node.peerman.get());
+
     LOCK(NetEventsInterface::g_msgproc_mutex);
 
     std::vector<CNode*> peers;
@@ -101,8 +103,7 @@ FUZZ_TARGET(process_messages, .init = initialize_process_messages)
     {
         const std::string random_message_type{fuzzed_data_provider.ConsumeBytesAsString(CMessageHeader::MESSAGE_TYPE_SIZE).c_str()};
 
-        const auto mock_time = ConsumeTime(fuzzed_data_provider);
-        SetMockTime(mock_time);
+        clock_ctx.set(ConsumeTime(fuzzed_data_provider));
 
         CSerializedNetMsg net_msg;
         net_msg.m_type = random_message_type;
@@ -125,6 +126,7 @@ FUZZ_TARGET(process_messages, .init = initialize_process_messages)
         }
     }
     node.validation_signals->SyncWithValidationInterfaceQueue();
+    node.validation_signals->UnregisterValidationInterface(node.peerman.get());
     node.connman->StopNodes();
     if (block_index_size != WITH_LOCK(chainman.GetMutex(), return chainman.BlockIndex().size())) {
         // Reuse the global chainman, but reset it when it is dirty
diff --git a/src/test/fuzz/rbf.cpp b/src/test/fuzz/rbf.cpp
index 023fe7a42b1d..3644881d2269 100644
--- a/src/test/fuzz/rbf.cpp
+++ b/src/test/fuzz/rbf.cpp
@@ -11,6 +11,7 @@
 #include <test/fuzz/util.h>
 #include <test/fuzz/util/mempool.h>
 #include <test/util/setup_common.h>
+#include <test/util/time.h>
 #include <test/util/txmempool.h>
 #include <txmempool.h>
 #include <util/check.h>
@@ -53,7 +54,7 @@ FUZZ_TARGET(rbf, .init = initialize_rbf)
 {
     SeedRandomStateForTest(SeedRand::ZEROS);
     FuzzedDataProvider fuzzed_data_provider(buffer.data(), buffer.size());
-    SetMockTime(ConsumeTime(fuzzed_data_provider));
+    NodeClockContext clock_ctx{ConsumeTime(fuzzed_data_provider)};
     std::optional<CMutableTransaction> mtx = ConsumeDeserializable<CMutableTransaction>(fuzzed_data_provider, TX_WITH_WITNESS);
     if (!mtx) {
         return;
@@ -95,7 +96,7 @@ FUZZ_TARGET(package_rbf, .init = initialize_package_rbf)
 {
     SeedRandomStateForTest(SeedRand::ZEROS);
     FuzzedDataProvider fuzzed_data_provider(buffer.data(), buffer.size());
-    SetMockTime(ConsumeTime(fuzzed_data_provider));
+    NodeClockContext clock_ctx{ConsumeTime(fuzzed_data_provider)};
 
     // "Real" virtual size is not important for this test since ConsumeTxMemPoolEntry generates its own virtual size values
     // so we construct small transactions for performance reasons. Child simply needs an input for later to perhaps connect to parent.
diff --git a/src/test/fuzz/rpc.cpp b/src/test/fuzz/rpc.cpp
index e8daf9d390ac..cd7f49872b6a 100644
--- a/src/test/fuzz/rpc.cpp
+++ b/src/test/fuzz/rpc.cpp
@@ -17,6 +17,7 @@
 #include <test/fuzz/fuzz.h>
 #include <test/fuzz/util.h>
 #include <test/util/setup_common.h>
+#include <test/util/time.h>
 #include <tinyformat.h>
 #include <uint256.h>
 #include <univalue.h>
@@ -370,7 +371,7 @@ FUZZ_TARGET(rpc, .init = initialize_rpc)
     SeedRandomStateForTest(SeedRand::ZEROS);
     FuzzedDataProvider fuzzed_data_provider{buffer.data(), buffer.size()};
     bool good_data{true};
-    SetMockTime(ConsumeTime(fuzzed_data_provider));
+    NodeClockContext clock_ctx{ConsumeTime(fuzzed_data_provider)};
     const std::string rpc_command = fuzzed_data_provider.ConsumeRandomLengthString(64);
     if (!g_limit_to_rpc_command.empty() && rpc_command != g_limit_to_rpc_command) {
         return;
diff --git a/src/test/fuzz/socks5.cpp b/src/test/fuzz/socks5.cpp
index 72d69310292e..12db69a23687 100644
--- a/src/test/fuzz/socks5.cpp
+++ b/src/test/fuzz/socks5.cpp
@@ -9,6 +9,7 @@
 #include <test/fuzz/util.h>
 #include <test/fuzz/util/net.h>
 #include <test/util/setup_common.h>
+#include <test/util/time.h>
 #include <util/time.h>
 
 #include <cstdint>
@@ -30,7 +31,7 @@ void initialize_socks5()
 FUZZ_TARGET(socks5, .init = initialize_socks5)
 {
     FuzzedDataProvider fuzzed_data_provider{buffer.data(), buffer.size()};
-    SetMockTime(ConsumeTime(fuzzed_data_provider));
+    NodeClockContext clock_ctx{ConsumeTime(fuzzed_data_provider)};
     ProxyCredentials proxy_credentials;
     proxy_credentials.username = fuzzed_data_provider.ConsumeRandomLengthString(512);
     proxy_credentials.password = fuzzed_data_provider.ConsumeRandomLengthString(512);
diff --git a/src/test/fuzz/string.cpp b/src/test/fuzz/string.cpp
index d31563369738..a7f8516f111f 100644
--- a/src/test/fuzz/string.cpp
+++ b/src/test/fuzz/string.cpp
@@ -5,6 +5,7 @@
 #include <blockfilter.h>
 #include <clientversion.h>
 #include <common/args.h>
+#include <common/license_info.h>
 #include <common/messages.h>
 #include <common/settings.h>
 #include <common/system.h>
@@ -63,7 +64,6 @@ FUZZ_TARGET(string)
     const auto width{fuzzed_data_provider.ConsumeIntegralInRange<size_t>(1, 1000)};
     (void)FormatParagraph(random_string_1, width, fuzzed_data_provider.ConsumeIntegralInRange<size_t>(0, width));
     (void)FormatSubVersion(random_string_1, fuzzed_data_provider.ConsumeIntegral<int>(), random_string_vector);
-    (void)GetDescriptorChecksum(random_string_1);
     (void)HelpExampleCli(random_string_1, random_string_2);
     (void)HelpExampleRpc(random_string_1, random_string_2);
     (void)HelpMessageGroup(random_string_1);
diff --git a/src/test/fuzz/torcontrol.cpp b/src/test/fuzz/torcontrol.cpp
index 62c2ad57658a..e45f1e62d1ce 100644
--- a/src/test/fuzz/torcontrol.cpp
+++ b/src/test/fuzz/torcontrol.cpp
@@ -12,28 +12,6 @@
 #include <string>
 #include <vector>
 
-class DummyTorControlConnection : public TorControlConnection
-{
-public:
-    DummyTorControlConnection() : TorControlConnection{nullptr}
-    {
-    }
-
-    bool Connect(const std::string&, const ConnectionCB&, const ConnectionCB&)
-    {
-        return true;
-    }
-
-    void Disconnect()
-    {
-    }
-
-    bool Command(const std::string&, const ReplyHandlerCB&)
-    {
-        return true;
-    }
-};
-
 void initialize_torcontrol()
 {
     static const auto testing_setup = MakeNoLogFileContext<>();
@@ -44,37 +22,46 @@ FUZZ_TARGET(torcontrol, .init = initialize_torcontrol)
     FuzzedDataProvider fuzzed_data_provider{buffer.data(), buffer.size()};
 
     TorController tor_controller;
+    CThreadInterrupt interrupt;
+    TorControlConnection conn{interrupt};
+
     LIMITED_WHILE(fuzzed_data_provider.ConsumeBool(), 10000) {
         TorControlReply tor_control_reply;
         CallOneOf(
             fuzzed_data_provider,
             [&] {
-                tor_control_reply.code = 250;
+                tor_control_reply.code = TOR_REPLY_OK;
+            },
+            [&] {
+                tor_control_reply.code = TOR_REPLY_UNRECOGNIZED;
             },
             [&] {
-                tor_control_reply.code = 510;
+                tor_control_reply.code = TOR_REPLY_SYNTAX_ERROR;
             },
             [&] {
                 tor_control_reply.code = fuzzed_data_provider.ConsumeIntegral<int>();
             });
         tor_control_reply.lines = ConsumeRandomLengthStringVector(fuzzed_data_provider);
-        if (tor_control_reply.lines.empty()) {
-            break;
-        }
-        DummyTorControlConnection dummy_tor_control_connection;
+
         CallOneOf(
             fuzzed_data_provider,
             [&] {
-                tor_controller.add_onion_cb(dummy_tor_control_connection, tor_control_reply);
+                tor_controller.add_onion_cb(conn, tor_control_reply, /*pow_was_enabled=*/true);
+            },
+            [&] {
+                tor_controller.add_onion_cb(conn, tor_control_reply, /*pow_was_enabled=*/false);
+            },
+            [&] {
+                tor_controller.auth_cb(conn, tor_control_reply);
             },
             [&] {
-                tor_controller.auth_cb(dummy_tor_control_connection, tor_control_reply);
+                tor_controller.authchallenge_cb(conn, tor_control_reply);
             },
             [&] {
-                tor_controller.authchallenge_cb(dummy_tor_control_connection, tor_control_reply);
+                tor_controller.protocolinfo_cb(conn, tor_control_reply);
             },
             [&] {
-                tor_controller.protocolinfo_cb(dummy_tor_control_connection, tor_control_reply);
+                tor_controller.get_socks_cb(conn, tor_control_reply);
             });
     }
 }
diff --git a/src/test/fuzz/transaction.cpp b/src/test/fuzz/transaction.cpp
index 8f9c94266661..299db8c10c50 100644
--- a/src/test/fuzz/transaction.cpp
+++ b/src/test/fuzz/transaction.cpp
@@ -86,9 +86,8 @@ FUZZ_TARGET(transaction, .init = initialize_transaction)
     (void)RecursiveDynamicUsage(tx);
     (void)SignalsOptInRBF(tx);
 
-    CCoinsView coins_view;
-    const CCoinsViewCache coins_view_cache(&coins_view);
-    (void)AreInputsStandard(tx, coins_view_cache);
+    const CCoinsViewCache coins_view_cache{&CoinsViewEmpty::Get()};
+    (void)ValidateInputsStandardness(tx, coins_view_cache);
     (void)IsWitnessStandard(tx, coins_view_cache);
 
     if (tx.ComputeTotalSize() < 250'000) { // Avoid high memory usage (with msan) due to json encoding
diff --git a/src/test/fuzz/txdownloadman.cpp b/src/test/fuzz/txdownloadman.cpp
index 89a3f060daa2..a2c7fc562c9a 100644
--- a/src/test/fuzz/txdownloadman.cpp
+++ b/src/test/fuzz/txdownloadman.cpp
@@ -15,11 +15,12 @@
 #include <test/util/mining.h>
 #include <test/util/script.h>
 #include <test/util/setup_common.h>
+#include <test/util/time.h>
 #include <test/util/txmempool.h>
+#include <txmempool.h>
 #include <util/hasher.h>
 #include <util/rbf.h>
 #include <util/time.h>
-#include <txmempool.h>
 #include <validation.h>
 #include <validationinterface.h>
 
@@ -168,7 +169,7 @@ FUZZ_TARGET(txdownloadman, .init = initialize)
 {
     SeedRandomStateForTest(SeedRand::ZEROS);
     FuzzedDataProvider fuzzed_data_provider(buffer.data(), buffer.size());
-    SetMockTime(ConsumeTime(fuzzed_data_provider));
+    NodeClockContext clock_ctx{ConsumeTime(fuzzed_data_provider)};
 
     // Initialize txdownloadman
     bilingual_str error;
@@ -293,7 +294,7 @@ FUZZ_TARGET(txdownloadman_impl, .init = initialize)
 {
     SeedRandomStateForTest(SeedRand::ZEROS);
     FuzzedDataProvider fuzzed_data_provider(buffer.data(), buffer.size());
-    SetMockTime(ConsumeTime(fuzzed_data_provider));
+    NodeClockContext clock_ctx{ConsumeTime(fuzzed_data_provider)};
 
     // Initialize a TxDownloadManagerImpl
     bilingual_str error;
diff --git a/src/test/fuzz/txorphan.cpp b/src/test/fuzz/txorphan.cpp
index f6720ffb897a..097989908f3c 100644
--- a/src/test/fuzz/txorphan.cpp
+++ b/src/test/fuzz/txorphan.cpp
@@ -15,6 +15,7 @@
 #include <test/fuzz/fuzz.h>
 #include <test/fuzz/util.h>
 #include <test/util/setup_common.h>
+#include <test/util/time.h>
 #include <uint256.h>
 #include <util/check.h>
 #include <util/feefrac.h>
@@ -40,7 +41,7 @@ FUZZ_TARGET(txorphan, .init = initialize_orphanage)
     SeedRandomStateForTest(SeedRand::ZEROS);
     FuzzedDataProvider fuzzed_data_provider(buffer.data(), buffer.size());
     FastRandomContext orphanage_rng{ConsumeUInt256(fuzzed_data_provider)};
-    SetMockTime(ConsumeTime(fuzzed_data_provider));
+    NodeClockContext clock_ctx{ConsumeTime(fuzzed_data_provider)};
 
     auto orphanage = node::MakeTxOrphanage();
     std::vector<COutPoint> outpoints; // Duplicates are tolerated
@@ -227,7 +228,7 @@ FUZZ_TARGET(txorphan_protected, .init = initialize_orphanage)
     SeedRandomStateForTest(SeedRand::ZEROS);
     FuzzedDataProvider fuzzed_data_provider(buffer.data(), buffer.size());
     FastRandomContext orphanage_rng{ConsumeUInt256(fuzzed_data_provider)};
-    SetMockTime(ConsumeTime(fuzzed_data_provider));
+    NodeClockContext clock_ctx{ConsumeTime(fuzzed_data_provider)};
 
     // We have num_peers peers. Some subset of them will never exceed their reserved weight or announcement count, and
     // should therefore never have any orphans evicted.
diff --git a/src/test/fuzz/util.cpp b/src/test/fuzz/util.cpp
index f505357d8023..da0e2dea460a 100644
--- a/src/test/fuzz/util.cpp
+++ b/src/test/fuzz/util.cpp
@@ -36,12 +36,7 @@ NodeSeconds ConsumeTime(FuzzedDataProvider& fuzzed_data_provider, const std::opt
     // Avoid t=0 (1970-01-01T00:00:00Z) since SetMockTime(0) disables mocktime.
     static const int64_t time_min{ParseISO8601DateTime("2000-01-01T00:00:01Z").value()};
     static const int64_t time_max{ParseISO8601DateTime("2100-12-31T23:59:59Z").value()};
-    return NodeSeconds{ConsumeDuration(fuzzed_data_provider, min.value_or(time_min) * 1s, max.value_or(time_max) * 1s)};
-}
-
-std::chrono::seconds ConsumeDuration(FuzzedDataProvider& fuzzed_data_provider, std::chrono::seconds min, std::chrono::seconds max) noexcept
-{
-    return 1s * fuzzed_data_provider.ConsumeIntegralInRange<int64_t>(min.count(), max.count());
+    return NodeSeconds{ConsumeDuration<std::chrono::seconds>(fuzzed_data_provider, min.value_or(time_min) * 1s, max.value_or(time_max) * 1s)};
 }
 
 CMutableTransaction ConsumeTransaction(FuzzedDataProvider& fuzzed_data_provider, const std::optional<std::vector<Txid>>& prevout_txids, const int max_num_in, const int max_num_out) noexcept
diff --git a/src/test/fuzz/util.h b/src/test/fuzz/util.h
index aa1eed8badf4..fd53e39fcc56 100644
--- a/src/test/fuzz/util.h
+++ b/src/test/fuzz/util.h
@@ -140,7 +140,16 @@ template <typename WeakEnumType, size_t size>
 [[nodiscard]] CAmount ConsumeMoney(FuzzedDataProvider& fuzzed_data_provider, const std::optional<CAmount>& max = std::nullopt) noexcept;
 
 [[nodiscard]] NodeSeconds ConsumeTime(FuzzedDataProvider& fuzzed_data_provider, const std::optional<int64_t>& min = std::nullopt, const std::optional<int64_t>& max = std::nullopt) noexcept;
-[[nodiscard]] std::chrono::seconds ConsumeDuration(FuzzedDataProvider& fuzzed_data_provider, std::chrono::seconds min, std::chrono::seconds max) noexcept;
+
+template <class Dur>
+// Having the compiler infer the template argument from the function argument
+// is dangerous, because the desired return value generally has a different
+// type than the function argument. So std::common_type is used to force the
+// call site to specify the type of the return value.
+[[nodiscard]] Dur ConsumeDuration(FuzzedDataProvider& fuzzed_data_provider, std::common_type_t<Dur> min, std::common_type_t<Dur> max) noexcept
+{
+    return Dur{fuzzed_data_provider.ConsumeIntegralInRange(min.count(), max.count())};
+}
 
 [[nodiscard]] CMutableTransaction ConsumeTransaction(FuzzedDataProvider& fuzzed_data_provider, const std::optional<std::vector<Txid>>& prevout_txids, int max_num_in = 10, int max_num_out = 10) noexcept;
 
diff --git a/src/test/fuzz/util/check_globals.cpp b/src/test/fuzz/util/check_globals.cpp
index f91a965afced..ca3111534d3b 100644
--- a/src/test/fuzz/util/check_globals.cpp
+++ b/src/test/fuzz/util/check_globals.cpp
@@ -42,8 +42,10 @@ struct CheckGlobalsImpl {
             std::cerr << "\n\n"
                          "The current fuzz target accessed system time.\n\n"
 
-                         "This is acceptable, but requires the fuzz target to call \n"
-                         "SetMockTime() at the beginning of processing the fuzz input.\n\n"
+                         "This is acceptable, but requires the fuzz target to use \n"
+                         "a NodeClockContext, SteadyClockContext or call \n"
+                         "SetMockTime() at the \n" "beginning of processing the \n"
+                         "fuzz input.\n\n"
 
                          "Without setting mock time, time-dependent behavior can lead \n"
                          "to non-reproducible bugs or inefficient fuzzing.\n\n"
diff --git a/src/test/fuzz/util/net.h b/src/test/fuzz/util/net.h
index 862153ab26f3..36393811624b 100644
--- a/src/test/fuzz/util/net.h
+++ b/src/test/fuzz/util/net.h
@@ -13,10 +13,10 @@
 #include <node/connection_types.h>
 #include <node/eviction.h>
 #include <protocol.h>
+#include <sync.h>
 #include <test/fuzz/FuzzedDataProvider.h>
 #include <test/fuzz/util.h>
 #include <test/util/net.h>
-#include <threadsafety.h>
 #include <util/asmap.h>
 #include <util/sock.h>
 
diff --git a/src/test/fuzz/utxo_snapshot.cpp b/src/test/fuzz/utxo_snapshot.cpp
index 67290f7d306b..0ed13fcc6ab2 100644
--- a/src/test/fuzz/utxo_snapshot.cpp
+++ b/src/test/fuzz/utxo_snapshot.cpp
@@ -21,6 +21,7 @@
 #include <test/fuzz/util.h>
 #include <test/util/mining.h>
 #include <test/util/setup_common.h>
+#include <test/util/time.h>
 #include <uint256.h>
 #include <util/check.h>
 #include <util/fs.h>
@@ -103,7 +104,7 @@ void utxo_snapshot_fuzz(FuzzBufferType buffer)
 {
     SeedRandomStateForTest(SeedRand::ZEROS);
     FuzzedDataProvider fuzzed_data_provider(buffer.data(), buffer.size());
-    SetMockTime(ConsumeTime(fuzzed_data_provider, /*min=*/1296688602)); // regtest genesis block timestamp
+    NodeClockContext clock_ctx{ConsumeTime(fuzzed_data_provider, /*min=*/1296688602)}; // regtest genesis block timestamp
     auto& setup{*g_setup};
     bool dirty_chainman{false}; // Reuse the global chainman, but reset it when it is dirty
     auto& chainman{*setup.m_node.chainman};
diff --git a/src/test/fuzz/utxo_total_supply.cpp b/src/test/fuzz/utxo_total_supply.cpp
index da04e608b051..1275fd45c43c 100644
--- a/src/test/fuzz/utxo_total_supply.cpp
+++ b/src/test/fuzz/utxo_total_supply.cpp
@@ -14,6 +14,7 @@
 #include <test/fuzz/util.h>
 #include <test/util/mining.h>
 #include <test/util/setup_common.h>
+#include <test/util/time.h>
 #include <util/chaintype.h>
 #include <util/time.h>
 #include <validation.h>
@@ -24,7 +25,7 @@ FUZZ_TARGET(utxo_total_supply)
 {
     SeedRandomStateForTest(SeedRand::ZEROS);
     FuzzedDataProvider fuzzed_data_provider(buffer.data(), buffer.size());
-    SetMockTime(ConsumeTime(fuzzed_data_provider, /*min=*/1296688602)); // regtest genesis block timestamp
+    NodeClockContext clock_ctx{ConsumeTime(fuzzed_data_provider, /*min=*/1296688602)}; // regtest genesis block timestamp
     /** The testing setup that creates a chainman only (no chainstate) */
     ChainTestingSetup test_setup{
         ChainType::REGTEST,
diff --git a/src/test/fuzz/validation_load_mempool.cpp b/src/test/fuzz/validation_load_mempool.cpp
index ed036eb196f6..9180945d0e7a 100644
--- a/src/test/fuzz/validation_load_mempool.cpp
+++ b/src/test/fuzz/validation_load_mempool.cpp
@@ -3,6 +3,7 @@
 // file COPYING or http://www.opensource.org/licenses/mit-license.php.
 
 #include <node/mempool_persist.h>
+#include <test/util/time.h>
 
 #include <node/mempool_args.h>
 #include <node/mempool_persist_args.h>
@@ -40,7 +41,7 @@ FUZZ_TARGET(validation_load_mempool, .init = initialize_validation_load_mempool)
 {
     SeedRandomStateForTest(SeedRand::ZEROS);
     FuzzedDataProvider fuzzed_data_provider{buffer.data(), buffer.size()};
-    SetMockTime(ConsumeTime(fuzzed_data_provider));
+    NodeClockContext clock_ctx{ConsumeTime(fuzzed_data_provider)};
     FuzzedFileProvider fuzzed_file_provider{fuzzed_data_provider};
 
     bilingual_str error;
diff --git a/src/test/fuzz/versionbits.cpp b/src/test/fuzz/versionbits.cpp
index a2085e6a4098..b68ef58a156c 100644
--- a/src/test/fuzz/versionbits.cpp
+++ b/src/test/fuzz/versionbits.cpp
@@ -279,44 +279,45 @@ FUZZ_TARGET(versionbits, .init = initialize)
     }
 
     // state is where everything interesting is
-    switch (state) {
-    case ThresholdState::DEFINED:
-        assert(since == 0);
-        assert(exp_state == ThresholdState::DEFINED);
-        assert(current_block->GetMedianTimePast() < dep.nStartTime);
-        break;
-    case ThresholdState::STARTED:
-        assert(current_block->GetMedianTimePast() >= dep.nStartTime);
-        if (exp_state == ThresholdState::STARTED) {
-            assert(blocks_sig < dep.threshold);
-            assert(current_block->GetMedianTimePast() < dep.nTimeout);
-        } else {
+    [&]() {
+        switch (state) {
+        case ThresholdState::DEFINED:
+            assert(since == 0);
             assert(exp_state == ThresholdState::DEFINED);
-        }
-        break;
-    case ThresholdState::LOCKED_IN:
-        if (exp_state == ThresholdState::LOCKED_IN) {
-            assert(current_block->nHeight + 1 < dep.min_activation_height);
-        } else {
-            assert(exp_state == ThresholdState::STARTED);
-            assert(blocks_sig >= dep.threshold);
-        }
-        break;
-    case ThresholdState::ACTIVE:
-        assert(always_active_test || dep.min_activation_height <= current_block->nHeight + 1);
-        assert(exp_state == ThresholdState::ACTIVE || exp_state == ThresholdState::LOCKED_IN);
-        break;
-    case ThresholdState::FAILED:
-        assert(never_active_test || current_block->GetMedianTimePast() >= dep.nTimeout);
-        if (exp_state == ThresholdState::STARTED) {
-            assert(blocks_sig < dep.threshold);
-        } else {
-            assert(exp_state == ThresholdState::FAILED);
-        }
-        break;
-    default:
+            assert(current_block->GetMedianTimePast() < dep.nStartTime);
+            return;
+        case ThresholdState::STARTED:
+            assert(current_block->GetMedianTimePast() >= dep.nStartTime);
+            if (exp_state == ThresholdState::STARTED) {
+                assert(blocks_sig < dep.threshold);
+                assert(current_block->GetMedianTimePast() < dep.nTimeout);
+            } else {
+                assert(exp_state == ThresholdState::DEFINED);
+            }
+            return;
+        case ThresholdState::LOCKED_IN:
+            if (exp_state == ThresholdState::LOCKED_IN) {
+                assert(current_block->nHeight + 1 < dep.min_activation_height);
+            } else {
+                assert(exp_state == ThresholdState::STARTED);
+                assert(blocks_sig >= dep.threshold);
+            }
+            return;
+        case ThresholdState::ACTIVE:
+            assert(always_active_test || dep.min_activation_height <= current_block->nHeight + 1);
+            assert(exp_state == ThresholdState::ACTIVE || exp_state == ThresholdState::LOCKED_IN);
+            return;
+        case ThresholdState::FAILED:
+            assert(never_active_test || current_block->GetMedianTimePast() >= dep.nTimeout);
+            if (exp_state == ThresholdState::STARTED) {
+                assert(blocks_sig < dep.threshold);
+            } else {
+                assert(exp_state == ThresholdState::FAILED);
+            }
+            return;
+        } // no default case, so the compiler can warn about missing cases
         assert(false);
-    }
+    }();
 
     if (blocks.size() >= period * max_periods) {
         // we chose the timeout (and block times) so that by the time we have this many blocks it's all over
diff --git a/src/test/interfaces_tests.cpp b/src/test/interfaces_tests.cpp
index 1a98256ce2e5..584a5cef2f6c 100644
--- a/src/test/interfaces_tests.cpp
+++ b/src/test/interfaces_tests.cpp
@@ -14,9 +14,9 @@
 
 using interfaces::FoundBlock;
 
-BOOST_FIXTURE_TEST_SUITE(interfaces_tests, TestChain100Setup)
+BOOST_AUTO_TEST_SUITE(interfaces_tests)
 
-BOOST_AUTO_TEST_CASE(findBlock)
+BOOST_FIXTURE_TEST_CASE(findBlock, TestChain100Setup)
 {
     LOCK(Assert(m_node.chainman)->GetMutex());
     auto& chain = m_node.chain;
@@ -61,7 +61,7 @@ BOOST_AUTO_TEST_CASE(findBlock)
     BOOST_CHECK(!chain->findBlock({}, FoundBlock()));
 }
 
-BOOST_AUTO_TEST_CASE(findFirstBlockWithTimeAndHeight)
+BOOST_FIXTURE_TEST_CASE(findFirstBlockWithTimeAndHeight, TestChain100Setup)
 {
     LOCK(Assert(m_node.chainman)->GetMutex());
     auto& chain = m_node.chain;
@@ -74,7 +74,7 @@ BOOST_AUTO_TEST_CASE(findFirstBlockWithTimeAndHeight)
     BOOST_CHECK(!chain->findFirstBlockWithTimeAndHeight(/* min_time= */ active.Tip()->GetBlockTimeMax() + 1, /* min_height= */ 0));
 }
 
-BOOST_AUTO_TEST_CASE(findAncestorByHeight)
+BOOST_FIXTURE_TEST_CASE(findAncestorByHeight, TestChain100Setup)
 {
     LOCK(Assert(m_node.chainman)->GetMutex());
     auto& chain = m_node.chain;
@@ -85,7 +85,7 @@ BOOST_AUTO_TEST_CASE(findAncestorByHeight)
     BOOST_CHECK(!chain->findAncestorByHeight(active[10]->GetBlockHash(), 20));
 }
 
-BOOST_AUTO_TEST_CASE(findAncestorByHash)
+BOOST_FIXTURE_TEST_CASE(findAncestorByHash, TestChain100Setup)
 {
     LOCK(Assert(m_node.chainman)->GetMutex());
     auto& chain = m_node.chain;
@@ -96,7 +96,7 @@ BOOST_AUTO_TEST_CASE(findAncestorByHash)
     BOOST_CHECK(!chain->findAncestorByHash(active[10]->GetBlockHash(), active[20]->GetBlockHash()));
 }
 
-BOOST_AUTO_TEST_CASE(findCommonAncestor)
+BOOST_FIXTURE_TEST_CASE(findCommonAncestor, TestChain100Setup)
 {
     auto& chain = m_node.chain;
     const CChain& active{*WITH_LOCK(Assert(m_node.chainman)->GetMutex(), return &Assert(m_node.chainman)->ActiveChain())};
@@ -126,7 +126,7 @@ BOOST_AUTO_TEST_CASE(findCommonAncestor)
     BOOST_CHECK_EQUAL(orig_hash, orig_tip->GetBlockHash());
 }
 
-BOOST_AUTO_TEST_CASE(hasBlocks)
+BOOST_FIXTURE_TEST_CASE(hasBlocks, TestChain100Setup)
 {
     LOCK(::cs_main);
     auto& chain = m_node.chain;
diff --git a/src/test/kernel/test_kernel.cpp b/src/test/kernel/test_kernel.cpp
index 4a97f5ba467b..b22a5edede92 100644
--- a/src/test/kernel/test_kernel.cpp
+++ b/src/test/kernel/test_kernel.cpp
@@ -10,6 +10,7 @@
 #include <boost/test/included/unit_test.hpp>
 
 #include <test/kernel/block_data.h>
+#include <test/util/common.h>
 
 #include <charconv>
 #include <cstdint>
@@ -265,7 +266,9 @@ void run_verify_test(
 }
 
 template <typename T>
-concept HasToBytes = requires(T t) { t.ToBytes(); };
+concept HasToBytes = requires(T t) {
+    { t.ToBytes() } -> std::convertible_to<std::span<const std::byte>>;
+};
 
 template <typename T>
 void CheckHandle(T object, T distinct_object)
@@ -401,8 +404,11 @@ BOOST_AUTO_TEST_CASE(btck_transaction_tests)
 
     BOOST_CHECK_EQUAL(tx.CountOutputs(), 2);
     BOOST_CHECK_EQUAL(tx.CountInputs(), 1);
+    BOOST_CHECK_EQUAL(tx.GetLocktime(), 510826);
     auto broken_tx_data{std::span<std::byte>{tx_data.begin(), tx_data.begin() + 10}};
     BOOST_CHECK_THROW(Transaction{broken_tx_data}, std::runtime_error);
+    auto input{tx.GetInput(0)};
+    BOOST_CHECK_EQUAL(input.GetSequence(), 0xfffffffe);
     auto output{tx.GetOutput(tx.CountOutputs() - 1)};
     BOOST_CHECK_EQUAL(output.Amount(), 42130042);
     auto script_pubkey{output.GetScriptPubkey()};
@@ -682,6 +688,10 @@ BOOST_AUTO_TEST_CASE(btck_block_header_tests)
     auto prev_hash = header.PrevHash();
     BOOST_CHECK_EQUAL(byte_span_to_hex_string_reversed(prev_hash.ToBytes()), "000000000019d6689c085ae165831e934ff763ae46a2a6c172b3f1b60a8ce26f");
 
+    // Test round-trip serialization of block header
+    auto header_roundtrip{BlockHeader{header.ToBytes()}};
+    check_equal(header_roundtrip.ToBytes(), mainnet_block_1_header);
+
     auto raw_block = hex_string_to_byte_vec("010000006fe28c0ab6f1b372c1a6a246ae63f74f931e8365e15a089c68d6190000000000982051fd1e4ba744bbbe680e1fee14677ba1a3c3540bf7b1cdb606e857233e0e61bc6649ffff001d01e362990101000000010000000000000000000000000000000000000000000000000000000000000000ffffffff0704ffff001d0104ffffffff0100f2052a0100000043410496b538e853519c726a2c91e61ec11600ae1390813a627c66fb8be7947be63c52da7589379515d4e0a604f8141781e62294721166bf621e73a82cbf2342c858eeac00000000");
     Block block{raw_block};
     BlockHeader block_header{block.GetHeader()};
@@ -690,6 +700,11 @@ BOOST_AUTO_TEST_CASE(btck_block_header_tests)
     BOOST_CHECK_EQUAL(block_header.Bits(), 0x1d00ffff);
     BOOST_CHECK_EQUAL(block_header.Nonce(), 2573394689);
     BOOST_CHECK_EQUAL(byte_span_to_hex_string_reversed(block_header.Hash().ToBytes()), "00000000839a8e6886ab5951d76f411475428afc90947ee320161bbf18eb6048");
+
+    // Verify header from block serializes to first 80 bytes of raw block
+    auto block_header_bytes = block_header.ToBytes();
+    BOOST_CHECK_EQUAL(block_header_bytes.size(), 80);
+    check_equal(block_header_bytes, std::span<const std::byte>(raw_block.data(), 80));
 }
 
 BOOST_AUTO_TEST_CASE(btck_block)
@@ -910,6 +925,65 @@ void chainman_mainnet_validation_test(TestDirectory& test_directory)
     BOOST_CHECK(!new_block);
 }
 
+BOOST_AUTO_TEST_CASE(btck_check_block_context_free)
+{
+    constexpr size_t MERKLE_ROOT_OFFSET{4 + 32};
+    constexpr size_t NBITS_OFFSET{4 + 32 + 32 + 4};
+    constexpr size_t COINBASE_PREVOUT_N_OFFSET{4 + 32 + 32 + 4 + 4 + 4 + 1 + 4 + 1 + 32};
+
+    // Mainnet block 1
+    auto raw_block = hex_string_to_byte_vec("010000006fe28c0ab6f1b372c1a6a246ae63f74f931e8365e15a089c68d6190000000000982051fd1e4ba744bbbe680e1fee14677ba1a3c3540bf7b1cdb606e857233e0e61bc6649ffff001d01e362990101000000010000000000000000000000000000000000000000000000000000000000000000ffffffff0704ffff001d0104ffffffff0100f2052a0100000043410496b538e853519c726a2c91e61ec11600ae1390813a627c66fb8be7947be63c52da7589379515d4e0a604f8141781e62294721166bf621e73a82cbf2342c858eeac00000000");
+
+    // Context-free block checks still need consensus params for the optional
+    // proof-of-work validation path.
+    ChainParams mainnet_params{ChainType::MAINNET};
+    auto consensus_params = mainnet_params.GetConsensusParams();
+
+    Block block{raw_block};
+    BlockValidationState state;
+
+    BOOST_CHECK(block.Check(consensus_params, BlockCheckFlags::BASE, state));
+    BOOST_CHECK(state.GetValidationMode() == ValidationMode::VALID);
+
+    BOOST_CHECK(block.Check(consensus_params, BlockCheckFlags::ALL, state));
+    BOOST_CHECK(state.GetValidationMode() == ValidationMode::VALID);
+
+    auto bad_merkle_block_data = raw_block;
+    bad_merkle_block_data[MERKLE_ROOT_OFFSET] ^= std::byte{0x01};
+    Block bad_merkle_block{bad_merkle_block_data};
+
+    BOOST_CHECK(!bad_merkle_block.Check(consensus_params, BlockCheckFlags::MERKLE, state));
+    BOOST_CHECK(state.GetValidationMode() == ValidationMode::INVALID);
+    BOOST_CHECK(state.GetBlockValidationResult() == BlockValidationResult::MUTATED);
+
+    BOOST_CHECK(bad_merkle_block.Check(consensus_params, BlockCheckFlags::BASE, state));
+    BOOST_CHECK(state.GetValidationMode() == ValidationMode::VALID);
+
+    auto bad_pow_block_data = raw_block;
+    bad_pow_block_data[NBITS_OFFSET + 3] = std::byte{0x1c};
+    Block bad_pow_block{bad_pow_block_data};
+
+    BOOST_CHECK(!bad_pow_block.Check(consensus_params, BlockCheckFlags::POW, state));
+    BOOST_CHECK(state.GetValidationMode() == ValidationMode::INVALID);
+    BOOST_CHECK(state.GetBlockValidationResult() == BlockValidationResult::INVALID_HEADER);
+
+    BOOST_CHECK(bad_pow_block.Check(consensus_params, BlockCheckFlags::MERKLE, state));
+    BOOST_CHECK(state.GetValidationMode() == ValidationMode::VALID);
+
+    auto bad_base_block_data = raw_block;
+    bad_base_block_data[COINBASE_PREVOUT_N_OFFSET] = std::byte{0x00};
+    Block bad_base_block{bad_base_block_data};
+
+    BOOST_CHECK(!bad_base_block.Check(consensus_params, BlockCheckFlags::BASE, state));
+    BOOST_CHECK(state.GetValidationMode() == ValidationMode::INVALID);
+    BOOST_CHECK(state.GetBlockValidationResult() == BlockValidationResult::CONSENSUS);
+
+    // Test with invalid truncated block data.
+    auto truncated_block_data = hex_string_to_byte_vec("010000006fe28c0ab6f1b372c1a6a246ae63f74f931e8365e15a089c68d6190000000000982051fd1e4ba744bbbe680e1fee14677ba1a3c3540bf7b1cdb606e857233e0e61bc6649ffff001d01e36299");
+    BOOST_CHECK_EXCEPTION(Block{truncated_block_data}, std::runtime_error,
+                          HasReason{"failed to instantiate btck object"});
+}
+
 BOOST_AUTO_TEST_CASE(btck_chainman_mainnet_tests)
 {
     auto test_directory{TestDirectory{"mainnet_test_bitcoin_kernel"}};
@@ -1172,8 +1246,8 @@ BOOST_AUTO_TEST_CASE(btck_chainman_regtest_tests)
     BOOST_CHECK_EQUAL(count, chain.CountEntries());
 
 
-    fs::remove_all(test_directory.m_directory / "blocks" / "blk00000.dat");
+    fs::remove(test_directory.m_directory / "blocks" / "blk00000.dat");
     BOOST_CHECK(!chainman->ReadBlock(tip_2).has_value());
-    fs::remove_all(test_directory.m_directory / "blocks" / "rev00000.dat");
+    fs::remove(test_directory.m_directory / "blocks" / "rev00000.dat");
     BOOST_CHECK_THROW(chainman->ReadBlockSpentOutputs(tip), std::runtime_error);
 }
diff --git a/src/test/logging_tests.cpp b/src/test/logging_tests.cpp
index f232bb418143..dfefd91769d2 100644
--- a/src/test/logging_tests.cpp
+++ b/src/test/logging_tests.cpp
@@ -165,9 +165,8 @@ BOOST_FIXTURE_TEST_CASE(logging_LogPrintMacros_CategoryName, LogSetup)
     std::vector<std::pair<BCLog::LogFlags, std::string>> expected_category_names;
     const auto category_names = SplitString(concatenated_category_names, ',');
     for (const auto& category_name : category_names) {
-        BCLog::LogFlags category;
         const auto trimmed_category_name = TrimString(category_name);
-        BOOST_REQUIRE(GetLogCategory(category, trimmed_category_name));
+        const auto category{*Assert(GetLogCategory(trimmed_category_name))};
         expected_category_names.emplace_back(category, trimmed_category_name);
     }
 
diff --git a/src/test/main.cpp b/src/test/main.cpp
index 0b7c451a5824..398ab4d6bd7d 100644
--- a/src/test/main.cpp
+++ b/src/test/main.cpp
@@ -14,18 +14,6 @@
 #include <functional>
 #include <iostream>
 
-/** Redirect debug log to unit_test.log files */
-const std::function<void(const std::string&)> G_TEST_LOG_FUN = [](const std::string& s) {
-    static const bool should_log{std::any_of(
-        &boost::unit_test::framework::master_test_suite().argv[1],
-        &boost::unit_test::framework::master_test_suite().argv[boost::unit_test::framework::master_test_suite().argc],
-        [](const char* arg) {
-            return std::string{"DEBUG_LOG_OUT"} == arg;
-        })};
-    if (!should_log) return;
-    std::cout << s;
-};
-
 /**
  * Retrieve the command line arguments from boost.
  * Allows usage like:
diff --git a/src/test/mempool_tests.cpp b/src/test/mempool_tests.cpp
index 67e2643837d0..77024c3edc6d 100644
--- a/src/test/mempool_tests.cpp
+++ b/src/test/mempool_tests.cpp
@@ -4,6 +4,7 @@
 
 #include <common/system.h>
 #include <policy/policy.h>
+#include <test/util/time.h>
 #include <test/util/txmempool.h>
 #include <txmempool.h>
 #include <util/time.h>
@@ -251,28 +252,29 @@ BOOST_AUTO_TEST_CASE(MempoolSizeLimitTest)
     TryAddToMempool(pool, entry.Fee(900LL).FromTx(tx7));
 
     std::vector<CTransactionRef> vtx;
-    SetMockTime(42);
-    SetMockTime(42 + CTxMemPool::ROLLING_FEE_HALFLIFE);
+    NodeClockContext clock_ctx{42s};
+    constexpr std::chrono::seconds HALFLIFE{CTxMemPool::ROLLING_FEE_HALFLIFE};
+    clock_ctx += HALFLIFE;
     BOOST_CHECK_EQUAL(pool.GetMinFee(1).GetFeePerK(), maxFeeRateRemoved.GetFeePerK() + DEFAULT_INCREMENTAL_RELAY_FEE);
     // ... we should keep the same min fee until we get a block
     pool.removeForBlock(vtx, 1);
-    SetMockTime(42 + 2*CTxMemPool::ROLLING_FEE_HALFLIFE);
+    clock_ctx += HALFLIFE;
     BOOST_CHECK_EQUAL(pool.GetMinFee(1).GetFeePerK(), llround((maxFeeRateRemoved.GetFeePerK() + DEFAULT_INCREMENTAL_RELAY_FEE)/2.0));
     // ... then feerate should drop 1/2 each halflife
 
-    SetMockTime(42 + 2*CTxMemPool::ROLLING_FEE_HALFLIFE + CTxMemPool::ROLLING_FEE_HALFLIFE/2);
+    clock_ctx += HALFLIFE / 2;
     BOOST_CHECK_EQUAL(pool.GetMinFee(pool.DynamicMemoryUsage() * 5 / 2).GetFeePerK(), llround((maxFeeRateRemoved.GetFeePerK() + DEFAULT_INCREMENTAL_RELAY_FEE)/4.0));
     // ... with a 1/2 halflife when mempool is < 1/2 its target size
 
-    SetMockTime(42 + 2*CTxMemPool::ROLLING_FEE_HALFLIFE + CTxMemPool::ROLLING_FEE_HALFLIFE/2 + CTxMemPool::ROLLING_FEE_HALFLIFE/4);
+    clock_ctx += HALFLIFE / 4;
     BOOST_CHECK_EQUAL(pool.GetMinFee(pool.DynamicMemoryUsage() * 9 / 2).GetFeePerK(), llround((maxFeeRateRemoved.GetFeePerK() + DEFAULT_INCREMENTAL_RELAY_FEE)/8.0));
     // ... with a 1/4 halflife when mempool is < 1/4 its target size
 
-    SetMockTime(42 + 7*CTxMemPool::ROLLING_FEE_HALFLIFE + CTxMemPool::ROLLING_FEE_HALFLIFE/2 + CTxMemPool::ROLLING_FEE_HALFLIFE/4);
+    clock_ctx += 5 * HALFLIFE;
     BOOST_CHECK_EQUAL(pool.GetMinFee(1).GetFeePerK(), DEFAULT_INCREMENTAL_RELAY_FEE);
     // ... but feerate should never drop below DEFAULT_INCREMENTAL_RELAY_FEE
 
-    SetMockTime(42 + 8*CTxMemPool::ROLLING_FEE_HALFLIFE + CTxMemPool::ROLLING_FEE_HALFLIFE/2 + CTxMemPool::ROLLING_FEE_HALFLIFE/4);
+    clock_ctx += HALFLIFE;
     BOOST_CHECK_EQUAL(pool.GetMinFee(1).GetFeePerK(), 0);
     // ... unless it has gone all the way to 0 (after getting past DEFAULT_INCREMENTAL_RELAY_FEE/2)
 }
diff --git a/src/test/merkle_tests.cpp b/src/test/merkle_tests.cpp
index a7212147b62f..a6dd23adb17e 100644
--- a/src/test/merkle_tests.cpp
+++ b/src/test/merkle_tests.cpp
@@ -9,7 +9,7 @@
 
 #include <boost/test/unit_test.hpp>
 
-BOOST_FIXTURE_TEST_SUITE(merkle_tests, TestingSetup)
+BOOST_FIXTURE_TEST_SUITE(merkle_tests, BasicTestingSetup)
 
 static uint256 ComputeMerkleRootFromBranch(const uint256& leaf, const std::vector<uint256>& vMerkleBranch, uint32_t nIndex) {
     uint256 hash = leaf;
diff --git a/src/test/miniscript_tests.cpp b/src/test/miniscript_tests.cpp
index 9a3e9ea0789b..6dac2aa907f8 100644
--- a/src/test/miniscript_tests.cpp
+++ b/src/test/miniscript_tests.cpp
@@ -727,24 +727,39 @@ BOOST_AUTO_TEST_CASE(fixed_tests)
 }
 
 // Confirm that ~Node(), Node::Clone() and operator=(Node&&) are stack-safe.
-BOOST_AUTO_TEST_CASE(node_deep_destruct)
+BOOST_AUTO_TEST_CASE(node_stress_stack)
 {
     using miniscript::internal::NoDupCheck;
     using miniscript::Fragment;
     using NodeU32 = miniscript::Node<uint32_t>;
 
-    constexpr auto ctx{miniscript::MiniscriptContext::P2WSH};
+    const auto compute_depth{[] (const NodeU32& node) -> size_t {
+        size_t depth{0};
+        for (const auto* n{&node}; !n->Subs().empty(); n = &n->Subs().front()) {
+            ++depth;
+        }
+        return depth;
+    }};
 
+    constexpr auto ctx{miniscript::MiniscriptContext::TAPSCRIPT};
     NodeU32 root{NoDupCheck{}, ctx, Fragment::JUST_1};
-    for (uint32_t i{0}; i < 200'000; ++i) {
-        root = NodeU32{NoDupCheck{}, ctx, Fragment::WRAP_S, Vector(std::move(root))};
+    // Some CI jobs run with CI_LIMIT_STACK_SIZE which reduces the stack size
+    // via ulimit to 512 kbytes. When tested with ~Node()=default (stack-unsafe)
+    // implementations the test has been shown to fail for the below depth.
+    // The test may pass locally despite stack-unsafe implementations unless the
+    // stack is reduced in a similar way or the depth is temporarily increased.
+    constexpr size_t depth{200'000};
+    for (size_t i{0}; i < depth; ++i) {
+        root = NodeU32{NoDupCheck{}, ctx, Fragment::WRAP_N, Vector(std::move(root))};
     }
-    BOOST_CHECK_EQUAL(root.ScriptSize(), 200'001);
+    BOOST_CHECK(root.IsValid());
+    BOOST_CHECK_EQUAL(compute_depth(root), depth);
 
     auto clone{root.Clone()};
-    BOOST_CHECK_EQUAL(clone.ScriptSize(), root.ScriptSize());
+    BOOST_CHECK_EQUAL(compute_depth(clone), depth);
 
     clone = std::move(root);
+    BOOST_CHECK_EQUAL(compute_depth(clone), depth);
 }
 
 BOOST_AUTO_TEST_SUITE_END()
diff --git a/src/test/net_tests.cpp b/src/test/net_tests.cpp
index 1fc8d5269441..32801d97b8bd 100644
--- a/src/test/net_tests.cpp
+++ b/src/test/net_tests.cpp
@@ -2,6 +2,7 @@
 // Distributed under the MIT software license, see the accompanying
 // file COPYING or http://www.opensource.org/licenses/mit-license.php.
 
+#include <addrman.h>
 #include <chainparams.h>
 #include <clientversion.h>
 #include <common/args.h>
@@ -1559,4 +1560,34 @@ BOOST_AUTO_TEST_CASE(v2transport_test)
     }
 }
 
+BOOST_AUTO_TEST_CASE(private_broadcast_version_does_not_update_addrman_services)
+{
+    LOCK(NetEventsInterface::g_msgproc_mutex);
+
+    const CNetAddr source{LookupHost("2.3.4.5", /*fAllowLookup=*/false).value()};
+    const CAddress addr{Lookup("1.2.3.4", 8333, /*fAllowLookup=*/false).value(), NODE_NONE};
+    BOOST_REQUIRE(m_node.addrman->Add({addr}, source));
+    CNode node{/*id=*/0,
+               /*sock=*/nullptr,
+               /*addrIn=*/addr,
+               /*nKeyedNetGroupIn=*/0,
+               /*nLocalHostNonceIn=*/0,
+               /*addrBindIn=*/CService{},
+               /*addrNameIn=*/"",
+               /*conn_type_in=*/ConnectionType::PRIVATE_BROADCAST,
+               /*inbound_onion=*/false,
+               /*network_key=*/0};
+
+    auto& connman = static_cast<ConnmanTestMsg&>(*m_node.connman);
+    connman.Handshake(node,
+                      /*successfully_connected=*/false,
+                      /*remote_services=*/NODE_NETWORK,
+                      /*local_services=*/NODE_NONE,
+                      /*version=*/PROTOCOL_VERSION,
+                      /*relay_txs=*/true);
+
+    BOOST_CHECK_EQUAL(m_node.addrman->Select().first.nServices, NODE_NONE);
+    m_node.peerman->FinalizeNode(node);
+}
+
 BOOST_AUTO_TEST_SUITE_END()
diff --git a/src/test/orphanage_tests.cpp b/src/test/orphanage_tests.cpp
index 6ebfab34c52b..f001360a1774 100644
--- a/src/test/orphanage_tests.cpp
+++ b/src/test/orphanage_tests.cpp
@@ -13,6 +13,7 @@
 #include <test/util/common.h>
 #include <test/util/random.h>
 #include <test/util/setup_common.h>
+#include <test/util/time.h>
 #include <test/util/transaction_utils.h>
 
 #include <array>
@@ -20,7 +21,7 @@
 
 #include <boost/test/unit_test.hpp>
 
-BOOST_FIXTURE_TEST_SUITE(orphanage_tests, TestingSetup)
+BOOST_FIXTURE_TEST_SUITE(orphanage_tests, BasicTestingSetup)
 
 static void MakeNewKeyWithFastRandomContext(CKey& key, FastRandomContext& rand_ctx)
 {
@@ -431,9 +432,7 @@ BOOST_AUTO_TEST_CASE(DoS_mapOrphans)
     FillableSigningProvider keystore;
     BOOST_CHECK(keystore.AddKey(key));
 
-    // Freeze time for length of test
-    auto now{GetTime<std::chrono::seconds>()};
-    SetMockTime(now);
+    NodeClockContext clock_ctx{};
 
     std::vector<CTransactionRef> orphans_added;
 
diff --git a/src/test/prevector_tests.cpp b/src/test/prevector_tests.cpp
index 4b63e76fa9cf..f9dcaae035fc 100644
--- a/src/test/prevector_tests.cpp
+++ b/src/test/prevector_tests.cpp
@@ -13,7 +13,7 @@
 #include <ranges>
 #include <vector>
 
-BOOST_FIXTURE_TEST_SUITE(prevector_tests, TestingSetup)
+BOOST_FIXTURE_TEST_SUITE(prevector_tests, BasicTestingSetup)
 
 template <unsigned int N, typename T>
 class prevector_tester
diff --git a/src/test/private_broadcast_tests.cpp b/src/test/private_broadcast_tests.cpp
index 73bdbbb54f60..048284b23db1 100644
--- a/src/test/private_broadcast_tests.cpp
+++ b/src/test/private_broadcast_tests.cpp
@@ -90,6 +90,13 @@ BOOST_AUTO_TEST_CASE(basic)
     BOOST_CHECK(!pb.DidNodeConfirmReception(recipient2));
     BOOST_CHECK(!pb.DidNodeConfirmReception(nonexistent_recipient));
 
+    // 1. Freshly added transactions should NOT be stale yet.
+    BOOST_CHECK_EQUAL(pb.GetStale().size(), 0);
+
+    // 2. Fast-forward the mock clock past the INITIAL_STALE_DURATION.
+    SetMockTime(Now<NodeSeconds>() + PrivateBroadcast::INITIAL_STALE_DURATION + 1min);
+
+    // 3. Now that the initial duration has passed, both unconfirmed transactions should be stale.
     BOOST_CHECK_EQUAL(pb.GetStale().size(), 2);
 
     // Confirm reception by recipient1.
@@ -102,20 +109,21 @@ BOOST_AUTO_TEST_CASE(basic)
     const auto infos{pb.GetBroadcastInfo()};
     BOOST_CHECK_EQUAL(infos.size(), 2);
     {
-        const auto& [tx, peers]{find_tx_info(infos, tx_for_recipient1)};
+        const auto& peers{find_tx_info(infos, tx_for_recipient1).peers};
         BOOST_CHECK_EQUAL(peers.size(), 1);
         BOOST_CHECK_EQUAL(peers[0].address.ToStringAddrPort(), addr1.ToStringAddrPort());
         BOOST_CHECK(peers[0].received.has_value());
     }
     {
-        const auto& [tx, peers]{find_tx_info(infos, tx_for_recipient2)};
+        const auto& peers{find_tx_info(infos, tx_for_recipient2).peers};
         BOOST_CHECK_EQUAL(peers.size(), 1);
         BOOST_CHECK_EQUAL(peers[0].address.ToStringAddrPort(), addr2.ToStringAddrPort());
         BOOST_CHECK(!peers[0].received.has_value());
     }
 
-    BOOST_CHECK_EQUAL(pb.GetStale().size(), 1);
-    BOOST_CHECK_EQUAL(pb.GetStale()[0], tx_for_recipient2);
+    const auto stale_state{pb.GetStale()};
+    BOOST_CHECK_EQUAL(stale_state.size(), 1);
+    BOOST_CHECK_EQUAL(stale_state[0], tx_for_recipient2);
 
     SetMockTime(Now<NodeSeconds>() + 10h);
 
@@ -131,4 +139,22 @@ BOOST_AUTO_TEST_CASE(basic)
     BOOST_CHECK(!pb.PickTxForSend(/*will_send_to_nodeid=*/nonexistent_recipient, /*will_send_to_address=*/addr_nonexistent).has_value());
 }
 
+BOOST_AUTO_TEST_CASE(stale_unpicked_tx)
+{
+    SetMockTime(Now<NodeSeconds>());
+
+    PrivateBroadcast pb;
+    const auto tx{MakeDummyTx(/*id=*/42, /*num_witness=*/0)};
+    BOOST_REQUIRE(pb.Add(tx));
+
+    // Unpicked transactions use the longer INITIAL_STALE_DURATION.
+    BOOST_CHECK_EQUAL(pb.GetStale().size(), 0);
+    SetMockTime(Now<NodeSeconds>() + PrivateBroadcast::INITIAL_STALE_DURATION - 1min);
+    BOOST_CHECK_EQUAL(pb.GetStale().size(), 0);
+    SetMockTime(Now<NodeSeconds>() + 2min);
+    const auto stale_state{pb.GetStale()};
+    BOOST_REQUIRE_EQUAL(stale_state.size(), 1);
+    BOOST_CHECK_EQUAL(stale_state[0], tx);
+}
+
 BOOST_AUTO_TEST_SUITE_END()
diff --git a/src/test/rbf_tests.cpp b/src/test/rbf_tests.cpp
index 0ffe0846c253..e2a95148e4d1 100644
--- a/src/test/rbf_tests.cpp
+++ b/src/test/rbf_tests.cpp
@@ -14,7 +14,7 @@
 #include <optional>
 #include <vector>
 
-BOOST_FIXTURE_TEST_SUITE(rbf_tests, TestingSetup)
+BOOST_FIXTURE_TEST_SUITE(rbf_tests, BasicTestingSetup)
 
 static inline CTransactionRef make_tx(const std::vector<CTransactionRef>& inputs,
                                       const std::vector<CAmount>& output_values)
diff --git a/src/test/rpc_tests.cpp b/src/test/rpc_tests.cpp
index b435fb8992b3..1b6dbda0d925 100644
--- a/src/test/rpc_tests.cpp
+++ b/src/test/rpc_tests.cpp
@@ -522,7 +522,7 @@ BOOST_AUTO_TEST_CASE(check_dup_param_names)
             }
         }
         push_options();
-        return RPCHelpMan{"method_name", "description", params, RPCResults{}, RPCExamples{""}};
+        return RPCMethod{"method_name", "description", params, RPCResults{}, RPCExamples{""}};
     };
 
     // No errors if parameter names are unique.
@@ -590,10 +590,10 @@ BOOST_AUTO_TEST_CASE(help_example)
     BOOST_CHECK_NE(HelpExampleRpcNamed("foo", {{"arg", true}}), HelpExampleRpcNamed("foo", {{"arg", "true"}}));
 }
 
-static void CheckRpc(const std::vector<RPCArg>& params, const UniValue& args, RPCHelpMan::RPCMethodImpl test_impl)
+static void CheckRpc(const std::vector<RPCArg>& params, const UniValue& args, RPCMethod::RPCMethodImpl test_impl)
 {
     auto null_result{RPCResult{RPCResult::Type::NONE, "", "None"}};
-    const RPCHelpMan rpc{"dummy", "dummy description", params, null_result, RPCExamples{""}, test_impl};
+    const RPCMethod rpc{"dummy", "dummy description", params, null_result, RPCExamples{""}, test_impl};
     JSONRPCRequest req;
     req.params = args;
 
@@ -606,7 +606,7 @@ BOOST_AUTO_TEST_CASE(rpc_arg_helper)
     constexpr auto DEFAULT_STRING = "default";
     constexpr uint64_t DEFAULT_UINT64_T = 3;
 
-    //! Parameters with which the RPCHelpMan is instantiated
+    //! Parameters with which the RPCMethod is instantiated
     const std::vector<RPCArg> params{
         // Required arg
         {"req_int", RPCArg::Type::NUM, RPCArg::Optional::NO, ""},
@@ -621,7 +621,7 @@ BOOST_AUTO_TEST_CASE(rpc_arg_helper)
     };
 
     //! Check that `self.Arg` returns the same value as the `request.params` accessors
-    RPCHelpMan::RPCMethodImpl check_positional = [&](const RPCHelpMan& self, const JSONRPCRequest& request) -> UniValue {
+    RPCMethod::RPCMethodImpl check_positional = [](const RPCMethod& self, const JSONRPCRequest& request) -> UniValue {
             BOOST_CHECK_EQUAL(self.Arg<int>("req_int"), request.params[0].getInt<int>());
             BOOST_CHECK_EQUAL(self.Arg<std::string_view>("req_str"), request.params[1].get_str());
             BOOST_CHECK_EQUAL(self.Arg<uint64_t>("def_uint64_t"), request.params[2].isNull() ? DEFAULT_UINT64_T : request.params[2].getInt<uint64_t>());
diff --git a/src/test/script_p2sh_tests.cpp b/src/test/script_p2sh_tests.cpp
index 2f93d0a8c38e..f80090aa2b11 100644
--- a/src/test/script_p2sh_tests.cpp
+++ b/src/test/script_p2sh_tests.cpp
@@ -275,10 +275,9 @@ BOOST_AUTO_TEST_CASE(switchover)
     BOOST_CHECK_MESSAGE(err == SCRIPT_ERR_EQUALVERIFY, ScriptErrorString(err));
 }
 
-BOOST_AUTO_TEST_CASE(AreInputsStandard)
+BOOST_AUTO_TEST_CASE(ValidateInputsStandardness)
 {
-    CCoinsView coinsDummy;
-    CCoinsViewCache coins(&coinsDummy);
+    CCoinsViewCache coins{&CoinsViewEmpty::Get()};
     FillableSigningProvider keystore;
     CKey key[6];
     for (int i = 0; i < 6; i++)
@@ -292,7 +291,7 @@ BOOST_AUTO_TEST_CASE(AreInputsStandard)
         keys.push_back(key[i].GetPubKey());
 
     CMutableTransaction txFrom;
-    txFrom.vout.resize(7);
+    txFrom.vout.resize(10);
 
     // First three are standard:
     CScript pay1 = GetScriptForDestination(PKHash(key[0].GetPubKey()));
@@ -334,7 +333,24 @@ BOOST_AUTO_TEST_CASE(AreInputsStandard)
     CScript twentySigops; twentySigops << OP_CHECKMULTISIG;
     BOOST_CHECK(keystore.AddCScript(twentySigops));
     txFrom.vout[6].scriptPubKey = GetScriptForDestination(ScriptHash(twentySigops));
-    txFrom.vout[6].nValue = 6000;
+    txFrom.vout[6].nValue = 3000;
+
+    // vout[7] is non-standard because it lacks sigops
+    CScript no_sigops;
+    txFrom.vout[7].scriptPubKey = no_sigops;
+    txFrom.vout[7].nValue = 1000;
+
+    // vout [8] is non-standard because it contains OP_RETURN in its redeemScript.
+    static const unsigned char op_return[] = {OP_RETURN};
+    const auto op_return_script = CScript(op_return, op_return + sizeof(op_return));
+    txFrom.vout[8].scriptPubKey = GetScriptForDestination(ScriptHash(op_return_script));
+    txFrom.vout[8].nValue = 1000;
+
+    // vout[9] is non-standard because its witness is unknown
+    CScript witnessUnknown;
+    witnessUnknown << OP_16 << ToByteVector(uint256::ONE);
+    txFrom.vout[9].scriptPubKey = witnessUnknown;
+    txFrom.vout[9].nValue = 1000;
 
     AddCoins(coins, CTransaction(txFrom), 0);
 
@@ -360,7 +376,7 @@ BOOST_AUTO_TEST_CASE(AreInputsStandard)
     txTo.vin[3].scriptSig << OP_11 << OP_11 << std::vector<unsigned char>(oneAndTwo.begin(), oneAndTwo.end());
     txTo.vin[4].scriptSig << std::vector<unsigned char>(fifteenSigops.begin(), fifteenSigops.end());
 
-    BOOST_CHECK(::AreInputsStandard(CTransaction(txTo), coins));
+    BOOST_CHECK(::ValidateInputsStandardness(CTransaction(txTo), coins).IsValid());
     // 22 P2SH sigops for all inputs (1 for vin[0], 6 for vin[3], 15 for vin[4]
     BOOST_CHECK_EQUAL(GetP2SHSigOpCount(CTransaction(txTo), coins), 22U);
 
@@ -370,6 +386,7 @@ BOOST_AUTO_TEST_CASE(AreInputsStandard)
     BOOST_CHECK(coinbase_tx.IsCoinBase());
     BOOST_CHECK_EQUAL(GetP2SHSigOpCount(coinbase_tx, coins), 0U);
 
+    // TxoutType::SCRIPTHASH
     CMutableTransaction txToNonStd1;
     txToNonStd1.vout.resize(1);
     txToNonStd1.vout[0].scriptPubKey = GetScriptForDestination(PKHash(key[1].GetPubKey()));
@@ -379,7 +396,11 @@ BOOST_AUTO_TEST_CASE(AreInputsStandard)
     txToNonStd1.vin[0].prevout.hash = txFrom.GetHash();
     txToNonStd1.vin[0].scriptSig << std::vector<unsigned char>(sixteenSigops.begin(), sixteenSigops.end());
 
-    BOOST_CHECK(!::AreInputsStandard(CTransaction(txToNonStd1), coins));
+    const auto txToNonStd1_res = ::ValidateInputsStandardness(CTransaction(txToNonStd1), coins);
+    BOOST_CHECK(txToNonStd1_res.IsInvalid());
+    BOOST_CHECK_EQUAL(txToNonStd1_res.GetRejectReason(), "bad-txns-nonstandard-inputs");
+    BOOST_CHECK_EQUAL(txToNonStd1_res.GetDebugMessage(), "p2sh redeemscript sigops exceed limit (input 0: 16 > 15)");
+
     BOOST_CHECK_EQUAL(GetP2SHSigOpCount(CTransaction(txToNonStd1), coins), 16U);
 
     CMutableTransaction txToNonStd2;
@@ -391,8 +412,67 @@ BOOST_AUTO_TEST_CASE(AreInputsStandard)
     txToNonStd2.vin[0].prevout.hash = txFrom.GetHash();
     txToNonStd2.vin[0].scriptSig << std::vector<unsigned char>(twentySigops.begin(), twentySigops.end());
 
-    BOOST_CHECK(!::AreInputsStandard(CTransaction(txToNonStd2), coins));
+    const auto txToNonStd2_res = ::ValidateInputsStandardness(CTransaction(txToNonStd2), coins);
+    BOOST_CHECK(txToNonStd2_res.IsInvalid());
+    BOOST_CHECK_EQUAL(txToNonStd2_res.GetRejectReason(), "bad-txns-nonstandard-inputs");
+    BOOST_CHECK_EQUAL(txToNonStd2_res.GetDebugMessage(), "p2sh redeemscript sigops exceed limit (input 0: 20 > 15)");
     BOOST_CHECK_EQUAL(GetP2SHSigOpCount(CTransaction(txToNonStd2), coins), 20U);
+
+    CMutableTransaction txToNonStd2_no_scriptSig;
+    txToNonStd2_no_scriptSig.vout.resize(1);
+    txToNonStd2_no_scriptSig.vout[0].scriptPubKey = GetScriptForDestination(PKHash(key[1].GetPubKey()));
+    txToNonStd2_no_scriptSig.vout[0].nValue = 1000;
+    txToNonStd2_no_scriptSig.vin.resize(1);
+    txToNonStd2_no_scriptSig.vin[0].prevout.n = 6;
+    txToNonStd2_no_scriptSig.vin[0].prevout.hash = txFrom.GetHash();
+
+    const auto txToNonStd2_no_scriptSig_res = ::ValidateInputsStandardness(CTransaction(txToNonStd2_no_scriptSig), coins);
+    BOOST_CHECK(txToNonStd2_no_scriptSig_res.IsInvalid());
+    BOOST_CHECK_EQUAL(txToNonStd2_no_scriptSig_res.GetRejectReason(), "bad-txns-nonstandard-inputs");
+    BOOST_CHECK_EQUAL(txToNonStd2_no_scriptSig_res.GetDebugMessage(), "input 0 P2SH redeemscript missing");
+    BOOST_CHECK_EQUAL(GetP2SHSigOpCount(CTransaction(txToNonStd2), coins), 20U);
+
+    // TxoutType::NONSTANDARD
+    CMutableTransaction txToNonStd3;
+    txToNonStd3.vout.resize(1);
+    txToNonStd3.vout[0].scriptPubKey = GetScriptForDestination(PKHash(key[1].GetPubKey()));
+    txToNonStd3.vout[0].nValue = 1000;
+    txToNonStd3.vin.resize(1);
+    txToNonStd3.vin[0].prevout.n = 7;
+    txToNonStd3.vin[0].prevout.hash = txFrom.GetHash();
+
+    const auto txToNonStd3_res = ::ValidateInputsStandardness(CTransaction(txToNonStd3), coins);
+    BOOST_CHECK(txToNonStd3_res.IsInvalid());
+    BOOST_CHECK_EQUAL(txToNonStd3_res.GetRejectReason(), "bad-txns-nonstandard-inputs");
+    BOOST_CHECK_EQUAL(txToNonStd3_res.GetDebugMessage(), "input 0 script unknown");
+
+    // TxoutType::INCORRECT_SCRIPTSIG
+    CMutableTransaction txToNonStd4;
+    txToNonStd4.vout.resize(1);
+    txToNonStd4.vout[0].scriptPubKey = GetScriptForDestination(PKHash(key[1].GetPubKey()));
+    txToNonStd4.vout[0].nValue = 1000;
+    txToNonStd4.vin.resize(1);
+    txToNonStd4.vin[0].prevout.n = 8;
+    txToNonStd4.vin[0].prevout.hash = txFrom.GetHash();
+    txToNonStd4.vin[0].scriptSig = op_return_script;
+
+    const auto txToNonStd4_res = ::ValidateInputsStandardness(CTransaction(txToNonStd4), coins);
+    BOOST_CHECK(txToNonStd4_res.IsInvalid());
+    BOOST_CHECK_EQUAL(txToNonStd4_res.GetRejectReason(), "bad-txns-nonstandard-inputs");
+    BOOST_CHECK_EQUAL(txToNonStd4_res.GetDebugMessage(), "p2sh scriptsig malformed (input 0: OP_RETURN was encountered)");
+
+    // TxoutType::WITNESS_UNKNOWN
+    CMutableTransaction txWitnessUnknown;
+    txWitnessUnknown.vout.resize(1);
+    txWitnessUnknown.vout[0].scriptPubKey = GetScriptForDestination(PKHash(key[1].GetPubKey()));
+    txWitnessUnknown.vout[0].nValue = 1000;
+    txWitnessUnknown.vin.resize(1);
+    txWitnessUnknown.vin[0].prevout.n = 9;
+    txWitnessUnknown.vin[0].prevout.hash = txFrom.GetHash();
+    const auto txWitnessUnknown_res = ::ValidateInputsStandardness(CTransaction(txWitnessUnknown), coins);
+    BOOST_CHECK(txWitnessUnknown_res.IsInvalid());
+    BOOST_CHECK_EQUAL(txWitnessUnknown_res.GetRejectReason(), "bad-txns-nonstandard-inputs");
+    BOOST_CHECK_EQUAL(txWitnessUnknown_res.GetDebugMessage(), "input 0 witness program is undefined");
 }
 
 BOOST_AUTO_TEST_SUITE_END()
diff --git a/src/test/script_tests.cpp b/src/test/script_tests.cpp
index 1478cf91252e..b07870207cb3 100644
--- a/src/test/script_tests.cpp
+++ b/src/test/script_tests.cpp
@@ -1455,6 +1455,14 @@ BOOST_AUTO_TEST_CASE(script_IsPushOnly_on_invalid_scripts)
     BOOST_CHECK(!CScript(direct, direct+sizeof(direct)).IsPushOnly());
 }
 
+BOOST_AUTO_TEST_CASE(script_CheckMinimalPush_boundary)
+{
+    // Test the boundary at exactly 65535 bytes: must use OP_PUSHDATA2, not OP_PUSHDATA4.
+    std::vector<unsigned char> data(65535, '\x42');
+    BOOST_CHECK(CheckMinimalPush(data, OP_PUSHDATA2));
+    BOOST_CHECK(!CheckMinimalPush(data, OP_PUSHDATA4));
+}
+
 BOOST_AUTO_TEST_CASE(script_GetScriptAsm)
 {
     BOOST_CHECK_EQUAL("OP_CHECKLOCKTIMEVERIFY", ScriptToAsmStr(CScript() << OP_NOP2, true));
diff --git a/src/test/sigopcount_tests.cpp b/src/test/sigopcount_tests.cpp
index d3fec0f9357d..a463f43ea886 100644
--- a/src/test/sigopcount_tests.cpp
+++ b/src/test/sigopcount_tests.cpp
@@ -116,8 +116,7 @@ BOOST_AUTO_TEST_CASE(GetTxSigOpCost)
     CMutableTransaction spendingTx;
 
     // Create utxo set
-    CCoinsView coinsDummy;
-    CCoinsViewCache coins(&coinsDummy);
+    CCoinsViewCache coins{&CoinsViewEmpty::Get()};
     // Create key
     CKey key = GenerateRandomKey();
     CPubKey pubkey = key.GetPubKey();
diff --git a/src/test/sock_tests.cpp b/src/test/sock_tests.cpp
index 2b7e4a784afa..35914a41298b 100644
--- a/src/test/sock_tests.cpp
+++ b/src/test/sock_tests.cpp
@@ -82,61 +82,75 @@ BOOST_AUTO_TEST_CASE(move_assignment)
     BOOST_CHECK(SocketIsClosed(s2));
 }
 
-#ifndef WIN32 // Windows does not have socketpair(2).
-
-static void CreateSocketPair(int s[2])
-{
-    BOOST_REQUIRE_EQUAL(socketpair(AF_UNIX, SOCK_STREAM, 0, s), 0);
-}
-
-static void SendAndRecvMessage(const Sock& sender, const Sock& receiver)
-{
-    const char* msg = "abcd";
-    constexpr ssize_t msg_len = 4;
-    char recv_buf[10];
-
-    BOOST_CHECK_EQUAL(sender.Send(msg, msg_len, 0), msg_len);
-    BOOST_CHECK_EQUAL(receiver.Recv(recv_buf, sizeof(recv_buf), 0), msg_len);
-    BOOST_CHECK_EQUAL(strncmp(msg, recv_buf, msg_len), 0);
-}
+struct TcpSocketPair {
+    Sock sender;
+    Sock receiver;
+
+    TcpSocketPair()
+        : sender{Sock{CreateSocket()}},
+        receiver{Sock{CreateSocket()}}
+    {
+        connect_pair();
+    }
+
+    TcpSocketPair(const TcpSocketPair&) = delete;
+    TcpSocketPair& operator= (const TcpSocketPair&) = delete;
+    TcpSocketPair(TcpSocketPair&&) = default;
+    TcpSocketPair& operator= (TcpSocketPair&&) = default;
+
+    void connect_pair()
+    {
+        sockaddr_in addr{};
+        addr.sin_family = AF_INET;
+        addr.sin_addr.s_addr = htonl(INADDR_LOOPBACK);
+        addr.sin_port = 0;
+
+        BOOST_REQUIRE_EQUAL(receiver.Bind(reinterpret_cast<sockaddr*>(&addr), sizeof(addr)), 0);
+        BOOST_REQUIRE_EQUAL(receiver.Listen(1), 0);
+
+        // Get the address of the listener.
+        sockaddr_in bound{};
+        socklen_t blen = sizeof(bound);
+        BOOST_REQUIRE_EQUAL(receiver.GetSockName(reinterpret_cast<sockaddr*>(&bound), &blen), 0);
+        BOOST_REQUIRE_EQUAL(blen, sizeof(bound));
+
+        BOOST_REQUIRE_EQUAL(sender.Connect(reinterpret_cast<sockaddr*>(&bound), sizeof(bound)), 0);
+
+        std::unique_ptr<Sock> accepted = receiver.Accept(nullptr, nullptr);
+        BOOST_REQUIRE(accepted != nullptr);
+
+        receiver = std::move(*accepted);
+    }
+
+    void send_and_receive()
+    {
+        const char* msg = "abcd";
+        constexpr ssize_t msg_len = 4;
+        char recv_buf[10];
+
+        BOOST_CHECK_EQUAL(sender.Send(msg, msg_len, 0), msg_len);
+        BOOST_CHECK_EQUAL(receiver.Recv(recv_buf, sizeof(recv_buf), 0), msg_len);
+        BOOST_CHECK_EQUAL(strncmp(msg, recv_buf, msg_len), 0);
+    }
+};
 
 BOOST_AUTO_TEST_CASE(send_and_receive)
 {
-    int s[2];
-    CreateSocketPair(s);
-
-    Sock* sock0 = new Sock(s[0]);
-    Sock* sock1 = new Sock(s[1]);
+    TcpSocketPair socks{};
+    socks.send_and_receive();
 
-    SendAndRecvMessage(*sock0, *sock1);
-
-    Sock* sock0moved = new Sock(std::move(*sock0));
-    Sock* sock1moved = new Sock(INVALID_SOCKET);
-    *sock1moved = std::move(*sock1);
-
-    delete sock0;
-    delete sock1;
-
-    SendAndRecvMessage(*sock1moved, *sock0moved);
-
-    delete sock0moved;
-    delete sock1moved;
-
-    BOOST_CHECK(SocketIsClosed(s[0]));
-    BOOST_CHECK(SocketIsClosed(s[1]));
+    // Sockets are still connected after being moved.
+    TcpSocketPair socks_moved = std::move(socks);
+    socks_moved.send_and_receive();
 }
 
 BOOST_AUTO_TEST_CASE(wait)
 {
-    int s[2];
-    CreateSocketPair(s);
+    TcpSocketPair socks = TcpSocketPair{};
 
-    Sock sock0(s[0]);
-    Sock sock1(s[1]);
+    std::thread waiter([&socks]() { (void)socks.receiver.Wait(24h, Sock::RECV); });
 
-    std::thread waiter([&sock0]() { (void)sock0.Wait(24h, Sock::RECV); });
-
-    BOOST_REQUIRE_EQUAL(sock1.Send("a", 1, 0), 1);
+    BOOST_REQUIRE_EQUAL(socks.sender.Send("a", 1, 0), 1);
 
     waiter.join();
 }
@@ -145,31 +159,26 @@ BOOST_AUTO_TEST_CASE(recv_until_terminator_limit)
 {
     constexpr auto timeout = 1min; // High enough so that it is never hit.
     CThreadInterrupt interrupt;
-    int s[2];
-    CreateSocketPair(s);
 
-    Sock sock_send(s[0]);
-    Sock sock_recv(s[1]);
+    TcpSocketPair socks = TcpSocketPair{};
 
-    std::thread receiver([&sock_recv, &timeout, &interrupt]() {
+    std::thread receiver([&socks, &timeout, &interrupt]() {
         constexpr size_t max_data{10};
         bool threw_as_expected{false};
         // BOOST_CHECK_EXCEPTION() writes to some variables shared with the main thread which
         // creates a data race. So mimic it manually.
         try {
-            (void)sock_recv.RecvUntilTerminator('\n', timeout, interrupt, max_data);
+            (void)socks.receiver.RecvUntilTerminator('\n', timeout, interrupt, max_data);
         } catch (const std::runtime_error& e) {
             threw_as_expected = HasReason("too many bytes without a terminator")(e);
         }
         assert(threw_as_expected);
     });
 
-    BOOST_REQUIRE_NO_THROW(sock_send.SendComplete("1234567", timeout, interrupt));
-    BOOST_REQUIRE_NO_THROW(sock_send.SendComplete("89a\n", timeout, interrupt));
+    BOOST_REQUIRE_NO_THROW(socks.sender.SendComplete("1234567", timeout, interrupt));
+    BOOST_REQUIRE_NO_THROW(socks.sender.SendComplete("89a\n", timeout, interrupt));
 
     receiver.join();
 }
 
-#endif /* WIN32 */
-
 BOOST_AUTO_TEST_SUITE_END()
diff --git a/src/test/streams_tests.cpp b/src/test/streams_tests.cpp
index dfddc415b50e..6a6026bf4106 100644
--- a/src/test/streams_tests.cpp
+++ b/src/test/streams_tests.cpp
@@ -208,6 +208,28 @@ BOOST_AUTO_TEST_CASE(streams_vector_writer)
     vch.clear();
 }
 
+BOOST_AUTO_TEST_CASE(streams_span_writer)
+{
+    unsigned char a(1);
+    unsigned char b(2);
+    unsigned char bytes[] = {3, 4, 5, 6};
+    std::array<std::byte, 8> arr{};
+
+    // Test operator<<
+    SpanWriter writer{arr};
+    writer << a << b;
+    BOOST_CHECK_EQUAL(HexStr(arr), "0102000000000000");
+
+    // Use variadic constructor and write to subspan.
+    SpanWriter{std::span{arr}.subspan(2), a, bytes, b};
+    BOOST_CHECK_EQUAL(HexStr(arr), "0102010304050602");
+
+    // Writing past the end throws
+    std::array<std::byte, 1> small{};
+    BOOST_CHECK_THROW(SpanWriter(std::span{small}, a, b), std::ios_base::failure);
+    BOOST_CHECK_THROW(SpanWriter(std::span{small}) << a << b, std::ios_base::failure);
+}
+
 BOOST_AUTO_TEST_CASE(streams_vector_reader)
 {
     std::vector<unsigned char> vch = {1, 255, 3, 4, 5, 6};
diff --git a/src/test/system_tests.cpp b/src/test/system_tests.cpp
index bd57661b051c..408666d67089 100644
--- a/src/test/system_tests.cpp
+++ b/src/test/system_tests.cpp
@@ -26,7 +26,18 @@ BOOST_FIXTURE_TEST_SUITE(system_tests, BasicTestingSetup)
 
 static std::vector<std::string> mock_executable(std::string name)
 {
-    return {boost::unit_test::framework::master_test_suite().argv[0], "--log_level=nothing", "--report_level=no", "--run_test=mock_process/" + name};
+    // Invoke the mock_process/* test case with all unsolicited output suppressed.
+    return {
+        boost::unit_test::framework::master_test_suite().argv[0],
+        // Disable false-positive memory leak dumps to stderr
+        // in debug builds when using the Windows UCRT.
+        "--detect_memory_leaks=0",
+        // Disable logging to stdout.
+        "--log_level=nothing",
+        // Disable the test report to stderr.
+        "--report_level=no",
+        "--run_test=mock_process/" + name,
+    };
 }
 
 BOOST_AUTO_TEST_CASE(run_command)
diff --git a/src/test/testnet4_miner_tests.cpp b/src/test/testnet4_miner_tests.cpp
index d0aeebe0f21c..1bfc19db2707 100644
--- a/src/test/testnet4_miner_tests.cpp
+++ b/src/test/testnet4_miner_tests.cpp
@@ -5,11 +5,12 @@
 #include <common/system.h>
 #include <interfaces/mining.h>
 #include <node/miner.h>
+#include <test/util/common.h>
+#include <test/util/setup_common.h>
+#include <test/util/time.h>
 #include <util/time.h>
 #include <validation.h>
 
-#include <test/util/setup_common.h>
-
 #include <boost/test/unit_test.hpp>
 
 using interfaces::BlockTemplate;
@@ -39,14 +40,14 @@ BOOST_AUTO_TEST_CASE(MiningInterface)
     std::unique_ptr<BlockTemplate> block_template;
 
     // Set node time a few minutes past the testnet4 genesis block
-    const int64_t genesis_time{WITH_LOCK(cs_main, return m_node.chainman->ActiveChain().Tip()->GetBlockTime())};
-    SetMockTime(genesis_time + 3 * 60);
+    const auto template_time{3min + WITH_LOCK(cs_main, return m_node.chainman->ActiveChain().Tip()->Time())};
+    NodeClockContext clock_ctx{template_time};
 
     block_template = mining->createNewBlock(options, /*cooldown=*/false);
     BOOST_REQUIRE(block_template);
 
     // The template should use the mocked system time
-    BOOST_REQUIRE_EQUAL(block_template->getBlockHeader().nTime, genesis_time + 3 * 60);
+    BOOST_REQUIRE_EQUAL(block_template->getBlockHeader().Time(), template_time);
 
     const BlockWaitOptions wait_options{.timeout = MillisecondsDouble{0}, .fee_threshold = 1};
 
@@ -55,20 +56,14 @@ BOOST_AUTO_TEST_CASE(MiningInterface)
     BOOST_REQUIRE(should_be_nullptr == nullptr);
 
     // This remains the case when exactly 20 minutes have gone by
-    {
-        LOCK(cs_main);
-        SetMockTime(m_node.chainman->ActiveChain().Tip()->GetBlockTime() + 20 * 60);
-    }
+    clock_ctx += 17min;
     should_be_nullptr = block_template->waitNext(wait_options);
     BOOST_REQUIRE(should_be_nullptr == nullptr);
 
     // One second later the difficulty drops and it returns a new template
     // Note that we can't test the actual difficulty change, because the
     // difficulty is already at 1.
-    {
-        LOCK(cs_main);
-        SetMockTime(m_node.chainman->ActiveChain().Tip()->GetBlockTime() + 20 * 60 + 1);
-    }
+    clock_ctx += 1s;
     block_template = block_template->waitNext(wait_options);
     BOOST_REQUIRE(block_template);
 }
diff --git a/src/test/threadpool_tests.cpp b/src/test/threadpool_tests.cpp
index c5e3974f7a10..1100e87686f2 100644
--- a/src/test/threadpool_tests.cpp
+++ b/src/test/threadpool_tests.cpp
@@ -11,13 +11,17 @@
 #include <util/time.h>
 
 #include <boost/test/unit_test.hpp>
+
+#include <array>
+#include <functional>
 #include <latch>
+#include <ranges>
 #include <semaphore>
 
 // General test values
 int NUM_WORKERS_DEFAULT = 0;
 constexpr char POOL_NAME[] = "test";
-constexpr auto WAIT_TIMEOUT = 120s;
+constexpr auto TEST_WAIT_TIMEOUT = 120s;
 
 struct ThreadPoolFixture {
     ThreadPoolFixture() {
@@ -41,12 +45,13 @@ struct ThreadPoolFixture {
 // 11) Start() must not cause a deadlock when called during Stop().
 // 12) Ensure queued tasks complete after Interrupt().
 // 13) Ensure the Stop() calling thread helps drain the queue.
+// 14) Submit range of tasks in one lock acquisition.
 BOOST_FIXTURE_TEST_SUITE(threadpool_tests, ThreadPoolFixture)
 
 #define WAIT_FOR(futures)                                                         \
     do {                                                                          \
         for (const auto& f : futures) {                                           \
-            BOOST_REQUIRE(f.wait_for(WAIT_TIMEOUT) == std::future_status::ready); \
+            BOOST_REQUIRE(f.wait_for(TEST_WAIT_TIMEOUT) == std::future_status::ready); \
         }                                                                         \
     } while (0)
 
@@ -107,6 +112,11 @@ BOOST_AUTO_TEST_CASE(submit_fails_with_correct_error)
     res = threadPool.Submit(fn_empty);
     BOOST_CHECK(!res);
     BOOST_CHECK_EQUAL(SubmitErrorString(res.error()), "No active workers");
+
+    std::vector<std::function<void()>> tasks;
+    const auto range_res{threadPool.Submit(std::move(tasks))};
+    BOOST_CHECK(!range_res);
+    BOOST_CHECK_EQUAL(SubmitErrorString(range_res.error()), "No active workers");
 }
 
 // Test 1, submit tasks and verify completion
@@ -170,7 +180,7 @@ BOOST_AUTO_TEST_CASE(wait_for_task_to_finish)
         UninterruptibleSleep(200ms);
         flag.store(true, std::memory_order_release);
     });
-    BOOST_CHECK(future.wait_for(WAIT_TIMEOUT) == std::future_status::ready);
+    BOOST_CHECK(future.wait_for(TEST_WAIT_TIMEOUT) == std::future_status::ready);
     BOOST_CHECK(flag.load(std::memory_order_acquire));
 }
 
@@ -323,6 +333,11 @@ BOOST_AUTO_TEST_CASE(interrupt_blocks_new_submissions)
     BOOST_CHECK(!res);
     BOOST_CHECK_EQUAL(SubmitErrorString(res.error()), "Interrupted");
 
+    std::vector<std::function<void()>> tasks;
+    const auto range_res{threadPool.Submit(std::move(tasks))};
+    BOOST_CHECK(!range_res);
+    BOOST_CHECK_EQUAL(SubmitErrorString(range_res.error()), "Interrupted");
+
     // Reset pool
     threadPool.Stop();
 
@@ -442,4 +457,43 @@ BOOST_AUTO_TEST_CASE(stop_active_wait_drains_queue)
     WAIT_FOR(blocking_tasks);
 }
 
+// Test 14, submit range of tasks in one lock acquisition
+BOOST_AUTO_TEST_CASE(submit_range_of_tasks_complete_successfully)
+{
+    constexpr int32_t num_tasks{50};
+
+    ThreadPool threadPool{POOL_NAME};
+    threadPool.Start(NUM_WORKERS_DEFAULT);
+    std::atomic_int32_t sum{0};
+    const auto square{[&sum](int32_t i) {
+        sum.fetch_add(i, std::memory_order_relaxed);
+        return i * i;
+    }};
+
+    std::array<std::function<int32_t()>, static_cast<size_t>(num_tasks)> array_tasks;
+    std::vector<std::function<int32_t()>> vector_tasks;
+    vector_tasks.reserve(static_cast<size_t>(num_tasks));
+    for (const auto i : std::views::iota(int32_t{1}, num_tasks + 1)) {
+        array_tasks.at(static_cast<size_t>(i - 1)) = [i, square] { return square(i); };
+        vector_tasks.emplace_back([i, square] { return square(i); });
+    }
+
+    auto futures{std::move(*Assert(threadPool.Submit(std::move(array_tasks))))};
+    BOOST_CHECK_EQUAL(futures.size(), static_cast<size_t>(num_tasks));
+    std::ranges::move(*Assert(threadPool.Submit(std::move(vector_tasks))), std::back_inserter(futures));
+    BOOST_CHECK_EQUAL(futures.size(), static_cast<size_t>(num_tasks * 2));
+
+    auto squares_sum{0};
+    for (auto& future : futures) {
+        squares_sum += future.get();
+    }
+
+    // 2x Gauss sum.
+    const auto expected_sum{2 * ((num_tasks * (num_tasks + 1)) / 2)};
+    const auto expected_squares_sum{2 * ((num_tasks * (num_tasks + 1) * ((num_tasks * 2) + 1)) / 6)};
+    BOOST_CHECK_EQUAL(sum, expected_sum);
+    BOOST_CHECK_EQUAL(squares_sum, expected_squares_sum);
+    BOOST_CHECK_EQUAL(threadPool.WorkQueueSize(), 0);
+}
+
 BOOST_AUTO_TEST_SUITE_END()
diff --git a/src/test/transaction_tests.cpp b/src/test/transaction_tests.cpp
index 916f565c04df..19c416c225f3 100644
--- a/src/test/transaction_tests.cpp
+++ b/src/test/transaction_tests.cpp
@@ -392,8 +392,7 @@ BOOST_AUTO_TEST_CASE(basic_transaction_tests)
 BOOST_AUTO_TEST_CASE(test_Get)
 {
     FillableSigningProvider keystore;
-    CCoinsView coinsDummy;
-    CCoinsViewCache coins(&coinsDummy);
+    CCoinsViewCache coins{&CoinsViewEmpty::Get()};
     std::vector<CMutableTransaction> dummyTransactions =
         SetupDummyInputs(keystore, coins, {11*CENT, 50*CENT, 21*CENT, 22*CENT});
 
@@ -412,7 +411,7 @@ BOOST_AUTO_TEST_CASE(test_Get)
     t1.vout[0].nValue = 90*CENT;
     t1.vout[0].scriptPubKey << OP_1;
 
-    BOOST_CHECK(AreInputsStandard(CTransaction(t1), coins));
+    BOOST_CHECK(ValidateInputsStandardness(CTransaction(t1), coins).IsValid());
 }
 
 static void CreateCreditAndSpend(const FillableSigningProvider& keystore, const CScript& outscript, CTransactionRef& output, CMutableTransaction& input, bool success = true)
@@ -749,8 +748,7 @@ BOOST_AUTO_TEST_CASE(test_witness)
 BOOST_AUTO_TEST_CASE(test_IsStandard)
 {
     FillableSigningProvider keystore;
-    CCoinsView coinsDummy;
-    CCoinsViewCache coins(&coinsDummy);
+    CCoinsViewCache coins{&CoinsViewEmpty::Get()};
     std::vector<CMutableTransaction> dummyTransactions =
         SetupDummyInputs(keystore, coins, {11*CENT, 50*CENT, 21*CENT, 22*CENT});
 
@@ -1022,8 +1020,7 @@ BOOST_AUTO_TEST_CASE(test_IsStandard)
 
 BOOST_AUTO_TEST_CASE(max_standard_legacy_sigops)
 {
-    CCoinsView coins_dummy;
-    CCoinsViewCache coins(&coins_dummy);
+    CCoinsViewCache coins{&CoinsViewEmpty::Get()};
     CKey key;
     key.MakeNewKey(true);
 
@@ -1053,7 +1050,7 @@ BOOST_AUTO_TEST_CASE(max_standard_legacy_sigops)
 
     // 2490 sigops is below the limit.
     BOOST_CHECK_EQUAL(GetP2SHSigOpCount(CTransaction(tx_max_sigops), coins), 2490);
-    BOOST_CHECK(::AreInputsStandard(CTransaction(tx_max_sigops), coins));
+    BOOST_CHECK(::ValidateInputsStandardness(CTransaction(tx_max_sigops), coins).IsValid());
 
     // Adding one more input will bump this to 2505, hitting the limit.
     tx_create.vout.emplace_back(424242, max_sigops_p2sh);
@@ -1064,8 +1061,17 @@ BOOST_AUTO_TEST_CASE(max_standard_legacy_sigops)
     tx_max_sigops.vin.emplace_back(prev_txid, p2sh_inputs_count, CScript() << ToByteVector(max_sigops_redeem_script));
     AddCoins(coins, CTransaction(tx_create), 0, false);
     BOOST_CHECK_GT((p2sh_inputs_count + 1) * MAX_P2SH_SIGOPS, MAX_TX_LEGACY_SIGOPS);
-    BOOST_CHECK_EQUAL(GetP2SHSigOpCount(CTransaction(tx_max_sigops), coins), 2505);
-    BOOST_CHECK(!::AreInputsStandard(CTransaction(tx_max_sigops), coins));
+    auto legacy_sigops_count = GetP2SHSigOpCount(CTransaction(tx_max_sigops), coins);
+    BOOST_CHECK_EQUAL(legacy_sigops_count, 2505);
+    std::string reject_reason("bad-txns-nonstandard-inputs");
+    std::string sigop_limit_reject_debug_message("non-witness sigops exceed bip54 limit");
+    {
+        auto validation_state = ValidateInputsStandardness(CTransaction(tx_max_sigops), coins);
+        BOOST_CHECK(validation_state.IsInvalid());
+        BOOST_CHECK_EQUAL(validation_state.GetRejectReason(), reject_reason);
+        BOOST_CHECK_EQUAL(validation_state.GetDebugMessage(), sigop_limit_reject_debug_message);
+    }
+
 
     // Now, check the limit can be reached with regular P2PK outputs too. Use a separate
     // preparation transaction, to demonstrate spending coins from a single tx is irrelevant.
@@ -1083,8 +1089,7 @@ BOOST_AUTO_TEST_CASE(max_standard_legacy_sigops)
     AddCoins(coins, CTransaction(tx_create_p2pk), 0, false);
 
     // The transaction now contains exactly 2500 sigops, the check should pass.
-    BOOST_CHECK_EQUAL(p2sh_inputs_count * MAX_P2SH_SIGOPS + p2pk_inputs_count * 1, MAX_TX_LEGACY_SIGOPS);
-    BOOST_CHECK(::AreInputsStandard(CTransaction(tx_max_sigops), coins));
+    BOOST_CHECK(::ValidateInputsStandardness(CTransaction(tx_max_sigops), coins).IsValid());
 
     // Now, add some Segwit inputs. We add one for each defined Segwit output type. The limit
     // is exclusively on non-witness sigops and therefore those should not be counted.
@@ -1100,7 +1105,7 @@ BOOST_AUTO_TEST_CASE(max_standard_legacy_sigops)
 
     // The transaction now still contains exactly 2500 sigops, the check should pass.
     AddCoins(coins, CTransaction(tx_create_segwit), 0, false);
-    BOOST_REQUIRE(::AreInputsStandard(CTransaction(tx_max_sigops), coins));
+    BOOST_REQUIRE(::ValidateInputsStandardness(CTransaction(tx_max_sigops), coins).IsValid());
 
     // Add one more P2PK input. We'll reach the limit.
     tx_create_p2pk.vout.emplace_back(212121, p2pk_script);
@@ -1111,15 +1116,20 @@ BOOST_AUTO_TEST_CASE(max_standard_legacy_sigops)
         tx_max_sigops.vin.emplace_back(prev_txid, i);
     }
     AddCoins(coins, CTransaction(tx_create_p2pk), 0, false);
-    BOOST_CHECK_GT(p2sh_inputs_count * MAX_P2SH_SIGOPS + p2pk_inputs_count * 1, MAX_TX_LEGACY_SIGOPS);
-    BOOST_CHECK(!::AreInputsStandard(CTransaction(tx_max_sigops), coins));
+    auto legacy_sigop_count_p2pk = p2sh_inputs_count * MAX_P2SH_SIGOPS + p2pk_inputs_count * 1;
+    BOOST_CHECK_GT(legacy_sigop_count_p2pk, MAX_TX_LEGACY_SIGOPS);
+    {
+        auto validation_state = ValidateInputsStandardness(CTransaction(tx_max_sigops), coins);
+        BOOST_CHECK(validation_state.IsInvalid());
+        BOOST_CHECK_EQUAL(validation_state.GetRejectReason(), reject_reason);
+        BOOST_CHECK_EQUAL(validation_state.GetDebugMessage(), sigop_limit_reject_debug_message);
+    }
 }
 
 BOOST_AUTO_TEST_CASE(checktxinputs_invalid_transactions_test)
 {
     auto check_invalid{[](CAmount input_value, CAmount output_value, bool coinbase, int spend_height, TxValidationResult expected_result, std::string_view expected_reason) {
-        CCoinsView coins_dummy;
-        CCoinsViewCache inputs(&coins_dummy);
+        CCoinsViewCache inputs{&CoinsViewEmpty::Get()};
 
         const COutPoint prevout{Txid::FromUint256(uint256::ONE), 0};
         inputs.AddCoin(prevout, Coin{{input_value, CScript() << OP_TRUE}, /*nHeightIn=*/1, coinbase}, /*possible_overwrite=*/false);
@@ -1167,8 +1177,7 @@ BOOST_AUTO_TEST_CASE(getvalueout_out_of_range_throws)
 /** Sanity check the return value of SpendsNonAnchorWitnessProg for various output types. */
 BOOST_AUTO_TEST_CASE(spends_witness_prog)
 {
-    CCoinsView coins_dummy;
-    CCoinsViewCache coins(&coins_dummy);
+    CCoinsViewCache coins{&CoinsViewEmpty::Get()};
     CKey key;
     key.MakeNewKey(true);
     const CPubKey pubkey{key.GetPubKey()};
diff --git a/src/test/txdownload_tests.cpp b/src/test/txdownload_tests.cpp
index d7ddef905b0e..296daf5fcfd9 100644
--- a/src/test/txdownload_tests.cpp
+++ b/src/test/txdownload_tests.cpp
@@ -17,7 +17,7 @@
 
 #include <boost/test/unit_test.hpp>
 
-BOOST_FIXTURE_TEST_SUITE(txdownload_tests, TestingSetup)
+BOOST_AUTO_TEST_SUITE(txdownload_tests)
 
 struct Behaviors {
     bool m_txid_in_rejects;
diff --git a/src/test/util/CMakeLists.txt b/src/test/util/CMakeLists.txt
index 32396c41c35b..d6864a2720eb 100644
--- a/src/test/util/CMakeLists.txt
+++ b/src/test/util/CMakeLists.txt
@@ -13,7 +13,6 @@ add_library(test_util STATIC EXCLUDE_FROM_ALL
   random.cpp
   script.cpp
   setup_common.cpp
-  str.cpp
   time.cpp
   transaction_utils.cpp
   txmempool.cpp
diff --git a/src/test/util/common.h b/src/test/util/common.h
index 591f651fbaf4..2fa4cb3cfe7e 100644
--- a/src/test/util/common.h
+++ b/src/test/util/common.h
@@ -5,8 +5,9 @@
 #ifndef BITCOIN_TEST_UTIL_COMMON_H
 #define BITCOIN_TEST_UTIL_COMMON_H
 
-#include <ostream>
+#include <chrono>
 #include <optional>
+#include <ostream>
 #include <string>
 
 /**
@@ -27,6 +28,12 @@ class HasReason
 
 // Make types usable in BOOST_CHECK_* @{
 namespace std {
+template <typename Clock, typename Duration>
+inline std::ostream& operator<<(std::ostream& os, const std::chrono::time_point<Clock, Duration>& tp)
+{
+    return os << tp.time_since_epoch().count();
+}
+
 template <typename T> requires std::is_enum_v<T>
 inline std::ostream& operator<<(std::ostream& os, const T& e)
 {
diff --git a/src/test/util/net.cpp b/src/test/util/net.cpp
index 73e5a58d5d9a..15903ac9fd06 100644
--- a/src/test/util/net.cpp
+++ b/src/test/util/net.cpp
@@ -346,11 +346,16 @@ void DynSock::Pipe::WaitForDataOrEof(UniqueLock<Mutex>& lock)
     });
 }
 
-DynSock::DynSock(std::shared_ptr<Pipes> pipes, std::shared_ptr<Queue> accept_sockets)
+DynSock::DynSock(std::shared_ptr<Pipes> pipes, Queue* accept_sockets)
     : m_pipes{pipes}, m_accept_sockets{accept_sockets}
 {
 }
 
+DynSock::DynSock(std::shared_ptr<Pipes> pipes)
+    : m_pipes{pipes}, m_accept_sockets{}
+{
+}
+
 DynSock::~DynSock()
 {
     m_pipes->send.Eof();
@@ -369,6 +374,7 @@ ssize_t DynSock::Send(const void* buf, size_t len, int) const
 
 std::unique_ptr<Sock> DynSock::Accept(sockaddr* addr, socklen_t* addr_len) const
 {
+    assert(m_accept_sockets && "Accept() called on non-listening DynSock");
     ZeroSock::Accept(addr, addr_len);
     return m_accept_sockets->Pop().value_or(nullptr);
 }
@@ -403,7 +409,7 @@ bool DynSock::WaitMany(std::chrono::milliseconds timeout, EventsPerSock& events_
             if ((events.requested & Sock::RECV) != 0) {
                 auto dyn_sock = reinterpret_cast<const DynSock*>(sock.get());
                 uint8_t b;
-                if (dyn_sock->m_pipes->recv.GetBytes(&b, 1, MSG_PEEK) == 1 || !dyn_sock->m_accept_sockets->Empty()) {
+                if (dyn_sock->m_pipes->recv.GetBytes(&b, 1, MSG_PEEK) == 1 || (dyn_sock->m_accept_sockets && !dyn_sock->m_accept_sockets->Empty())) {
                     events.occurred |= Sock::RECV;
                     at_least_one_event_occurred = true;
                 }
diff --git a/src/test/util/net.h b/src/test/util/net.h
index 247eba8ea0fd..8954e631d3d7 100644
--- a/src/test/util/net.h
+++ b/src/test/util/net.h
@@ -5,6 +5,7 @@
 #ifndef BITCOIN_TEST_UTIL_NET_H
 #define BITCOIN_TEST_UTIL_NET_H
 
+#include <attributes.h>
 #include <compat/compat.h>
 #include <netmessagemaker.h>
 #include <net.h>
@@ -336,7 +337,15 @@ class DynSock : public ZeroSock
      * @param[in] pipes Send/recv pipes used by the Send() and Recv() methods.
      * @param[in] accept_sockets Sockets to return by the Accept() method.
      */
-    explicit DynSock(std::shared_ptr<Pipes> pipes, std::shared_ptr<Queue> accept_sockets);
+    explicit DynSock(std::shared_ptr<Pipes> pipes, Queue* accept_sockets LIFETIMEBOUND);
+
+    /**
+     * Create a new mocked sock that represents a connected socket. It has pipes
+     * for data transport but there is no queue because connected sockets do
+     * not introduce new connected sockets.
+     * @param[in] pipes Send/recv pipes used by the Send() and Recv() methods.
+     */
+    explicit DynSock(std::shared_ptr<Pipes> pipes);
 
     ~DynSock();
 
@@ -356,7 +365,7 @@ class DynSock : public ZeroSock
     DynSock& operator=(Sock&&) override;
 
     std::shared_ptr<Pipes> m_pipes;
-    std::shared_ptr<Queue> m_accept_sockets;
+    Queue* const m_accept_sockets;
 };
 
 template <typename... Args>
diff --git a/src/test/util/setup_common.cpp b/src/test/util/setup_common.cpp
index 6fdc9e188299..5c50553e9f4e 100644
--- a/src/test/util/setup_common.cpp
+++ b/src/test/util/setup_common.cpp
@@ -200,7 +200,6 @@ BasicTestingSetup::BasicTestingSetup(const ChainType chainType, TestOpts opts)
     gArgs.ForceSetArg("-datadir", fs::PathToString(m_path_root));
 
     SelectParams(chainType);
-    if (G_TEST_LOG_FUN) LogInstance().PushBackCallback(G_TEST_LOG_FUN);
     InitLogging(*m_node.args);
     AppInitParameterInteraction(*m_node.args);
     LogInstance().StartLogging();
@@ -466,8 +465,7 @@ std::pair<CMutableTransaction, CAmount> TestChain100Setup::CreateValidTransactio
         keystore.AddKey(input_signing_key);
     }
     // - Populate a CoinsViewCache with the unspent output
-    CCoinsView coins_view;
-    CCoinsViewCache coins_cache(&coins_view);
+    CCoinsViewCache coins_cache{&CoinsViewEmpty::Get()};
     for (const auto& input_transaction : input_transactions) {
         AddCoins(coins_cache, *input_transaction.get(), input_height);
     }
diff --git a/src/test/util/setup_common.h b/src/test/util/setup_common.h
index c02a4fd33153..8b1b0632185c 100644
--- a/src/test/util/setup_common.h
+++ b/src/test/util/setup_common.h
@@ -35,9 +35,6 @@ class FastRandomContext;
 class uint160;
 class uint256;
 
-/** This is connected to the logger. Can be used to redirect logs to any other log */
-extern const std::function<void(const std::string&)> G_TEST_LOG_FUN;
-
 /** Retrieve the command line arguments. */
 extern const std::function<std::vector<const char*>()> G_TEST_COMMAND_LINE_ARGUMENTS;
 
diff --git a/src/test/util/str.cpp b/src/test/util/str.cpp
deleted file mode 100644
index 32a6825d7438..000000000000
--- a/src/test/util/str.cpp
+++ /dev/null
@@ -1,21 +0,0 @@
-// Copyright (c) 2019-present The Bitcoin Core developers
-// Distributed under the MIT software license, see the accompanying
-// file COPYING or http://www.opensource.org/licenses/mit-license.php.
-
-#include <test/util/str.h>
-
-#include <cstdint>
-#include <string>
-
-bool CaseInsensitiveEqual(const std::string& s1, const std::string& s2)
-{
-    if (s1.size() != s2.size()) return false;
-    for (size_t i = 0; i < s1.size(); ++i) {
-        char c1 = s1[i];
-        if (c1 >= 'A' && c1 <= 'Z') c1 -= ('A' - 'a');
-        char c2 = s2[i];
-        if (c2 >= 'A' && c2 <= 'Z') c2 -= ('A' - 'a');
-        if (c1 != c2) return false;
-    }
-    return true;
-}
diff --git a/src/test/util/str.h b/src/test/util/str.h
index 39e2bafc6520..c9b9d60d2d88 100644
--- a/src/test/util/str.h
+++ b/src/test/util/str.h
@@ -7,8 +7,6 @@
 
 #include <string>
 
-bool CaseInsensitiveEqual(const std::string& s1, const std::string& s2);
-
 /**
  * Increment a string. Useful to enumerate all fixed length strings with
  * characters in [min_char, max_char].
diff --git a/src/test/util/time.h b/src/test/util/time.h
index bcb97eb4e14f..8cd9a1dafcb9 100644
--- a/src/test/util/time.h
+++ b/src/test/util/time.h
@@ -34,4 +34,32 @@ class SteadyClockContext
     }
 };
 
+/// Helper to initialize the global NodeClock, let a duration elapse,
+/// and reset it after use in a test.
+class NodeClockContext
+{
+    NodeSeconds m_t{std::chrono::seconds::max()};
+
+public:
+    /// Initialize with the given time.
+    explicit NodeClockContext(NodeSeconds init_time) { set(init_time); }
+    explicit NodeClockContext(std::chrono::seconds init_time) { set(init_time); }
+    /// Initialize with current time, using the next tick to avoid going back by rounding to seconds.
+    explicit NodeClockContext() { set(++Now<NodeSeconds>().time_since_epoch()); }
+
+    /// Unset mocktime.
+    ~NodeClockContext() { set(0s); }
+
+    NodeClockContext(const NodeClockContext&) = delete;
+    NodeClockContext& operator=(const NodeClockContext&) = delete;
+
+    /// Set mocktime.
+    void set(NodeSeconds t) { SetMockTime(m_t = t); }
+    void set(std::chrono::seconds t) { set(NodeSeconds{t}); }
+
+    /// Change mocktime by the given duration delta.
+    void operator+=(std::chrono::seconds d) { set(m_t += d); }
+    void operator-=(std::chrono::seconds d) { set(m_t -= d); }
+};
+
 #endif // BITCOIN_TEST_UTIL_TIME_H
diff --git a/src/test/util_string_tests.cpp b/src/test/util_string_tests.cpp
index 775769508547..3835904d1170 100644
--- a/src/test/util_string_tests.cpp
+++ b/src/test/util_string_tests.cpp
@@ -4,7 +4,6 @@
 
 #include <util/strencodings.h>
 #include <util/string.h>
-#include <vector>
 
 #include <boost/test/unit_test.hpp>
 #include <test/util/common.h>
@@ -43,12 +42,6 @@ void FailFmtWithError(const char* wrong_fmt, std::string_view error)
     BOOST_CHECK_EXCEPTION(CheckNumFormatSpecifiers<WrongNumArgs>(wrong_fmt), const char*, HasReason{error});
 }
 
-std::vector<std::byte> StringToBuffer(const std::string& str)
-{
-    auto span = std::as_bytes(std::span(str));
-    return {span.begin(), span.end()};
-}
-
 BOOST_AUTO_TEST_CASE(ConstevalFormatString_NumSpec)
 {
     PassFmt<0>("");
@@ -155,49 +148,42 @@ BOOST_AUTO_TEST_CASE(ConstevalFormatString_NumSpec)
         HasReason{"tinyformat: Too many conversion specifiers in format string"});
 }
 
-BOOST_AUTO_TEST_CASE(ascii_case_insensitive_key_equal_test)
+BOOST_AUTO_TEST_CASE(case_insensitive_equal_test)
 {
-    AsciiCaseInsensitiveKeyEqual cmp;
-    BOOST_CHECK(!cmp("A", "B"));
-    BOOST_CHECK(!cmp("A", "b"));
-    BOOST_CHECK(!cmp("a", "B"));
-    BOOST_CHECK(!cmp("B", "A"));
-    BOOST_CHECK(!cmp("B", "a"));
-    BOOST_CHECK(!cmp("b", "A"));
-    BOOST_CHECK(!cmp("A", "AA"));
-    BOOST_CHECK(cmp("A-A", "a-a"));
-    BOOST_CHECK(cmp("A", "A"));
-    BOOST_CHECK(cmp("A", "a"));
-    BOOST_CHECK(cmp("a", "a"));
-    BOOST_CHECK(cmp("B", "b"));
-    BOOST_CHECK(cmp("ab", "aB"));
-    BOOST_CHECK(cmp("Ab", "aB"));
-    BOOST_CHECK(cmp("AB", "ab"));
+    BOOST_CHECK(!CaseInsensitiveEqual("A", "B"));
+    BOOST_CHECK(!CaseInsensitiveEqual("A", "b"));
+    BOOST_CHECK(!CaseInsensitiveEqual("a", "B"));
+    BOOST_CHECK(!CaseInsensitiveEqual("B", "A"));
+    BOOST_CHECK(!CaseInsensitiveEqual("B", "a"));
+    BOOST_CHECK(!CaseInsensitiveEqual("b", "A"));
+    BOOST_CHECK(!CaseInsensitiveEqual("A", "AA"));
+    BOOST_CHECK(CaseInsensitiveEqual("A-A", "a-a"));
+    BOOST_CHECK(CaseInsensitiveEqual("A", "A"));
+    BOOST_CHECK(CaseInsensitiveEqual("A", "a"));
+    BOOST_CHECK(CaseInsensitiveEqual("a", "a"));
+    BOOST_CHECK(CaseInsensitiveEqual("B", "b"));
+    BOOST_CHECK(CaseInsensitiveEqual("ab", "aB"));
+    BOOST_CHECK(CaseInsensitiveEqual("Ab", "aB"));
+    BOOST_CHECK(CaseInsensitiveEqual("AB", "ab"));
 
     // Use a character with value > 127
     // to ensure we don't trigger implicit-integer-sign-change
-    BOOST_CHECK(!cmp("a", "\xe4"));
-}
-
-BOOST_AUTO_TEST_CASE(ascii_case_insensitive_hash_test)
-{
-    AsciiCaseInsensitiveHash hsh;
-    BOOST_CHECK_NE(hsh("A"), hsh("B"));
-    BOOST_CHECK_NE(hsh("AA"), hsh("A"));
-    BOOST_CHECK_EQUAL(hsh("A"), hsh("a"));
-    BOOST_CHECK_EQUAL(hsh("Ab"), hsh("aB"));
-    BOOST_CHECK_EQUAL(hsh("A\xfe"), hsh("a\xfe"));
+    BOOST_CHECK(!CaseInsensitiveEqual("a", "\xe4"));
 }
 
 BOOST_AUTO_TEST_CASE(line_reader_test)
 {
     {
         // Check three lines terminated by \n and \r\n, trimming whitespace
-        const std::vector<std::byte> input{StringToBuffer("once upon a time\n there was a dog \r\nwho liked food\n")};
+        std::string_view input = "once upon a time\n there was a dog \r\nwho liked food\n";
         LineReader reader(input, /*max_line_length=*/128);
+        BOOST_CHECK_EQUAL(reader.Consumed(), 0);
+        BOOST_CHECK_EQUAL(reader.Remaining(), 51);
         std::optional<std::string> line1{reader.ReadLine()};
+        BOOST_CHECK_EQUAL(reader.Consumed(), 17);
         BOOST_CHECK_EQUAL(reader.Remaining(), 34);
         std::optional<std::string> line2{reader.ReadLine()};
+        BOOST_CHECK_EQUAL(reader.Consumed(), 36);
         BOOST_CHECK_EQUAL(reader.Remaining(), 15);
         std::optional<std::string> line3{reader.ReadLine()};
         std::optional<std::string> line4{reader.ReadLine()};
@@ -208,11 +194,13 @@ BOOST_AUTO_TEST_CASE(line_reader_test)
         BOOST_CHECK_EQUAL(line1.value(), "once upon a time");
         BOOST_CHECK_EQUAL(line2.value(), "there was a dog");
         BOOST_CHECK_EQUAL(line3.value(), "who liked food");
+        BOOST_CHECK_EQUAL(reader.Consumed(), 51);
+        BOOST_CHECK_EQUAL(reader.Remaining(), 0);
     }
     {
         // Do not exceed max_line_length + 1 while searching for \n
         // Test with 22-character line + \n + 23-character line + \n
-        const std::vector<std::byte> input{StringToBuffer("once upon a time there\nwas a dog who liked tea\n")};
+        std::string_view input = "once upon a time there\nwas a dog who liked tea\n";
 
         LineReader reader1(input, /*max_line_length=*/22);
         // First line is exactly the length of max_line_length
@@ -230,26 +218,26 @@ BOOST_AUTO_TEST_CASE(line_reader_test)
     }
     {
         // Empty lines are empty
-        const std::vector<std::byte> input{StringToBuffer("\n")};
+        std::string_view input = "\n";
         LineReader reader(input, /*max_line_length=*/1024);
         BOOST_CHECK_EQUAL(reader.ReadLine(), "");
         BOOST_CHECK(!reader.ReadLine());
     }
     {
         // Empty buffers are null
-        const std::vector<std::byte> input{StringToBuffer("")};
+        std::string_view input;
         LineReader reader(input, /*max_line_length=*/1024);
         BOOST_CHECK(!reader.ReadLine());
     }
     {
         // Even one character is too long, if it's not \n
-        const std::vector<std::byte> input{StringToBuffer("ab\n")};
+        std::string_view input = "ab\n";
         LineReader reader(input, /*max_line_length=*/1);
         // First line is +1 character too long
         BOOST_CHECK_EXCEPTION(reader.ReadLine(), std::runtime_error, HasReason{"max_line_length exceeded by LineReader"});
     }
     {
-        const std::vector<std::byte> input{StringToBuffer("a\nb\n")};
+        std::string_view input = "a\nb\n";
         LineReader reader(input, /*max_line_length=*/1);
         BOOST_CHECK_EQUAL(reader.ReadLine(), "a");
         BOOST_CHECK_EQUAL(reader.ReadLine(), "b");
@@ -257,7 +245,7 @@ BOOST_AUTO_TEST_CASE(line_reader_test)
     }
     {
         // If ReadLine fails, the iterator is reset and we can ReadLength instead
-        const std::vector<std::byte> input{StringToBuffer("a\nbaboon\n")};
+        std::string_view input = "a\nbaboon\n";
         LineReader reader(input, /*max_line_length=*/1);
         BOOST_CHECK_EQUAL(reader.ReadLine(), "a");
         // "baboon" is too long
@@ -273,7 +261,7 @@ BOOST_AUTO_TEST_CASE(line_reader_test)
     }
     {
         // The end of the buffer (EOB) does not count as end of line \n
-        const std::vector<std::byte> input{StringToBuffer("once upon a time there")};
+        std::string_view input = "once upon a time there";
 
         LineReader reader(input, /*max_line_length=*/22);
         // First line is exactly the length of max_line_length, but that doesn't matter because \n is missing
@@ -285,7 +273,7 @@ BOOST_AUTO_TEST_CASE(line_reader_test)
     }
     {
         // Read specific number of bytes regardless of max_line_length or \n unless buffer is too short
-        const std::vector<std::byte> input{StringToBuffer("once upon a time\n there was a dog \r\nwho liked food")};
+        std::string_view input = "once upon a time\n there was a dog \r\nwho liked food";
         LineReader reader(input, /*max_line_length=*/1);
         BOOST_CHECK_EQUAL(reader.ReadLength(0), "");
         BOOST_CHECK_EQUAL(reader.ReadLength(3), "onc");
diff --git a/src/test/util_tests.cpp b/src/test/util_tests.cpp
index d8d70d53a475..dc6a5cf32503 100644
--- a/src/test/util_tests.cpp
+++ b/src/test/util_tests.cpp
@@ -12,6 +12,7 @@
 #include <test/util/common.h>
 #include <test/util/random.h>
 #include <test/util/setup_common.h>
+#include <test/util/time.h>
 #include <uint256.h>
 #include <util/bitdeque.h>
 #include <util/byte_units.h>
@@ -585,7 +586,7 @@ BOOST_AUTO_TEST_CASE(strprintf_numbers)
 
 BOOST_AUTO_TEST_CASE(util_mocktime)
 {
-    SetMockTime(111s);
+    NodeClockContext clock_ctx{111s};
     // Check that mock time does not change after a sleep
     for (const auto& num_sleep : {0ms, 1ms}) {
         UninterruptibleSleep(num_sleep);
@@ -598,7 +599,6 @@ BOOST_AUTO_TEST_CASE(util_mocktime)
         BOOST_CHECK_EQUAL(111000, TicksSinceEpoch<std::chrono::milliseconds>(NodeClock::now()));
         BOOST_CHECK_EQUAL(111000000, GetTime<std::chrono::microseconds>().count());
     }
-    SetMockTime(0s);
 }
 
 BOOST_AUTO_TEST_CASE(util_ticksseconds)
@@ -1138,7 +1138,8 @@ BOOST_AUTO_TEST_CASE(test_LockDirectory)
 #endif
     // Clean up
     ReleaseDirectoryLocks();
-    fs::remove_all(dirname);
+    fs::remove(dirname / lockname);
+    fs::remove(dirname);
 }
 
 BOOST_AUTO_TEST_CASE(test_ToLower)
@@ -1834,4 +1835,41 @@ BOOST_AUTO_TEST_CASE(mib_string_literal_test)
     BOOST_CHECK_EXCEPTION(operator""_MiB(static_cast<unsigned long long>(max_mib) + 1), std::overflow_error, HasReason("MiB value too large for size_t byte conversion"));
 }
 
+BOOST_AUTO_TEST_CASE(ceil_div_test)
+{
+    // Type combinations used by current CeilDiv callsites.
+    BOOST_CHECK((std::is_same_v<decltype(CeilDiv(uint32_t{0}, 8u)), uint32_t>));
+    BOOST_CHECK((std::is_same_v<decltype(CeilDiv(size_t{0}, 8u)), size_t>));
+    BOOST_CHECK((std::is_same_v<decltype(CeilDiv(unsigned{0}, size_t{1})), size_t>));
+
+    // `common/bloom.cpp` and `cuckoocache.h` patterns.
+    BOOST_CHECK_EQUAL(CeilDiv(uint32_t{3}, 2u), uint32_t{2});
+    BOOST_CHECK_EQUAL(CeilDiv(uint32_t{65}, 64u), uint32_t{2});
+    BOOST_CHECK_EQUAL(CeilDiv(uint32_t{9}, 8u), uint32_t{2});
+
+    // `key_io.cpp`, `rest.cpp`, `merkleblock.cpp`, `strencodings.cpp` patterns.
+    BOOST_CHECK_EQUAL(CeilDiv(size_t{9}, 8u), size_t{2});
+    BOOST_CHECK_EQUAL(CeilDiv(size_t{10}, 3u), size_t{4});
+    BOOST_CHECK_EQUAL(CeilDiv(size_t{11}, 5u), size_t{3});
+    BOOST_CHECK_EQUAL(CeilDiv(size_t{41} * 8, 5u), size_t{66});
+
+    // `flatfile.cpp` mixed unsigned/size_t pattern.
+    BOOST_CHECK_EQUAL(CeilDiv(unsigned{10}, size_t{4}), size_t{3});
+
+    // `util/feefrac.h` fast-path rounding-up pattern.
+    constexpr int64_t fee{12345};
+    constexpr int32_t at_size{67};
+    constexpr int32_t size{10};
+    BOOST_CHECK_EQUAL(CeilDiv(uint64_t(fee) * at_size, uint32_t(size)),
+                      (uint64_t(fee) * at_size + uint32_t(size) - 1) / uint32_t(size));
+
+    // `bitset.h` template parameter pattern.
+    constexpr unsigned bits{129};
+    constexpr size_t digits{std::numeric_limits<size_t>::digits};
+    BOOST_CHECK_EQUAL(CeilDiv(bits, digits), (bits + digits - 1) / digits);
+
+    // `serialize.h` varint scratch-buffer pattern.
+    BOOST_CHECK_EQUAL(CeilDiv(sizeof(uint64_t) * 8, 7u), (sizeof(uint64_t) * 8 + 6) / 7);
+}
+
 BOOST_AUTO_TEST_SUITE_END()
diff --git a/src/test/validation_chainstatemanager_tests.cpp b/src/test/validation_chainstatemanager_tests.cpp
index 2847116976f0..67c90a007318 100644
--- a/src/test/validation_chainstatemanager_tests.cpp
+++ b/src/test/validation_chainstatemanager_tests.cpp
@@ -551,8 +551,8 @@ BOOST_FIXTURE_TEST_CASE(chainstatemanager_loadblockindex, TestChain100Setup)
     // check contents below.
     reload_all_block_indexes();
 
-    // The fully validated chain should only have the current validated tip and
-    // the assumed valid base as candidates, blocks 90 and 110. Specifically:
+    // The fully validated chain should only have the current validated tip
+    // as a candidate (block 90). Specifically:
     //
     // - It does not have blocks 0-89 because they contain less work than the
     //   chain tip.
@@ -560,20 +560,13 @@ BOOST_FIXTURE_TEST_CASE(chainstatemanager_loadblockindex, TestChain100Setup)
     // - It has block 90 because it has data and equal work to the chain tip,
     //   (since it is the chain tip).
     //
-    // - It does not have blocks 91-109 because they do not contain data.
-    //
-    // - It has block 110 even though it does not have data, because
-    //   LoadBlockIndex has a special case to always add the snapshot block as a
-    //   candidate. The special case is only actually intended to apply to the
-    //   snapshot chainstate cs2, not the background chainstate cs1, but it is
-    //   written broadly and applies to both.
+    // - It does not have blocks 91-110 because they do not contain data.
     //
     // - It does not have any blocks after height 110 because cs1 is a background
-    //   chainstate, and only blocks where are ancestors of the snapshot block
+    //   chainstate, and only blocks that are ancestors of the snapshot block
     //   are added as candidates for the background chainstate.
-    BOOST_CHECK_EQUAL(cs1.setBlockIndexCandidates.size(), 2);
+    BOOST_CHECK_EQUAL(cs1.setBlockIndexCandidates.size(), 1);
     BOOST_CHECK_EQUAL(cs1.setBlockIndexCandidates.count(validated_tip), 1);
-    BOOST_CHECK_EQUAL(cs1.setBlockIndexCandidates.count(assumed_base), 1);
 
     // The assumed-valid tolerant chain has the assumed valid base as a
     // candidate, but otherwise has none of the assumed-valid (which do not
@@ -625,6 +618,94 @@ BOOST_FIXTURE_TEST_CASE(loadblockindex_invalid_descendants, TestChain100Setup)
     BOOST_CHECK(child->nStatus & BLOCK_FAILED_VALID);
 }
 
+//! Verify that ReconsiderBlock clears failure flags for the target block, its ancestors, and descendants,
+//! but not for sibling forks that diverge from a shared ancestor.
+BOOST_FIXTURE_TEST_CASE(invalidate_block_and_reconsider_fork, TestChain100Setup)
+{
+    ChainstateManager& chainman = *Assert(m_node.chainman);
+    Chainstate& chainstate = chainman.ActiveChainstate();
+
+    // we have a chain of 100 blocks: genesis(0) <- ... <- block98 <- block99 <- block100
+    CBlockIndex* block98;
+    CBlockIndex* block99;
+    CBlockIndex* block100;
+    {
+        LOCK(chainman.GetMutex());
+        block98 = chainman.ActiveChain()[98];
+        block99 = chainman.ActiveChain()[99];
+        block100 = chainman.ActiveChain()[100];
+    }
+
+    // create the following block constellation:
+    // genesis(0) <- ... <- block98 <- block99  <- block100
+    //                              <- block99' <- block100'
+    // by temporarily invalidating block99. the chain tip now falls to block98,
+    // mine 2 new blocks on top of block 98 (block99' and block100') and then restore block99 and block 100.
+    BlockValidationState state;
+    BOOST_REQUIRE(chainstate.InvalidateBlock(state, block99));
+    BOOST_REQUIRE(WITH_LOCK(cs_main, return chainman.ActiveChain().Tip()) == block98);
+    CScript coinbase_script = CScript() << ToByteVector(coinbaseKey.GetPubKey()) << OP_CHECKSIG;
+    for (int i = 0; i < 2; ++i) {
+        CreateAndProcessBlock({}, coinbase_script);
+    }
+    const CBlockIndex* fork_block99;
+    const CBlockIndex* fork_block100;
+    {
+        LOCK(chainman.GetMutex());
+        fork_block99 = chainman.ActiveChain()[99];
+        BOOST_REQUIRE(fork_block99->pprev == block98);
+        fork_block100 = chainman.ActiveChain()[100];
+        BOOST_REQUIRE(fork_block100->pprev == fork_block99);
+    }
+    // Restore original block99 and block100
+    {
+        LOCK(chainman.GetMutex());
+        chainstate.ResetBlockFailureFlags(block99);
+        chainman.RecalculateBestHeader();
+    }
+    chainstate.ActivateBestChain(state);
+    BOOST_REQUIRE(WITH_LOCK(cs_main, return chainman.ActiveChain().Tip()) == block100);
+
+    {
+        LOCK(chainman.GetMutex());
+        BOOST_CHECK(!(block100->nStatus & BLOCK_FAILED_VALID));
+        BOOST_CHECK(!(block99->nStatus & BLOCK_FAILED_VALID));
+        BOOST_CHECK(!(fork_block100->nStatus & BLOCK_FAILED_VALID));
+        BOOST_CHECK(!(fork_block99->nStatus & BLOCK_FAILED_VALID));
+    }
+
+    // Invalidate block98
+    BOOST_REQUIRE(chainstate.InvalidateBlock(state, block98));
+
+    {
+        LOCK(chainman.GetMutex());
+        // block98 and all descendants of block98 are marked BLOCK_FAILED_VALID
+        BOOST_CHECK(block98->nStatus & BLOCK_FAILED_VALID);
+        BOOST_CHECK(block99->nStatus & BLOCK_FAILED_VALID);
+        BOOST_CHECK(block100->nStatus & BLOCK_FAILED_VALID);
+        BOOST_CHECK(fork_block99->nStatus & BLOCK_FAILED_VALID);
+        BOOST_CHECK(fork_block100->nStatus & BLOCK_FAILED_VALID);
+    }
+
+    // Reconsider block99. ResetBlockFailureFlags clears BLOCK_FAILED_VALID from
+    // block99 and its ancestors (block98) and descendants (block100)
+    // but NOT from block99' and block100' (not a direct ancestor/descendant)
+    {
+        LOCK(chainman.GetMutex());
+        chainstate.ResetBlockFailureFlags(block99);
+        chainman.RecalculateBestHeader();
+    }
+    chainstate.ActivateBestChain(state);
+    {
+        LOCK(chainman.GetMutex());
+        BOOST_CHECK(!(block98->nStatus & BLOCK_FAILED_VALID));
+        BOOST_CHECK(!(block99->nStatus & BLOCK_FAILED_VALID));
+        BOOST_CHECK(!(block100->nStatus & BLOCK_FAILED_VALID));
+        BOOST_CHECK(fork_block99->nStatus & BLOCK_FAILED_VALID);
+        BOOST_CHECK(fork_block100->nStatus & BLOCK_FAILED_VALID);
+    }
+}
+
 //! Ensure that snapshot chainstate can be loaded when found on disk after a
 //! restart, and that new blocks can be connected to both chainstates.
 BOOST_FIXTURE_TEST_CASE(chainstatemanager_snapshot_init, SnapshotTestSetup)
diff --git a/src/test/validation_tests.cpp b/src/test/validation_tests.cpp
index 80f3289704be..b1e204f17413 100644
--- a/src/test/validation_tests.cpp
+++ b/src/test/validation_tests.cpp
@@ -19,7 +19,7 @@
 
 #include <boost/test/unit_test.hpp>
 
-BOOST_FIXTURE_TEST_SUITE(validation_tests, TestingSetup)
+BOOST_FIXTURE_TEST_SUITE(validation_tests, BasicTestingSetup)
 
 static void TestBlockSubsidyHalvings(const Consensus::Params& consensusParams)
 {
diff --git a/src/threadsafety.h b/src/threadsafety.h
index b79d4c764582..35f3b813273f 100644
--- a/src/threadsafety.h
+++ b/src/threadsafety.h
@@ -6,8 +6,6 @@
 #ifndef BITCOIN_THREADSAFETY_H
 #define BITCOIN_THREADSAFETY_H
 
-#include <mutex>
-
 #ifdef __clang__
 // TL;DR Add GUARDED_BY(mutex) to member variables. The others are
 // rarely necessary. Ex: int nFoo GUARDED_BY(cs_foo);
@@ -54,26 +52,4 @@
 #define ASSERT_EXCLUSIVE_LOCK(...)
 #endif // __GNUC__
 
-// StdMutex provides an annotated version of std::mutex for us,
-// and should only be used when sync.h Mutex/LOCK/etc are not usable.
-class LOCKABLE StdMutex : public std::mutex
-{
-public:
-#ifdef __clang__
-    //! For negative capabilities in the Clang Thread Safety Analysis.
-    //! A negative requirement uses the EXCLUSIVE_LOCKS_REQUIRED attribute, in conjunction
-    //! with the ! operator, to indicate that a mutex should not be held.
-    const StdMutex& operator!() const { return *this; }
-#endif // __clang__
-};
-
-// StdLockGuard provides an annotated version of std::lock_guard for us,
-// and should only be used when sync.h Mutex/LOCK/etc are not usable.
-class SCOPED_LOCKABLE StdLockGuard : public std::lock_guard<StdMutex>
-{
-public:
-    explicit StdLockGuard(StdMutex& cs) EXCLUSIVE_LOCK_FUNCTION(cs) : std::lock_guard<StdMutex>(cs) {}
-    ~StdLockGuard() UNLOCK_FUNCTION() = default;
-};
-
 #endif // BITCOIN_THREADSAFETY_H
diff --git a/src/torcontrol.cpp b/src/torcontrol.cpp
index d37fc2dd4a30..17b37f6fdd4c 100644
--- a/src/torcontrol.cpp
+++ b/src/torcontrol.cpp
@@ -26,6 +26,7 @@
 
 #include <algorithm>
 #include <cassert>
+#include <chrono>
 #include <cstdint>
 #include <cstdlib>
 #include <deque>
@@ -37,12 +38,6 @@
 #include <utility>
 #include <vector>
 
-#include <event2/buffer.h>
-#include <event2/bufferevent.h>
-#include <event2/event.h>
-#include <event2/thread.h>
-#include <event2/util.h>
-
 using util::ReplaceAll;
 using util::SplitString;
 using util::ToString;
@@ -50,157 +45,180 @@ using util::ToString;
 /** Default control ip and port */
 const std::string DEFAULT_TOR_CONTROL = "127.0.0.1:" + ToString(DEFAULT_TOR_CONTROL_PORT);
 /** Tor cookie size (from control-spec.txt) */
-static const int TOR_COOKIE_SIZE = 32;
+constexpr int TOR_COOKIE_SIZE = 32;
 /** Size of client/server nonce for SAFECOOKIE */
-static const int TOR_NONCE_SIZE = 32;
-/** Tor control reply code. Ref: https://spec.torproject.org/control-spec/replies.html */
-static const int TOR_REPLY_OK = 250;
-static const int TOR_REPLY_UNRECOGNIZED = 510;
-/** For computing serverHash in SAFECOOKIE */
+constexpr int TOR_NONCE_SIZE = 32;
+/** For computing server_hash in SAFECOOKIE */
 static const std::string TOR_SAFE_SERVERKEY = "Tor safe cookie authentication server-to-controller hash";
 /** For computing clientHash in SAFECOOKIE */
 static const std::string TOR_SAFE_CLIENTKEY = "Tor safe cookie authentication controller-to-server hash";
 /** Exponential backoff configuration - initial timeout in seconds */
-static const float RECONNECT_TIMEOUT_START = 1.0;
+constexpr std::chrono::duration<double> RECONNECT_TIMEOUT_START{1.0};
 /** Exponential backoff configuration - growth factor */
-static const float RECONNECT_TIMEOUT_EXP = 1.5;
+constexpr double RECONNECT_TIMEOUT_EXP = 1.5;
 /** Maximum reconnect timeout in seconds to prevent excessive delays */
-static const float RECONNECT_TIMEOUT_MAX = 600.0;
+constexpr std::chrono::duration<double> RECONNECT_TIMEOUT_MAX{600.0};
 /** Maximum length for lines received on TorControlConnection.
  * tor-control-spec.txt mentions that there is explicitly no limit defined to line length,
  * this is belt-and-suspenders sanity limit to prevent memory exhaustion.
  */
-static const int MAX_LINE_LENGTH = 100000;
+constexpr int MAX_LINE_LENGTH = 100000;
+/** Timeout for socket operations */
+constexpr auto SOCKET_SEND_TIMEOUT = 10s;
 
 /****** Low-level TorControlConnection ********/
 
-TorControlConnection::TorControlConnection(struct event_base* _base)
-    : base(_base)
+TorControlConnection::TorControlConnection(CThreadInterrupt& interrupt)
+    : m_interrupt(interrupt)
 {
 }
 
 TorControlConnection::~TorControlConnection()
 {
-    if (b_conn)
-        bufferevent_free(b_conn);
+    Disconnect();
 }
 
-void TorControlConnection::readcb(struct bufferevent *bev, void *ctx)
+bool TorControlConnection::Connect(const std::string& tor_control_center)
 {
-    TorControlConnection *self = static_cast<TorControlConnection*>(ctx);
-    struct evbuffer *input = bufferevent_get_input(bev);
-    size_t n_read_out = 0;
-    char *line;
-    assert(input);
-    //  If there is not a whole line to read, evbuffer_readln returns nullptr
-    while((line = evbuffer_readln(input, &n_read_out, EVBUFFER_EOL_CRLF)) != nullptr)
-    {
-        std::string s(line, n_read_out);
-        free(line);
-        if (s.size() < 4) // Short line
-            continue;
-        // <status>(-|+| )<data><CRLF>
-        self->message.code = ToIntegral<int>(s.substr(0, 3)).value_or(0);
-        self->message.lines.push_back(s.substr(4));
-        char ch = s[3]; // '-','+' or ' '
-        if (ch == ' ') {
-            // Final line, dispatch reply and clean up
-            if (self->message.code >= 600) {
-                // (currently unused)
-                // Dispatch async notifications to async handler
-                // Synchronous and asynchronous messages are never interleaved
-            } else {
-                if (!self->reply_handlers.empty()) {
-                    // Invoke reply handler with message
-                    self->reply_handlers.front()(*self, self->message);
-                    self->reply_handlers.pop_front();
-                } else {
-                    LogDebug(BCLog::TOR, "Received unexpected sync reply %i\n", self->message.code);
-                }
-            }
-            self->message.Clear();
-        }
+    if (m_sock) {
+        Disconnect();
     }
-    //  Check for size of buffer - protect against memory exhaustion with very long lines
-    //  Do this after evbuffer_readln to make sure all full lines have been
-    //  removed from the buffer. Everything left is an incomplete line.
-    if (evbuffer_get_length(input) > MAX_LINE_LENGTH) {
-        LogWarning("tor: Disconnecting because MAX_LINE_LENGTH exceeded");
-        self->Disconnect();
+
+    std::optional<CService> control_service = Lookup(tor_control_center, DEFAULT_TOR_CONTROL_PORT, fNameLookup);
+    if (!control_service.has_value()) {
+        LogWarning("tor: Failed to look up control center %s", tor_control_center);
+        return false;
     }
+
+    m_sock = ConnectDirectly(control_service.value(), /*manual_connection=*/true);
+    if (!m_sock) {
+        LogWarning("tor: Error connecting to address %s", tor_control_center);
+        return false;
+    }
+
+    m_recv_buffer.clear();
+    m_message.Clear();
+    m_reply_handlers.clear();
+
+    LogDebug(BCLog::TOR, "Successfully connected to Tor control port");
+    return true;
 }
 
-void TorControlConnection::eventcb(struct bufferevent *bev, short what, void *ctx)
+void TorControlConnection::Disconnect()
 {
-    TorControlConnection *self = static_cast<TorControlConnection*>(ctx);
-    if (what & BEV_EVENT_CONNECTED) {
-        LogDebug(BCLog::TOR, "Successfully connected!\n");
-        self->connected(*self);
-    } else if (what & (BEV_EVENT_EOF|BEV_EVENT_ERROR)) {
-        if (what & BEV_EVENT_ERROR) {
-            LogDebug(BCLog::TOR, "Error connecting to Tor control socket\n");
-        } else {
-            LogDebug(BCLog::TOR, "End of stream\n");
-        }
-        self->Disconnect();
-        self->disconnected(*self);
-    }
+    m_sock.reset();
+    m_recv_buffer.clear();
+    m_message.Clear();
+    m_reply_handlers.clear();
 }
 
-bool TorControlConnection::Connect(const std::string& tor_control_center, const ConnectionCB& _connected, const ConnectionCB& _disconnected)
+bool TorControlConnection::IsConnected() const
 {
-    if (b_conn) {
-        Disconnect();
+    if (!m_sock) return false;
+    std::string errmsg;
+    const bool connected{m_sock->IsConnected(errmsg)};
+    if (!connected && !errmsg.empty()) {
+        LogDebug(BCLog::TOR, "Connection check failed: %s", errmsg);
     }
+    return connected;
+}
 
-    const std::optional<CService> control_service{Lookup(tor_control_center, DEFAULT_TOR_CONTROL_PORT, fNameLookup)};
-    if (!control_service.has_value()) {
-        LogWarning("tor: Failed to look up control center %s", tor_control_center);
+bool TorControlConnection::WaitForData(std::chrono::milliseconds timeout)
+{
+    if (!m_sock) return false;
+
+    Sock::Event event{0};
+    if (!m_sock->Wait(timeout, Sock::RECV, &event)) {
         return false;
     }
+    if (event & Sock::ERR) {
+        LogDebug(BCLog::TOR, "Socket error detected");
+        Disconnect();
+        return false;
+    }
+
+    return (event & Sock::RECV);
+}
+
+bool TorControlConnection::ReceiveAndProcess()
+{
+    if (!m_sock) return false;
+
+    std::byte buf[4096];
+    ssize_t nread = m_sock->Recv(buf, sizeof(buf), MSG_DONTWAIT);
 
-    struct sockaddr_storage control_address;
-    socklen_t control_address_len = sizeof(control_address);
-    if (!control_service.value().GetSockAddr(reinterpret_cast<struct sockaddr*>(&control_address), &control_address_len)) {
-        LogWarning("tor: Error parsing socket address %s", tor_control_center);
+    if (nread < 0) {
+        int err = WSAGetLastError();
+        if (err == WSAEWOULDBLOCK || err == WSAEINTR || err == WSAEINPROGRESS) {
+            // No data available currently
+            return true;
+        }
+        LogWarning("tor: Error reading from socket: %s", NetworkErrorString(err));
         return false;
     }
 
-    // Create a new socket, set up callbacks and enable notification bits
-    b_conn = bufferevent_socket_new(base, -1, BEV_OPT_CLOSE_ON_FREE);
-    if (!b_conn) {
+    if (nread == 0) {
+        LogDebug(BCLog::TOR, "End of stream");
         return false;
     }
-    bufferevent_setcb(b_conn, TorControlConnection::readcb, nullptr, TorControlConnection::eventcb, this);
-    bufferevent_enable(b_conn, EV_READ|EV_WRITE);
-    this->connected = _connected;
-    this->disconnected = _disconnected;
 
-    // Finally, connect to tor_control_center
-    if (bufferevent_socket_connect(b_conn, reinterpret_cast<struct sockaddr*>(&control_address), control_address_len) < 0) {
-        LogWarning("tor: Error connecting to address %s", tor_control_center);
+    m_recv_buffer.insert(m_recv_buffer.end(), buf, buf + nread);
+    try {
+        return ProcessBuffer();
+    } catch (const std::runtime_error& e) {
+        LogWarning("tor: Error processing receive buffer: %s", e.what());
         return false;
     }
-    return true;
 }
 
-void TorControlConnection::Disconnect()
+bool TorControlConnection::ProcessBuffer()
 {
-    if (b_conn)
-        bufferevent_free(b_conn);
-    b_conn = nullptr;
+    util::LineReader reader(m_recv_buffer, MAX_LINE_LENGTH);
+    auto start = reader.it;
+
+    while (auto line = reader.ReadLine()) {
+        // Skip short lines
+        if (line->size() < 4) continue;
+
+        // Parse: <code><separator><data>
+        // <status>(-|+| )<data>
+        m_message.code = ToIntegral<int>(line->substr(0, 3)).value_or(0);
+        m_message.lines.push_back(line->substr(4));
+        char separator = (*line)[3]; // '-', '+', or ' '
+
+        if (separator == ' ') {
+            if (m_message.code >= 600) {
+                // Async notifications are currently unused
+                // Synchronous and asynchronous messages are never interleaved
+                LogDebug(BCLog::TOR, "Received async notification %i", m_message.code);
+            } else if (!m_reply_handlers.empty()) {
+                // Invoke reply handler with message
+                m_reply_handlers.front()(*this, m_message);
+                m_reply_handlers.pop_front();
+            } else {
+                LogDebug(BCLog::TOR, "Received unexpected sync reply %i", m_message.code);
+            }
+            m_message.Clear();
+        }
+    }
+
+    m_recv_buffer.erase(m_recv_buffer.begin(), m_recv_buffer.begin() + std::distance(start, reader.it));
+    return true;
 }
 
 bool TorControlConnection::Command(const std::string &cmd, const ReplyHandlerCB& reply_handler)
 {
-    if (!b_conn)
-        return false;
-    struct evbuffer *buf = bufferevent_get_output(b_conn);
-    if (!buf)
+    if (!m_sock) return false;
+
+    std::string command = cmd + "\r\n";
+    try {
+        m_sock->SendComplete(std::span<const char>{command}, SOCKET_SEND_TIMEOUT, m_interrupt);
+    } catch (const std::runtime_error& e) {
+        LogWarning("tor: Error sending command: %s", e.what());
         return false;
-    evbuffer_add(buf, cmd.data(), cmd.size());
-    evbuffer_add(buf, "\r\n", 2);
-    reply_handlers.push_back(reply_handler);
+    }
+
+    m_reply_handlers.push_back(reply_handler);
     return true;
 }
 
@@ -323,38 +341,89 @@ std::map<std::string,std::string> ParseTorReplyMapping(const std::string &s)
     return mapping;
 }
 
-TorController::TorController(struct event_base* _base, const std::string& tor_control_center, const CService& target):
-    base(_base),
-    m_tor_control_center(tor_control_center), conn(base), reconnect(true), reconnect_timeout(RECONNECT_TIMEOUT_START),
-    m_target(target)
+TorController::TorController(const std::string& tor_control_center, const CService& target)
+    : m_tor_control_center(tor_control_center),
+      m_conn(m_interrupt),
+      m_reconnect(true),
+      m_reconnect_timeout(RECONNECT_TIMEOUT_START),
+      m_target(target)
 {
-    reconnect_ev = event_new(base, -1, 0, reconnect_cb, this);
-    if (!reconnect_ev)
-        LogWarning("tor: Failed to create event for reconnection: out of memory?");
-    // Start connection attempts immediately
-    if (!conn.Connect(m_tor_control_center, std::bind_front(&TorController::connected_cb, this),
-         std::bind_front(&TorController::disconnected_cb, this) )) {
-        LogWarning("tor: Initiating connection to Tor control port %s failed", m_tor_control_center);
-    }
     // Read service private key if cached
     std::pair<bool,std::string> pkf = ReadBinaryFile(GetPrivateKeyFile());
     if (pkf.first) {
-        LogDebug(BCLog::TOR, "Reading cached private key from %s\n", fs::PathToString(GetPrivateKeyFile()));
-        private_key = pkf.second;
+        LogDebug(BCLog::TOR, "Reading cached private key from %s", fs::PathToString(GetPrivateKeyFile()));
+        m_private_key = pkf.second;
     }
+    m_thread = std::thread(&util::TraceThread, "torcontrol", [this] { ThreadControl(); });
 }
 
 TorController::~TorController()
 {
-    if (reconnect_ev) {
-        event_free(reconnect_ev);
-        reconnect_ev = nullptr;
+    Interrupt();
+    Join();
+    if (m_service.IsValid()) {
+        RemoveLocal(m_service);
     }
-    if (service.IsValid()) {
-        RemoveLocal(service);
+}
+
+void TorController::Interrupt()
+{
+    m_reconnect = false;
+    m_interrupt();
+}
+
+void TorController::Join()
+{
+    if (m_thread.joinable()) {
+        m_thread.join();
     }
 }
 
+void TorController::ThreadControl()
+{
+    LogDebug(BCLog::TOR, "Entering Tor control thread");
+
+    while (!m_interrupt) {
+        // Try to connect if not connected already
+        if (!m_conn.IsConnected()) {
+            LogDebug(BCLog::TOR, "Attempting to connect to Tor control port %s", m_tor_control_center);
+
+            if (!m_conn.Connect(m_tor_control_center)) {
+                LogWarning("tor: Initiating connection to Tor control port %s failed", m_tor_control_center);
+                if (!m_reconnect) {
+                    break;
+                }
+                // Wait before retrying with exponential backoff
+                LogDebug(BCLog::TOR, "Retrying in %.1f seconds", m_reconnect_timeout.count());
+                if (!m_interrupt.sleep_for(std::chrono::duration_cast<std::chrono::milliseconds>(m_reconnect_timeout))) {
+                    break;
+                }
+                m_reconnect_timeout = std::min(m_reconnect_timeout * RECONNECT_TIMEOUT_EXP, RECONNECT_TIMEOUT_MAX);
+                continue;
+            }
+            // Successfully connected, reset timeout and trigger connected callback
+            m_reconnect_timeout = RECONNECT_TIMEOUT_START;
+            connected_cb(m_conn);
+        }
+        // Wait for data with a timeout
+        if (!m_conn.WaitForData(std::chrono::seconds(1))) {
+            // Check if still connected
+            if (!m_conn.IsConnected()) {
+                LogDebug(BCLog::TOR, "Lost connection to Tor control port");
+                disconnected_cb(m_conn);
+                continue;
+            }
+            // Just a timeout, continue waiting
+            continue;
+        }
+        // Process incoming data
+        if (!m_conn.ReceiveAndProcess()) {
+            disconnected_cb(m_conn);
+        }
+    }
+    LogDebug(BCLog::TOR, "Exited Tor control thread");
+}
+
 void TorController::get_socks_cb(TorControlConnection& _conn, const TorControlReply& reply)
 {
     // NOTE: We can only get here if -onion is unset
@@ -380,7 +449,7 @@ void TorController::get_socks_cb(TorControlConnection& _conn, const TorControlRe
             }
         }
         if (!socks_location.empty()) {
-            LogDebug(BCLog::TOR, "Get SOCKS port command yielded %s\n", socks_location);
+            LogDebug(BCLog::TOR, "Get SOCKS port command yielded %s", socks_location);
         } else {
             LogWarning("tor: Get SOCKS port command returned nothing");
         }
@@ -401,7 +470,7 @@ void TorController::get_socks_cb(TorControlConnection& _conn, const TorControlRe
     }
 
     Assume(resolved.IsValid());
-    LogDebug(BCLog::TOR, "Configuring onion proxy for %s\n", resolved.ToStringAddrPort());
+    LogDebug(BCLog::TOR, "Configuring onion proxy for %s", resolved.ToStringAddrPort());
 
     // Add Tor as proxy for .onion addresses.
     // Enable stream isolation to prevent connection correlation and enhance privacy, by forcing a different Tor circuit for every connection.
@@ -426,36 +495,52 @@ void TorController::get_socks_cb(TorControlConnection& _conn, const TorControlRe
     }
 }
 
-void TorController::add_onion_cb(TorControlConnection& _conn, const TorControlReply& reply)
+static std::string MakeAddOnionCmd(const std::string& private_key, const std::string& target, bool enable_pow)
+{
+    // Note that the 'virtual' port is always the default port to avoid decloaking nodes using other ports.
+    return strprintf("ADD_ONION %s%s Port=%i,%s",
+                     private_key,
+                     enable_pow ? " PoWDefensesEnabled=1" : "",
+                     Params().GetDefaultPort(),
+                     target);
+}
+
+void TorController::add_onion_cb(TorControlConnection& _conn, const TorControlReply& reply, bool pow_was_enabled)
 {
     if (reply.code == TOR_REPLY_OK) {
-        LogDebug(BCLog::TOR, "ADD_ONION successful\n");
+        LogDebug(BCLog::TOR, "ADD_ONION successful (PoW defenses %s)", pow_was_enabled ? "enabled" : "disabled");
         for (const std::string &s : reply.lines) {
             std::map<std::string,std::string> m = ParseTorReplyMapping(s);
             std::map<std::string,std::string>::iterator i;
             if ((i = m.find("ServiceID")) != m.end())
-                service_id = i->second;
+                m_service_id = i->second;
             if ((i = m.find("PrivateKey")) != m.end())
-                private_key = i->second;
+                m_private_key = i->second;
         }
-        if (service_id.empty()) {
+        if (m_service_id.empty()) {
             LogWarning("tor: Error parsing ADD_ONION parameters:");
             for (const std::string &s : reply.lines) {
                 LogWarning("    %s", SanitizeString(s));
             }
             return;
         }
-        service = LookupNumeric(std::string(service_id+".onion"), Params().GetDefaultPort());
-        LogInfo("Got tor service ID %s, advertising service %s\n", service_id, service.ToStringAddrPort());
-        if (WriteBinaryFile(GetPrivateKeyFile(), private_key)) {
-            LogDebug(BCLog::TOR, "Cached service private key to %s\n", fs::PathToString(GetPrivateKeyFile()));
+        m_service = LookupNumeric(std::string(m_service_id+".onion"), Params().GetDefaultPort());
+        LogInfo("Got tor service ID %s, advertising service %s", m_service_id, m_service.ToStringAddrPort());
+        if (WriteBinaryFile(GetPrivateKeyFile(), m_private_key)) {
+            LogDebug(BCLog::TOR, "Cached service private key to %s", fs::PathToString(GetPrivateKeyFile()));
         } else {
             LogWarning("tor: Error writing service private key to %s", fs::PathToString(GetPrivateKeyFile()));
         }
-        AddLocal(service, LOCAL_MANUAL);
+        AddLocal(m_service, LOCAL_MANUAL);
         // ... onion requested - keep connection open
     } else if (reply.code == TOR_REPLY_UNRECOGNIZED) {
         LogWarning("tor: Add onion failed with unrecognized command (You probably need to upgrade Tor)");
+    } else if (pow_was_enabled && reply.code == TOR_REPLY_SYNTAX_ERROR) {
+        LogDebug(BCLog::TOR, "ADD_ONION failed with PoW defenses, retrying without");
+        _conn.Command(MakeAddOnionCmd(m_private_key, m_target.ToStringAddrPort(), /*enable_pow=*/false),
+                      [this](TorControlConnection& conn, const TorControlReply& reply) {
+                          add_onion_cb(conn, reply, /*pow_was_enabled=*/false);
+                      });
     } else {
         LogWarning("tor: Add onion failed; error code %d", reply.code);
     }
@@ -464,7 +549,7 @@ void TorController::add_onion_cb(TorControlConnection& _conn, const TorControlRe
 void TorController::auth_cb(TorControlConnection& _conn, const TorControlReply& reply)
 {
     if (reply.code == TOR_REPLY_OK) {
-        LogDebug(BCLog::TOR, "Authentication successful\n");
+        LogDebug(BCLog::TOR, "Authentication successful");
 
         // Now that we know Tor is running setup the proxy for onion addresses
         // if -onion isn't set to something else.
@@ -473,13 +558,14 @@ void TorController::auth_cb(TorControlConnection& _conn, const TorControlReply&
         }
 
         // Finally - now create the service
-        if (private_key.empty()) { // No private key, generate one
-            private_key = "NEW:ED25519-V3"; // Explicitly request key type - see issue #9214
+        if (m_private_key.empty()) { // No private key, generate one
+            m_private_key = "NEW:ED25519-V3"; // Explicitly request key type - see issue #9214
         }
         // Request onion service, redirect port.
-        // Note that the 'virtual' port is always the default port to avoid decloaking nodes using other ports.
-        _conn.Command(strprintf("ADD_ONION %s Port=%i,%s", private_key, Params().GetDefaultPort(), m_target.ToStringAddrPort()),
-            std::bind_front(&TorController::add_onion_cb, this));
+        _conn.Command(MakeAddOnionCmd(m_private_key, m_target.ToStringAddrPort(), /*enable_pow=*/true),
+                      [this](TorControlConnection& conn, const TorControlReply& reply) {
+                          add_onion_cb(conn, reply, /*pow_was_enabled=*/true);
+                      });
     } else {
         LogWarning("tor: Authentication failed");
     }
@@ -501,13 +587,13 @@ void TorController::auth_cb(TorControlConnection& _conn, const TorControlReply&
  *                  CookieString | ClientNonce | ServerNonce)
  *
  */
-static std::vector<uint8_t> ComputeResponse(const std::string &key, const std::vector<uint8_t> &cookie,  const std::vector<uint8_t> &clientNonce, const std::vector<uint8_t> &serverNonce)
+static std::vector<uint8_t> ComputeResponse(std::string_view key, std::span<const uint8_t> cookie, std::span<const uint8_t> client_nonce, std::span<const uint8_t> server_nonce)
 {
     CHMAC_SHA256 computeHash((const uint8_t*)key.data(), key.size());
     std::vector<uint8_t> computedHash(CHMAC_SHA256::OUTPUT_SIZE, 0);
     computeHash.Write(cookie.data(), cookie.size());
-    computeHash.Write(clientNonce.data(), clientNonce.size());
-    computeHash.Write(serverNonce.data(), serverNonce.size());
+    computeHash.Write(client_nonce.data(), client_nonce.size());
+    computeHash.Write(server_nonce.data(), server_nonce.size());
     computeHash.Finalize(computedHash.data());
     return computedHash;
 }
@@ -515,7 +601,11 @@ static std::vector<uint8_t> ComputeResponse(const std::string &key, const std::v
 void TorController::authchallenge_cb(TorControlConnection& _conn, const TorControlReply& reply)
 {
     if (reply.code == TOR_REPLY_OK) {
-        LogDebug(BCLog::TOR, "SAFECOOKIE authentication challenge successful\n");
+        LogDebug(BCLog::TOR, "SAFECOOKIE authentication challenge successful");
+        if (reply.lines.empty()) {
+            LogWarning("tor: AUTHCHALLENGE reply was empty");
+            return;
+        }
         std::pair<std::string,std::string> l = SplitTorReplyLine(reply.lines[0]);
         if (l.first == "AUTHCHALLENGE") {
             std::map<std::string,std::string> m = ParseTorReplyMapping(l.second);
@@ -523,21 +613,21 @@ void TorController::authchallenge_cb(TorControlConnection& _conn, const TorContr
                 LogWarning("tor: Error parsing AUTHCHALLENGE parameters: %s", SanitizeString(l.second));
                 return;
             }
-            std::vector<uint8_t> serverHash = ParseHex(m["SERVERHASH"]);
-            std::vector<uint8_t> serverNonce = ParseHex(m["SERVERNONCE"]);
-            LogDebug(BCLog::TOR, "AUTHCHALLENGE ServerHash %s ServerNonce %s\n", HexStr(serverHash), HexStr(serverNonce));
-            if (serverNonce.size() != 32) {
+            std::vector<uint8_t> server_hash = ParseHex(m["SERVERHASH"]);
+            std::vector<uint8_t> server_nonce = ParseHex(m["SERVERNONCE"]);
+            LogDebug(BCLog::TOR, "AUTHCHALLENGE ServerHash %s ServerNonce %s", HexStr(server_hash), HexStr(server_nonce));
+            if (server_nonce.size() != 32) {
                 LogWarning("tor: ServerNonce is not 32 bytes, as required by spec");
                 return;
             }
 
-            std::vector<uint8_t> computedServerHash = ComputeResponse(TOR_SAFE_SERVERKEY, cookie, clientNonce, serverNonce);
-            if (computedServerHash != serverHash) {
-                LogWarning("tor: ServerHash %s does not match expected ServerHash %s", HexStr(serverHash), HexStr(computedServerHash));
+            std::vector<uint8_t> computed_server_hash = ComputeResponse(TOR_SAFE_SERVERKEY, m_cookie, m_client_nonce, server_nonce);
+            if (computed_server_hash != server_hash) {
+                LogWarning("tor: ServerHash %s does not match expected ServerHash %s", HexStr(server_hash), HexStr(computed_server_hash));
                 return;
             }
 
-            std::vector<uint8_t> computedClientHash = ComputeResponse(TOR_SAFE_CLIENTKEY, cookie, clientNonce, serverNonce);
+            std::vector<uint8_t> computedClientHash = ComputeResponse(TOR_SAFE_CLIENTKEY, m_cookie, m_client_nonce, server_nonce);
             _conn.Command("AUTHENTICATE " + HexStr(computedClientHash), std::bind_front(&TorController::auth_cb, this));
         } else {
             LogWarning("tor: Invalid reply to AUTHCHALLENGE");
@@ -572,12 +662,12 @@ void TorController::protocolinfo_cb(TorControlConnection& _conn, const TorContro
                 std::map<std::string,std::string> m = ParseTorReplyMapping(l.second);
                 std::map<std::string,std::string>::iterator i;
                 if ((i = m.find("Tor")) != m.end()) {
-                    LogDebug(BCLog::TOR, "Connected to Tor version %s\n", i->second);
+                    LogDebug(BCLog::TOR, "Connected to Tor version %s", i->second);
                 }
             }
         }
         for (const std::string &s : methods) {
-            LogDebug(BCLog::TOR, "Supported authentication method: %s\n", s);
+            LogDebug(BCLog::TOR, "Supported authentication method: %s", s);
         }
         // Prefer NULL, otherwise SAFECOOKIE. If a password is provided, use HASHEDPASSWORD
         /* Authentication:
@@ -587,25 +677,25 @@ void TorController::protocolinfo_cb(TorControlConnection& _conn, const TorContro
         std::string torpassword = gArgs.GetArg("-torpassword", "");
         if (!torpassword.empty()) {
             if (methods.contains("HASHEDPASSWORD")) {
-                LogDebug(BCLog::TOR, "Using HASHEDPASSWORD authentication\n");
+                LogDebug(BCLog::TOR, "Using HASHEDPASSWORD authentication");
                 ReplaceAll(torpassword, "\"", "\\\"");
                 _conn.Command("AUTHENTICATE \"" + torpassword + "\"", std::bind_front(&TorController::auth_cb, this));
             } else {
                 LogWarning("tor: Password provided with -torpassword, but HASHEDPASSWORD authentication is not available");
             }
         } else if (methods.contains("NULL")) {
-            LogDebug(BCLog::TOR, "Using NULL authentication\n");
+            LogDebug(BCLog::TOR, "Using NULL authentication");
             _conn.Command("AUTHENTICATE", std::bind_front(&TorController::auth_cb, this));
         } else if (methods.contains("SAFECOOKIE")) {
             // Cookie: hexdump -e '32/1 "%02x""\n"'  ~/.tor/control_auth_cookie
-            LogDebug(BCLog::TOR, "Using SAFECOOKIE authentication, reading cookie authentication from %s\n", cookiefile);
+            LogDebug(BCLog::TOR, "Using SAFECOOKIE authentication, reading cookie authentication from %s", cookiefile);
             std::pair<bool,std::string> status_cookie = ReadBinaryFile(fs::PathFromString(cookiefile), TOR_COOKIE_SIZE);
             if (status_cookie.first && status_cookie.second.size() == TOR_COOKIE_SIZE) {
                 // _conn.Command("AUTHENTICATE " + HexStr(status_cookie.second), std::bind_front(&TorController::auth_cb, this));
-                cookie = std::vector<uint8_t>(status_cookie.second.begin(), status_cookie.second.end());
-                clientNonce = std::vector<uint8_t>(TOR_NONCE_SIZE, 0);
-                GetRandBytes(clientNonce);
-                _conn.Command("AUTHCHALLENGE SAFECOOKIE " + HexStr(clientNonce), std::bind_front(&TorController::authchallenge_cb, this));
+                m_cookie = std::vector<uint8_t>(status_cookie.second.begin(), status_cookie.second.end());
+                m_client_nonce = std::vector<uint8_t>(TOR_NONCE_SIZE, 0);
+                GetRandBytes(m_client_nonce);
+                _conn.Command("AUTHCHALLENGE SAFECOOKIE " + HexStr(m_client_nonce), std::bind_front(&TorController::authchallenge_cb, this));
             } else {
                 if (status_cookie.first) {
                     LogWarning("tor: Authentication cookie %s is not exactly %i bytes, as is required by the spec", cookiefile, TOR_COOKIE_SIZE);
@@ -625,7 +715,7 @@ void TorController::protocolinfo_cb(TorControlConnection& _conn, const TorContro
 
 void TorController::connected_cb(TorControlConnection& _conn)
 {
-    reconnect_timeout = RECONNECT_TIMEOUT_START;
+    m_reconnect_timeout = RECONNECT_TIMEOUT_START;
     // First send a PROTOCOLINFO command to figure out what authentication is expected
     if (!_conn.Command("PROTOCOLINFO 1", std::bind_front(&TorController::protocolinfo_cb, this)))
         LogWarning("tor: Error sending initial protocolinfo command");
@@ -634,32 +724,14 @@ void TorController::connected_cb(TorControlConnection& _conn)
 void TorController::disconnected_cb(TorControlConnection& _conn)
 {
     // Stop advertising service when disconnected
-    if (service.IsValid())
-        RemoveLocal(service);
-    service = CService();
-    if (!reconnect)
+    if (m_service.IsValid())
+        RemoveLocal(m_service);
+    m_service = CService();
+    if (!m_reconnect)
         return;
 
-    LogDebug(BCLog::TOR, "Not connected to Tor control port %s, retrying in %.2f s\n",
-             m_tor_control_center, reconnect_timeout);
-
-    // Single-shot timer for reconnect. Use exponential backoff with a maximum.
-    struct timeval time = MillisToTimeval(int64_t(reconnect_timeout * 1000.0));
-    if (reconnect_ev)
-        event_add(reconnect_ev, &time);
-
-    reconnect_timeout = std::min(reconnect_timeout * RECONNECT_TIMEOUT_EXP, RECONNECT_TIMEOUT_MAX);
-}
-
-void TorController::Reconnect()
-{
-    /* Try to reconnect and reestablish if we get booted - for example, Tor
-     * may be restarting.
-     */
-    if (!conn.Connect(m_tor_control_center, std::bind_front(&TorController::connected_cb, this),
-         std::bind_front(&TorController::disconnected_cb, this) )) {
-        LogWarning("tor: Re-initiating connection to Tor control port %s failed", m_tor_control_center);
-    }
+    LogDebug(BCLog::TOR, "Not connected to Tor control port %s, will retry", m_tor_control_center);
+    _conn.Disconnect();
 }
 
 fs::path TorController::GetPrivateKeyFile()
@@ -667,61 +739,6 @@ fs::path TorController::GetPrivateKeyFile()
     return gArgs.GetDataDirNet() / "onion_v3_private_key";
 }
 
-void TorController::reconnect_cb(evutil_socket_t fd, short what, void *arg)
-{
-    TorController *self = static_cast<TorController*>(arg);
-    self->Reconnect();
-}
-
-/****** Thread ********/
-static struct event_base *gBase;
-static std::thread torControlThread;
-
-static void TorControlThread(CService onion_service_target)
-{
-    TorController ctrl(gBase, gArgs.GetArg("-torcontrol", DEFAULT_TOR_CONTROL), onion_service_target);
-
-    event_base_dispatch(gBase);
-}
-
-void StartTorControl(CService onion_service_target)
-{
-    assert(!gBase);
-#ifdef WIN32
-    evthread_use_windows_threads();
-#else
-    evthread_use_pthreads();
-#endif
-    gBase = event_base_new();
-    if (!gBase) {
-        LogWarning("tor: Unable to create event_base");
-        return;
-    }
-
-    torControlThread = std::thread(&util::TraceThread, "torcontrol", [onion_service_target] {
-        TorControlThread(onion_service_target);
-    });
-}
-
-void InterruptTorControl()
-{
-    if (gBase) {
-        LogInfo("tor: Thread interrupt\n");
-        event_base_once(gBase, -1, EV_TIMEOUT, [](evutil_socket_t, short, void*) {
-            event_base_loopbreak(gBase);
-        }, nullptr, nullptr);
-    }
-}
-
-void StopTorControl()
-{
-    if (gBase) {
-        torControlThread.join();
-        event_base_free(gBase);
-        gBase = nullptr;
-    }
-}
-
 CService DefaultOnionServiceTarget(uint16_t port)
 {
     struct in_addr onion_service_target;
diff --git a/src/torcontrol.h b/src/torcontrol.h
index e64f9d38df0a..75b81b87b2d9 100644
--- a/src/torcontrol.h
+++ b/src/torcontrol.h
@@ -10,13 +10,15 @@
 
 #include <netaddress.h>
 #include <util/fs.h>
-
-#include <event2/util.h>
+#include <util/sock.h>
+#include <util/threadinterrupt.h>
 
 #include <cstdint>
 #include <deque>
 #include <functional>
+#include <memory>
 #include <string>
+#include <thread>
 #include <vector>
 
 constexpr uint16_t DEFAULT_TOR_SOCKS_PORT{9050};
@@ -24,9 +26,10 @@ constexpr int DEFAULT_TOR_CONTROL_PORT = 9051;
 extern const std::string DEFAULT_TOR_CONTROL;
 static const bool DEFAULT_LISTEN_ONION = true;
 
-void StartTorControl(CService onion_service_target);
-void InterruptTorControl();
-void StopTorControl();
+/** Tor control reply code. Ref: https://spec.torproject.org/control-spec/replies.html */
+constexpr int TOR_REPLY_OK{250};
+constexpr int TOR_REPLY_UNRECOGNIZED{510};
+constexpr int TOR_REPLY_SYNTAX_ERROR{512}; //!< Syntax error in command argument
 
 CService DefaultOnionServiceTarget(uint16_t port);
 
@@ -52,22 +55,19 @@ class TorControlReply
 class TorControlConnection
 {
 public:
-    typedef std::function<void(TorControlConnection&)> ConnectionCB;
     typedef std::function<void(TorControlConnection &,const TorControlReply &)> ReplyHandlerCB;
 
     /** Create a new TorControlConnection.
      */
-    explicit TorControlConnection(struct event_base *base);
+    explicit TorControlConnection(CThreadInterrupt& interrupt);
     ~TorControlConnection();
 
     /**
      * Connect to a Tor control port.
      * tor_control_center is address of the form host:port.
-     * connected is the handler that is called when connection is successfully established.
-     * disconnected is a handler that is called when the connection is broken.
      * Return true on success.
      */
-    bool Connect(const std::string& tor_control_center, const ConnectionCB& connected, const ConnectionCB& disconnected);
+    bool Connect(const std::string& tor_control_center);
 
     /**
      * Disconnect from Tor control port.
@@ -80,23 +80,38 @@ class TorControlConnection
      */
     bool Command(const std::string &cmd, const ReplyHandlerCB& reply_handler);
 
+    /**
+     * Check if the connection is established.
+     */
+    bool IsConnected() const;
+
+    /**
+     * Wait for data to be available on the socket.
+     * @param[in] timeout Maximum time to wait
+     * @return true if data is available, false on timeout or error
+     */
+    bool WaitForData(std::chrono::milliseconds timeout);
+
+    /**
+     * Read available data from socket and process complete replies.
+     * Dispatches to registered reply handlers.
+     * @return true if connection is still open, false if connection was closed
+     */
+    bool ReceiveAndProcess();
+
 private:
-    /** Callback when ready for use */
-    std::function<void(TorControlConnection&)> connected;
-    /** Callback when connection lost */
-    std::function<void(TorControlConnection&)> disconnected;
-    /** Libevent event base */
-    struct event_base *base;
-    /** Connection to control socket */
-    struct bufferevent* b_conn{nullptr};
+    /** Reference to interrupt object for clean shutdown */
+    CThreadInterrupt& m_interrupt;
+    /** Socket for the connection */
+    std::unique_ptr<Sock> m_sock;
     /** Message being received */
-    TorControlReply message;
+    TorControlReply m_message;
     /** Response handlers */
-    std::deque<ReplyHandlerCB> reply_handlers;
-
-    /** Libevent handlers: internal */
-    static void readcb(struct bufferevent *bev, void *ctx);
-    static void eventcb(struct bufferevent *bev, short what, void *ctx);
+    std::deque<ReplyHandlerCB> m_reply_handlers;
+    /** Buffer for incoming data */
+    std::vector<std::byte> m_recv_buffer;
+    /** Process complete lines from the receive buffer */
+    bool ProcessBuffer();
 };
 
 /****** Bitcoin specific TorController implementation ********/
@@ -107,8 +122,8 @@ class TorControlConnection
 class TorController
 {
 public:
-    TorController(struct event_base* base, const std::string& tor_control_center, const CService& target);
-    TorController() : conn{nullptr} {
+    TorController(const std::string& tor_control_center, const CService& target);
+    TorController() : m_conn(m_interrupt) {
         // Used for testing only.
     }
     ~TorController();
@@ -116,29 +131,34 @@ class TorController
     /** Get name of file to store private key in */
     fs::path GetPrivateKeyFile();
 
-    /** Reconnect, after getting disconnected */
-    void Reconnect();
+    /** Interrupt the controller thread */
+    void Interrupt();
+
+    /** Wait for the controller thread to exit */
+    void Join();
 private:
-    struct event_base* base;
+    CThreadInterrupt m_interrupt;
+    std::thread m_thread;
     const std::string m_tor_control_center;
-    TorControlConnection conn;
-    std::string private_key;
-    std::string service_id;
-    bool reconnect;
-    struct event *reconnect_ev = nullptr;
-    float reconnect_timeout;
-    CService service;
+    TorControlConnection m_conn;
+    std::string m_private_key;
+    std::string m_service_id;
+    std::atomic<bool> m_reconnect;
+    std::chrono::duration<double> m_reconnect_timeout;
+    CService m_service;
     const CService m_target;
     /** Cookie for SAFECOOKIE auth */
-    std::vector<uint8_t> cookie;
+    std::vector<uint8_t> m_cookie;
     /** ClientNonce for SAFECOOKIE auth */
-    std::vector<uint8_t> clientNonce;
+    std::vector<uint8_t> m_client_nonce;
+    /** Main control thread */
+    void ThreadControl();
 
 public:
     /** Callback for GETINFO net/listeners/socks result */
     void get_socks_cb(TorControlConnection& conn, const TorControlReply& reply);
     /** Callback for ADD_ONION result */
-    void add_onion_cb(TorControlConnection& conn, const TorControlReply& reply);
+    void add_onion_cb(TorControlConnection& conn, const TorControlReply& reply, bool pow_was_enabled);
     /** Callback for AUTHENTICATE result */
     void auth_cb(TorControlConnection& conn, const TorControlReply& reply);
     /** Callback for AUTHCHALLENGE result */
@@ -149,9 +169,6 @@ class TorController
     void connected_cb(TorControlConnection& conn);
     /** Callback after connection lost or failed connection attempt */
     void disconnected_cb(TorControlConnection& conn);
-
-    /** Callback for reconnect timer */
-    static void reconnect_cb(evutil_socket_t fd, short what, void *arg);
 };
 
 #endif // BITCOIN_TORCONTROL_H
diff --git a/src/txdb.cpp b/src/txdb.cpp
index 2c39cf2767ba..a098faa44bc1 100644
--- a/src/txdb.cpp
+++ b/src/txdb.cpp
@@ -78,7 +78,13 @@ std::optional<Coin> CCoinsViewDB::GetCoin(const COutPoint& outpoint) const
     return std::nullopt;
 }
 
-bool CCoinsViewDB::HaveCoin(const COutPoint &outpoint) const {
+std::optional<Coin> CCoinsViewDB::PeekCoin(const COutPoint& outpoint) const
+{
+    return GetCoin(outpoint);
+}
+
+bool CCoinsViewDB::HaveCoin(const COutPoint& outpoint) const
+{
     return m_db->Exists(CoinEntry(&outpoint));
 }
 
@@ -97,22 +103,22 @@ std::vector<uint256> CCoinsViewDB::GetHeadBlocks() const {
     return vhashHeadBlocks;
 }
 
-void CCoinsViewDB::BatchWrite(CoinsViewCacheCursor& cursor, const uint256& hashBlock)
+void CCoinsViewDB::BatchWrite(CoinsViewCacheCursor& cursor, const uint256& block_hash)
 {
     CDBBatch batch(*m_db);
     size_t count = 0;
     const size_t dirty_count{cursor.GetDirtyCount()};
-    assert(!hashBlock.IsNull());
+    assert(!block_hash.IsNull());
 
     uint256 old_tip = GetBestBlock();
     if (old_tip.IsNull()) {
         // We may be in the middle of replaying.
         std::vector<uint256> old_heads = GetHeadBlocks();
         if (old_heads.size() == 2) {
-            if (old_heads[0] != hashBlock) {
+            if (old_heads[0] != block_hash) {
                 LogError("The coins database detected an inconsistent state, likely due to a previous crash or shutdown. You will need to restart bitcoind with the -reindex-chainstate or -reindex configuration option.\n");
             }
-            assert(old_heads[0] == hashBlock);
+            assert(old_heads[0] == block_hash);
             old_tip = old_heads[1];
         }
     }
@@ -122,11 +128,11 @@ void CCoinsViewDB::BatchWrite(CoinsViewCacheCursor& cursor, const uint256& hashB
         dirty_count, cursor.GetTotalCount()), BCLog::BENCH);
 
     // In the first batch, mark the database as being in the middle of a
-    // transition from old_tip to hashBlock.
+    // transition from old_tip to block_hash.
     // A vector is used for future extensibility, as we may want to support
     // interrupting after partial writes from multiple independent reorgs.
     batch.Erase(DB_BEST_BLOCK);
-    batch.Write(DB_HEAD_BLOCKS, Vector(hashBlock, old_tip));
+    batch.Write(DB_HEAD_BLOCKS, Vector(block_hash, old_tip));
 
     for (auto it{cursor.Begin()}; it != cursor.End();) {
         if (it->second.IsDirty()) {
@@ -154,9 +160,9 @@ void CCoinsViewDB::BatchWrite(CoinsViewCacheCursor& cursor, const uint256& hashB
         }
     }
 
-    // In the last batch, mark the database as consistent with hashBlock again.
+    // In the last batch, mark the database as consistent with block_hash again.
     batch.Erase(DB_HEAD_BLOCKS);
-    batch.Write(DB_BEST_BLOCK, hashBlock);
+    batch.Write(DB_BEST_BLOCK, block_hash);
 
     LogDebug(BCLog::COINDB, "Writing final batch of %.2f MiB\n", batch.ApproximateSize() * (1.0 / 1048576.0));
     m_db->WriteBatch(batch);
@@ -174,8 +180,8 @@ class CCoinsViewDBCursor: public CCoinsViewCursor
 public:
     // Prefer using CCoinsViewDB::Cursor() since we want to perform some
     // cache warmup on instantiation.
-    CCoinsViewDBCursor(CDBIterator* pcursorIn, const uint256&hashBlockIn):
-        CCoinsViewCursor(hashBlockIn), pcursor(pcursorIn) {}
+    CCoinsViewDBCursor(CDBIterator* pcursorIn, const uint256& in_block_hash):
+        CCoinsViewCursor(in_block_hash), pcursor(pcursorIn) {}
     ~CCoinsViewDBCursor() = default;
 
     bool GetKey(COutPoint &key) const override;
diff --git a/src/txdb.h b/src/txdb.h
index 248fe43e559d..b19b312a4b60 100644
--- a/src/txdb.h
+++ b/src/txdb.h
@@ -41,10 +41,11 @@ class CCoinsViewDB final : public CCoinsView
     explicit CCoinsViewDB(DBParams db_params, CoinsViewOptions options);
 
     std::optional<Coin> GetCoin(const COutPoint& outpoint) const override;
-    bool HaveCoin(const COutPoint &outpoint) const override;
+    std::optional<Coin> PeekCoin(const COutPoint& outpoint) const override;
+    bool HaveCoin(const COutPoint& outpoint) const override;
     uint256 GetBestBlock() const override;
     std::vector<uint256> GetHeadBlocks() const override;
-    void BatchWrite(CoinsViewCacheCursor& cursor, const uint256& hashBlock) override;
+    void BatchWrite(CoinsViewCacheCursor& cursor, const uint256& block_hash) override;
     std::unique_ptr<CCoinsViewCursor> Cursor() const override;
 
     //! Whether an unsupported database format is used.
diff --git a/src/txmempool.cpp b/src/txmempool.cpp
index bfff18168327..5aefd65679ff 100644
--- a/src/txmempool.cpp
+++ b/src/txmempool.cpp
@@ -786,7 +786,7 @@ void CTxMemPool::RemoveUnbroadcastTx(const Txid& txid, const bool unchecked) {
 
     if (m_unbroadcast_txids.erase(txid))
     {
-        LogDebug(BCLog::MEMPOOL, "Removed %i from set of unbroadcast txns%s\n", txid.GetHex(), (unchecked ? " before confirmation that txn was sent out" : ""));
+        LogDebug(BCLog::MEMPOOL, "Removed %s from set of unbroadcast txns%s", txid.GetHex(), (unchecked ? " before confirmation that txn was sent out" : ""));
     }
 }
 
diff --git a/src/txmempool.h b/src/txmempool.h
index d7b7de6e3b70..c4723f891557 100644
--- a/src/txmempool.h
+++ b/src/txmempool.h
@@ -257,7 +257,7 @@ class CTxMemPool
      * changing the chain tip. It's necessary to keep both mutexes locked until
      * the mempool is consistent with the new chain tip and fully populated.
      */
-    mutable RecursiveMutex cs;
+    mutable RecursiveMutex cs ACQUIRED_AFTER(::cs_main);
     std::unique_ptr<TxGraph> m_txgraph GUARDED_BY(cs);
     mutable std::unique_ptr<TxGraph::BlockBuilder> m_builder GUARDED_BY(cs);
     indexed_transaction_set mapTx GUARDED_BY(cs);
@@ -768,7 +768,7 @@ class CCoinsViewMemPool : public CCoinsViewBacked
 public:
     CCoinsViewMemPool(CCoinsView* baseIn, const CTxMemPool& mempoolIn);
     /** GetCoin, returning whether it exists and is not spent. Also updates m_non_base_coins if the
-     * coin is not fetched from base. */
+     * coin is not fetched from base. May populate the base view on cache misses. */
     std::optional<Coin> GetCoin(const COutPoint& outpoint) const override;
     /** Add the coins created by this transaction. These coins are only temporarily stored in
      * m_temp_added and cannot be flushed to the back end. Only used for package validation. */
diff --git a/src/uint256.h b/src/uint256.h
index d42042750fa9..3fe44ab76709 100644
--- a/src/uint256.h
+++ b/src/uint256.h
@@ -7,6 +7,7 @@
 #define BITCOIN_UINT256_H
 
 #include <crypto/common.h>
+#include <crypto/hex_base.h>
 #include <span.h>
 #include <util/strencodings.h>
 #include <util/string.h>
diff --git a/src/univalue/lib/univalue_get.cpp b/src/univalue/lib/univalue_get.cpp
index 146cc421ef6a..e82ac4cbaed8 100644
--- a/src/univalue/lib/univalue_get.cpp
+++ b/src/univalue/lib/univalue_get.cpp
@@ -7,6 +7,7 @@
 
 #include <cstring>
 #include <locale>
+#include <optional>
 #include <sstream>
 #include <stdexcept>
 #include <string>
@@ -25,18 +26,20 @@ static bool ParsePrechecks(const std::string& str)
     return true;
 }
 
-bool ParseDouble(const std::string& str, double *out)
+std::optional<double> ParseDouble(const std::string& str)
 {
     if (!ParsePrechecks(str))
-        return false;
+        return std::nullopt;
     if (str.size() >= 2 && str[0] == '0' && str[1] == 'x') // No hexadecimal floats allowed
-        return false;
+        return std::nullopt;
     std::istringstream text(str);
     text.imbue(std::locale::classic());
     double result;
     text >> result;
-    if(out) *out = result;
-    return text.eof() && !text.fail();
+    if (!text.eof() || text.fail()) {
+        return std::nullopt;
+    }
+    return result;
 }
 }
 
@@ -68,10 +71,10 @@ const std::string& UniValue::get_str() const
 double UniValue::get_real() const
 {
     checkType(VNUM);
-    double retval;
-    if (!ParseDouble(getValStr(), &retval))
-        throw std::runtime_error("JSON double out of range");
-    return retval;
+    if (const auto retval{ParseDouble(getValStr())}) {
+        return *retval;
+    }
+    throw std::runtime_error("JSON double out of range");
 }
 
 const UniValue& UniValue::get_obj() const
diff --git a/src/util/CMakeLists.txt b/src/util/CMakeLists.txt
index fdf0081c263d..3444fb093618 100644
--- a/src/util/CMakeLists.txt
+++ b/src/util/CMakeLists.txt
@@ -33,7 +33,6 @@ add_library(bitcoin_util STATIC EXCLUDE_FROM_ALL
   ../random.cpp
   ../randomenv.cpp
   ../streams.cpp
-  ../support/lockedpool.cpp
   ../sync.cpp
 )
 
diff --git a/src/util/asmap.cpp b/src/util/asmap.cpp
index f8b5a527a938..04e47c24c055 100644
--- a/src/util/asmap.cpp
+++ b/src/util/asmap.cpp
@@ -4,20 +4,18 @@
 
 #include <util/asmap.h>
 
-#include <clientversion.h>
 #include <hash.h>
-#include <serialize.h>
 #include <streams.h>
 #include <uint256.h>
+#include <util/check.h>
 #include <util/fs.h>
 #include <util/log.h>
 
-#include <algorithm>
 #include <bit>
-#include <cassert>
 #include <cstddef>
 #include <cstdio>
 #include <span>
+#include <string>
 #include <utility>
 #include <vector>
 
diff --git a/src/util/bip32.cpp b/src/util/bip32.cpp
index db40bfb5b9e7..2488eacf5156 100644
--- a/src/util/bip32.cpp
+++ b/src/util/bip32.cpp
@@ -2,12 +2,14 @@
 // Distributed under the MIT software license, see the accompanying
 // file COPYING or http://www.opensource.org/licenses/mit-license.php.
 
-#include <tinyformat.h>
 #include <util/bip32.h>
+
+#include <tinyformat.h>
 #include <util/strencodings.h>
 
 #include <cstdint>
 #include <cstdio>
+#include <optional>
 #include <sstream>
 
 bool ParseHDKeypath(const std::string& keypath_str, std::vector<uint32_t>& keypath)
diff --git a/src/util/bitdeque.h b/src/util/bitdeque.h
index 70556a7d8c84..294c42f40d66 100644
--- a/src/util/bitdeque.h
+++ b/src/util/bitdeque.h
@@ -11,6 +11,7 @@
 #include <limits>
 #include <stdexcept>
 #include <tuple>
+#include <util/overflow.h>
 
 /** Class that mimics std::deque<bool>, but with std::vector<bool>'s bit packing.
  *
@@ -211,7 +212,7 @@ class bitdeque
     void assign(size_type count, bool val)
     {
         m_deque.clear();
-        m_deque.resize((count + BITS_PER_WORD - 1) / BITS_PER_WORD);
+        m_deque.resize(CeilDiv(count, size_type{BITS_PER_WORD}));
         m_pad_begin = 0;
         m_pad_end = 0;
         if (val) {
diff --git a/src/util/bitset.h b/src/util/bitset.h
index 17ebc709eb8e..1e7ed4400c2e 100644
--- a/src/util/bitset.h
+++ b/src/util/bitset.h
@@ -6,6 +6,7 @@
 #define BITCOIN_UTIL_BITSET_H
 
 #include <util/check.h>
+#include <util/overflow.h>
 
 #include <array>
 #include <bit>
@@ -522,6 +523,6 @@ class MultiIntBitSet
 template<unsigned BITS>
 using BitSet = std::conditional_t<(BITS <= 32), bitset_detail::IntBitSet<uint32_t>,
                std::conditional_t<(BITS <= std::numeric_limits<size_t>::digits), bitset_detail::IntBitSet<size_t>,
-               bitset_detail::MultiIntBitSet<size_t, (BITS + std::numeric_limits<size_t>::digits - 1) / std::numeric_limits<size_t>::digits>>>;
+               bitset_detail::MultiIntBitSet<size_t, CeilDiv(BITS, size_t{std::numeric_limits<size_t>::digits})>>>;
 
 #endif // BITCOIN_UTIL_BITSET_H
diff --git a/src/util/bytevectorhash.cpp b/src/util/bytevectorhash.cpp
index 943517adbec6..40930301118c 100644
--- a/src/util/bytevectorhash.cpp
+++ b/src/util/bytevectorhash.cpp
@@ -2,10 +2,12 @@
 // Distributed under the MIT software license, see the accompanying
 // file COPYING or http://www.opensource.org/licenses/mit-license.php.
 
+#include <util/bytevectorhash.h>
+
 #include <crypto/siphash.h>
 #include <random.h>
-#include <util/bytevectorhash.h>
 
+#include <span>
 #include <vector>
 
 ByteVectorHash::ByteVectorHash() :
diff --git a/src/util/chaintype.cpp b/src/util/chaintype.cpp
index 5059ff7e9f47..6029002af7f1 100644
--- a/src/util/chaintype.cpp
+++ b/src/util/chaintype.cpp
@@ -4,7 +4,8 @@
 
 #include <util/chaintype.h>
 
-#include <cassert>
+#include <util/check.h>
+
 #include <optional>
 #include <string>
 
diff --git a/src/util/chaintype.h b/src/util/chaintype.h
index 3b246ea49b50..caae77c1965d 100644
--- a/src/util/chaintype.h
+++ b/src/util/chaintype.h
@@ -7,6 +7,7 @@
 
 #include <optional>
 #include <string>
+#include <string_view>
 
 enum class ChainType {
     MAIN,
diff --git a/src/util/check.h b/src/util/check.h
index 34801ca0e8ba..4f5b0010161e 100644
--- a/src/util/check.h
+++ b/src/util/check.h
@@ -8,11 +8,14 @@
 #include <attributes.h>
 
 #include <atomic>
+// We use `util/check.h` to provide the `assert()` macro
+// to ensure that `NDEBUG` is not defined.
 #include <cassert> // IWYU pragma: export
 #include <source_location>
 #include <stdexcept>
 #include <string>
 #include <string_view>
+#include <type_traits>
 #include <utility>
 
 constexpr bool G_FUZZING_BUILD{
diff --git a/src/util/exec.cpp b/src/util/exec.cpp
index 6b1406134268..87d112373941 100644
--- a/src/util/exec.cpp
+++ b/src/util/exec.cpp
@@ -5,12 +5,17 @@
 #include <util/exec.h>
 
 #include <util/fs.h>
+#ifdef WIN32
 #include <util/subprocess.h>
+#endif
 
+#include <cstdlib>
 #include <string>
-#include <vector>
+#include <system_error>
 
 #ifdef WIN32
+#include <codecvt>
+#include <locale>
 #include <process.h>
 #include <windows.h>
 #else
diff --git a/src/util/expected.h b/src/util/expected.h
index 66fb98e05584..c88c6de4cfab 100644
--- a/src/util/expected.h
+++ b/src/util/expected.h
@@ -8,7 +8,6 @@
 #include <attributes.h>
 #include <util/check.h>
 
-#include <cassert>
 #include <exception>
 #include <utility>
 #include <variant>
diff --git a/src/util/feefrac.cpp b/src/util/feefrac.cpp
index 68ba2b6665a8..088149befccd 100644
--- a/src/util/feefrac.cpp
+++ b/src/util/feefrac.cpp
@@ -3,9 +3,11 @@
 // file COPYING or http://www.opensource.org/licenses/mit-license.php.
 
 #include <util/feefrac.h>
-#include <algorithm>
+
+#include <util/check.h>
+
 #include <array>
-#include <vector>
+#include <cstddef>
 
 std::partial_ordering CompareChunks(std::span<const FeeFrac> chunks0, std::span<const FeeFrac> chunks1)
 {
diff --git a/src/util/feefrac.h b/src/util/feefrac.h
index 7577107e8c27..30ec6b02f182 100644
--- a/src/util/feefrac.h
+++ b/src/util/feefrac.h
@@ -5,12 +5,13 @@
 #ifndef BITCOIN_UTIL_FEEFRAC_H
 #define BITCOIN_UTIL_FEEFRAC_H
 
-#include <span.h>
 #include <util/check.h>
+#include <util/overflow.h>
 
 #include <compare>
 #include <cstdint>
-#include <vector>
+#include <span>
+#include <utility>
 
 /** Data structure storing a fee and size, ordered by increasing fee/size.
  *
@@ -208,7 +209,7 @@ struct FeeFrac
             if constexpr (RoundDown) {
                 return (uint64_t(fee) * at_size) / uint32_t(size);
             } else {
-                return (uint64_t(fee) * at_size + size - 1U) / uint32_t(size);
+                return CeilDiv(uint64_t(fee) * at_size, uint32_t(size));
             }
         } else {
             // Otherwise, use Mul and Div.
diff --git a/src/util/fs.cpp b/src/util/fs.cpp
index 692f67184258..88966ab0fa29 100644
--- a/src/util/fs.cpp
+++ b/src/util/fs.cpp
@@ -3,23 +3,21 @@
 // file COPYING or http://www.opensource.org/licenses/mit-license.php.
 
 #include <util/fs.h>
+
+#include <util/check.h>
 #include <util/syserror.h>
 
+#include <cerrno>
+#include <string>
+
 #ifndef WIN32
-#include <cstring>
 #include <fcntl.h>
-#include <sys/file.h>
-#include <sys/utsname.h>
 #include <unistd.h>
 #else
 #include <limits>
 #include <windows.h>
 #endif
 
-#include <cassert>
-#include <cerrno>
-#include <string>
-
 namespace fsbridge {
 
 FILE *fopen(const fs::path& p, const char *mode)
diff --git a/src/util/fs.h b/src/util/fs.h
index 147904d030ac..73d6947904a6 100644
--- a/src/util/fs.h
+++ b/src/util/fs.h
@@ -5,17 +5,18 @@
 #ifndef BITCOIN_UTIL_FS_H
 #define BITCOIN_UTIL_FS_H
 
-#include <tinyformat.h>
+// IWYU incorrectly suggests removing this header.
+// See https://github.com/include-what-you-use/include-what-you-use/issues/1931.
+#include <tinyformat.h> // IWYU pragma: keep
 
 #include <cstdio>
+// The `util/fs.h` header is designed to be a drop-in replacement for `filesystem`.
 #include <filesystem> // IWYU pragma: export
 #include <functional>
 #include <iomanip>
 #include <ios>
-#include <ostream>
 #include <string>
 #include <string_view>
-#include <system_error>
 #include <type_traits>
 #include <utility>
 
@@ -96,6 +97,10 @@ static inline bool exists(const path& p)
 {
     return std::filesystem::exists(p);
 }
+static inline bool exists(const std::filesystem::file_status& s)
+{
+    return std::filesystem::exists(s);
+}
 
 // Allow explicit quoted stream I/O.
 static inline auto quoted(const std::string& s)
diff --git a/src/util/fs_helpers.cpp b/src/util/fs_helpers.cpp
index e7780d743c19..8e08e66da8a4 100644
--- a/src/util/fs_helpers.cpp
+++ b/src/util/fs_helpers.cpp
@@ -24,6 +24,7 @@
 #ifndef WIN32
 #include <fcntl.h>
 #include <sys/resource.h>
+#include <sys/types.h>
 #include <unistd.h>
 #else
 #include <io.h>
diff --git a/src/util/fs_helpers.h b/src/util/fs_helpers.h
index d39ae115c7c1..face17fd8b53 100644
--- a/src/util/fs_helpers.h
+++ b/src/util/fs_helpers.h
@@ -13,6 +13,7 @@
 #include <iosfwd>
 #include <limits>
 #include <optional>
+#include <string>
 
 #ifdef __APPLE__
 enum class FSType {
diff --git a/src/util/hasher.cpp b/src/util/hasher.cpp
index 3d5ffcf89b45..b12f7451b324 100644
--- a/src/util/hasher.cpp
+++ b/src/util/hasher.cpp
@@ -2,10 +2,10 @@
 // Distributed under the MIT software license, see the accompanying
 // file COPYING or http://www.opensource.org/licenses/mit-license.php.
 
+#include <util/hasher.h>
+
 #include <crypto/siphash.h>
 #include <random.h>
-#include <span.h>
-#include <util/hasher.h>
 
 SaltedUint256Hasher::SaltedUint256Hasher() : m_hasher{
     FastRandomContext().rand64(),
diff --git a/src/util/hasher.h b/src/util/hasher.h
index 02c77033918b..7e74c6767693 100644
--- a/src/util/hasher.h
+++ b/src/util/hasher.h
@@ -8,12 +8,11 @@
 #include <crypto/common.h>
 #include <crypto/siphash.h>
 #include <primitives/transaction.h>
-#include <span.h>
 #include <uint256.h>
 
-#include <concepts>
 #include <cstdint>
 #include <cstring>
+#include <span>
 
 class SaltedUint256Hasher
 {
diff --git a/src/util/log.h b/src/util/log.h
index aae23f0df1e7..1bec49f22983 100644
--- a/src/util/log.h
+++ b/src/util/log.h
@@ -5,6 +5,8 @@
 #ifndef BITCOIN_UTIL_LOG_H
 #define BITCOIN_UTIL_LOG_H
 
+// This header works in tandem with `logging/categories.h`
+// to expose the complete logging interface.
 #include <logging/categories.h> // IWYU pragma: export
 #include <tinyformat.h>
 #include <util/check.h>
diff --git a/src/util/obfuscation.h b/src/util/obfuscation.h
index e9a2e6093b6b..a5df75ece07d 100644
--- a/src/util/obfuscation.h
+++ b/src/util/obfuscation.h
@@ -5,7 +5,7 @@
 #ifndef BITCOIN_UTIL_OBFUSCATION_H
 #define BITCOIN_UTIL_OBFUSCATION_H
 
-#include <cstdint>
+#include <crypto/hex_base.h>
 #include <span.h>
 #include <tinyformat.h>
 #include <util/strencodings.h>
@@ -13,6 +13,7 @@
 #include <array>
 #include <bit>
 #include <climits>
+#include <cstdint>
 #include <ios>
 #include <memory>
 
diff --git a/src/util/overflow.h b/src/util/overflow.h
index e7498fd8118a..274ba0454e3a 100644
--- a/src/util/overflow.h
+++ b/src/util/overflow.h
@@ -5,6 +5,8 @@
 #ifndef BITCOIN_UTIL_OVERFLOW_H
 #define BITCOIN_UTIL_OVERFLOW_H
 
+#include <util/check.h>
+
 #include <climits>
 #include <concepts>
 #include <limits>
@@ -57,6 +59,21 @@ template <class T>
     return i + j;
 }
 
+/**
+ * @brief Integer ceiling division (for unsigned values).
+ *
+ * Computes the smallest integer q such that q * divisor >= dividend.
+ * Both dividend and divisor must be unsigned, and divisor must be non-zero.
+ *
+ * The implementation avoids overflow that can occur with `(dividend + divisor - 1) / divisor`.
+ */
+template <std::unsigned_integral Dividend, std::unsigned_integral Divisor>
+[[nodiscard]] constexpr auto CeilDiv(const Dividend dividend, const Divisor divisor)
+{
+    assert(divisor > 0);
+    return dividend / divisor + (dividend % divisor != 0);
+}
+
 /**
  * @brief Left bit shift with overflow checking.
  * @param input The input value to be left shifted.
diff --git a/src/util/rbf.cpp b/src/util/rbf.cpp
index bc28c6bba22d..82ef020d37b4 100644
--- a/src/util/rbf.cpp
+++ b/src/util/rbf.cpp
@@ -6,6 +6,8 @@
 
 #include <primitives/transaction.h>
 
+#include <vector>
+
 bool SignalsOptInRBF(const CTransaction &tx)
 {
     for (const CTxIn &txin : tx.vin) {
diff --git a/src/util/readwritefile.cpp b/src/util/readwritefile.cpp
index 82b596f90566..6a9eeb28e584 100644
--- a/src/util/readwritefile.cpp
+++ b/src/util/readwritefile.cpp
@@ -9,7 +9,6 @@
 
 #include <algorithm>
 #include <cstdio>
-#include <limits>
 #include <string>
 #include <utility>
 
diff --git a/src/util/readwritefile.h b/src/util/readwritefile.h
index 2a9ccf5f4211..54a5a305edc7 100644
--- a/src/util/readwritefile.h
+++ b/src/util/readwritefile.h
@@ -7,6 +7,7 @@
 
 #include <util/fs.h>
 
+#include <cstddef>
 #include <limits>
 #include <string>
 #include <utility>
diff --git a/src/util/signalinterrupt.h b/src/util/signalinterrupt.h
index 027dd1531c4d..5a23cd1ea25e 100644
--- a/src/util/signalinterrupt.h
+++ b/src/util/signalinterrupt.h
@@ -13,7 +13,6 @@
 #endif
 
 #include <atomic>
-#include <cstdlib>
 
 namespace util {
 /**
diff --git a/src/util/sock.cpp b/src/util/sock.cpp
index a06ab7a79133..8e0c0f4741b2 100644
--- a/src/util/sock.cpp
+++ b/src/util/sock.cpp
@@ -4,18 +4,23 @@
 
 #include <util/sock.h>
 
-#include <common/system.h>
 #include <compat/compat.h>
 #include <span.h>
 #include <tinyformat.h>
+#include <util/check.h>
 #include <util/log.h>
 #include <util/syserror.h>
 #include <util/threadinterrupt.h>
 #include <util/time.h>
 
+#include <algorithm>
+#include <compare>
+#include <exception>
 #include <memory>
 #include <stdexcept>
 #include <string>
+#include <utility>
+#include <vector>
 
 #ifdef USE_POLL
 #include <poll.h>
diff --git a/src/util/sock.h b/src/util/sock.h
index 8c51b8ea6ea0..e20b31e18169 100644
--- a/src/util/sock.h
+++ b/src/util/sock.h
@@ -6,15 +6,17 @@
 #define BITCOIN_UTIL_SOCK_H
 
 #include <compat/compat.h>
-#include <util/threadinterrupt.h>
 #include <util/time.h>
 
-#include <chrono>
+#include <cstdint>
+#include <limits>
 #include <memory>
 #include <span>
 #include <string>
 #include <unordered_map>
 
+class CThreadInterrupt;
+
 /**
  * Maximum time to wait for I/O readiness.
  * It will take up until this time to break off in case of an interruption.
diff --git a/src/util/stdmutex.h b/src/util/stdmutex.h
new file mode 100644
index 000000000000..2cc05013a59a
--- /dev/null
+++ b/src/util/stdmutex.h
@@ -0,0 +1,45 @@
+// Copyright (c) 2009-2010 Satoshi Nakamoto
+// Copyright (c) 2009-present The Bitcoin Core developers
+// Distributed under the MIT software license, see the accompanying
+// file COPYING or http://www.opensource.org/licenses/mit-license.php.
+
+#ifndef BITCOIN_UTIL_STDMUTEX_H
+#define BITCOIN_UTIL_STDMUTEX_H
+
+// This header declares threading primitives compatible with Clang
+// Thread Safety Analysis and provides appropriate annotation macros.
+#include <threadsafety.h> // IWYU pragma: export
+
+#include <util/macros.h>
+
+#include <mutex>
+
+// StdMutex provides an annotated version of std::mutex for us,
+// and should only be used when sync.h Mutex/LOCK/etc are not usable.
+class LOCKABLE StdMutex : public std::mutex
+{
+public:
+#ifdef __clang__
+    //! For negative capabilities in the Clang Thread Safety Analysis.
+    //! A negative requirement uses the EXCLUSIVE_LOCKS_REQUIRED attribute, in conjunction
+    //! with the ! operator, to indicate that a mutex should not be held.
+    const StdMutex& operator!() const { return *this; }
+#endif // __clang__
+
+    // StdMutex::Guard provides an annotated version of std::lock_guard for us.
+    class SCOPED_LOCKABLE Guard : public std::lock_guard<StdMutex>
+    {
+    public:
+        explicit Guard(StdMutex& cs) EXCLUSIVE_LOCK_FUNCTION(cs) : std::lock_guard<StdMutex>(cs) {}
+        ~Guard() UNLOCK_FUNCTION() = default;
+    };
+
+    static inline StdMutex& CheckNotHeld(StdMutex& cs) EXCLUSIVE_LOCKS_REQUIRED(!cs) LOCK_RETURNED(cs) { return cs; }
+};
+
+// Provide STDLOCK(..) wrapper around StdMutex::Guard that checks the lock is not already held
+#define STDLOCK(cs) StdMutex::Guard UNIQUE_NAME(criticalblock){StdMutex::CheckNotHeld(cs)}
+
+using StdLockGuard = StdMutex::Guard; // TODO: remove, provided for backwards compat only
+
+#endif // BITCOIN_UTIL_STDMUTEX_H
diff --git a/src/util/strencodings.cpp b/src/util/strencodings.cpp
index 289f49d46a7f..5edc686ca584 100644
--- a/src/util/strencodings.cpp
+++ b/src/util/strencodings.cpp
@@ -7,13 +7,13 @@
 
 #include <crypto/hex_base.h>
 #include <span.h>
+#include <util/check.h>
+#include <util/overflow.h>
 
-#include <array>
-#include <cassert>
-#include <cstring>
+#include <compare>
 #include <limits>
 #include <optional>
-#include <ostream>
+#include <sstream>
 #include <string>
 #include <vector>
 
@@ -100,7 +100,7 @@ std::string EncodeBase64(std::span<const unsigned char> input)
     static const char *pbase64 = "ABCDEFGHIJKLMNOPQRSTUVWXYZabcdefghijklmnopqrstuvwxyz0123456789+/";
 
     std::string str;
-    str.reserve(((input.size() + 2) / 3) * 4);
+    str.reserve(CeilDiv(input.size(), 3u) * 4);
     ConvertBits<8, 6, true>([&](int v) { str += pbase64[v]; }, input.begin(), input.end());
     while (str.size() % 4) str += '=';
     return str;
@@ -146,7 +146,7 @@ std::string EncodeBase32(std::span<const unsigned char> input, bool pad)
     static const char *pbase32 = "abcdefghijklmnopqrstuvwxyz234567";
 
     std::string str;
-    str.reserve(((input.size() + 4) / 5) * 8);
+    str.reserve(CeilDiv(input.size(), 5u) * 8);
     ConvertBits<8, 5, true>([&](int v) { str += pbase32[v]; }, input.begin(), input.end());
     if (pad) {
         while (str.size() % 8) {
@@ -427,3 +427,16 @@ std::optional<uint64_t> ParseByteUnits(std::string_view str, ByteUnit default_mu
     }
     return *parsed_num * unit_amount;
 }
+
+bool CaseInsensitiveEqual(std::string_view s1, std::string_view s2)
+{
+    if (s1.size() != s2.size()) return false;
+    for (size_t i = 0; i < s1.size(); ++i) {
+        char c1 = s1[i];
+        if (c1 >= 'A' && c1 <= 'Z') c1 -= ('A' - 'a');
+        char c2 = s2[i];
+        if (c2 >= 'A' && c2 <= 'Z') c2 -= ('A' - 'a');
+        if (c1 != c2) return false;
+    }
+    return true;
+}
diff --git a/src/util/strencodings.h b/src/util/strencodings.h
index faff83bb8cb4..30770e6dad71 100644
--- a/src/util/strencodings.h
+++ b/src/util/strencodings.h
@@ -9,11 +9,9 @@
 #ifndef BITCOIN_UTIL_STRENCODINGS_H
 #define BITCOIN_UTIL_STRENCODINGS_H
 
-#include <crypto/hex_base.h>
 #include <span.h>
 #include <util/string.h>
 
-#include <algorithm>
 #include <array>
 #include <bit>
 #include <charconv>
@@ -21,6 +19,7 @@
 #include <cstdint>
 #include <limits>
 #include <optional>
+#include <span>
 #include <string>
 #include <string_view>
 #include <system_error>
@@ -326,6 +325,14 @@ std::string Capitalize(std::string str);
  */
 std::optional<uint64_t> ParseByteUnits(std::string_view str, ByteUnit default_multiplier);
 
+/**
+ *  Locale-independent, ASCII-only comparator
+ *  @param[in] s1 a string to compare
+ *  @param[in] s2 another string to compare
+ *  @returns true if s1 == s2 when both strings are converted to lowercase
+ */
+bool CaseInsensitiveEqual(std::string_view s1, std::string_view s2);
+
 namespace util {
 /** consteval version of HexDigit() without the lookup table. */
 consteval uint8_t ConstevalHexDigit(const char c)
@@ -354,20 +361,6 @@ struct Hex {
 };
 } // namespace detail
 
-struct AsciiCaseInsensitiveKeyEqual {
-    bool operator()(std::string_view s1, std::string_view s2) const
-    {
-        return ToLower(s1) == ToLower(s2);
-    }
-};
-
-struct AsciiCaseInsensitiveHash {
-    size_t operator()(std::string_view s) const
-    {
-        return std::hash<std::string>{}(ToLower(s));
-    }
-};
-
 /**
  * ""_hex is a compile-time user-defined literal returning a
  * `std::array<std::byte>`, equivalent to ParseHex(). Variants provided:
diff --git a/src/util/string.cpp b/src/util/string.cpp
index c3b4b474d34b..d1ef7a185f1d 100644
--- a/src/util/string.cpp
+++ b/src/util/string.cpp
@@ -4,7 +4,10 @@
 
 #include <util/string.h>
 
+#include <iterator>
+#include <memory>
 #include <regex>
+#include <stdexcept>
 #include <string>
 
 namespace util {
@@ -67,4 +70,9 @@ size_t LineReader::Remaining() const
 {
     return std::distance(it, end);
 }
+
+size_t LineReader::Consumed() const
+{
+    return std::distance(start, it);
+}
 } // namespace util
diff --git a/src/util/string.h b/src/util/string.h
index 89e13099a76d..da4ce5a33ac3 100644
--- a/src/util/string.h
+++ b/src/util/string.h
@@ -5,13 +5,14 @@
 #ifndef BITCOIN_UTIL_STRING_H
 #define BITCOIN_UTIL_STRING_H
 
-#include <span.h>
-
+#include <algorithm>
 #include <array>
+#include <cstddef>
 #include <cstdint>
-#include <cstring>
+#include <initializer_list>
 #include <locale>
 #include <optional>
+#include <span>
 #include <sstream>
 #include <string>
 #include <string_view>
@@ -269,6 +270,7 @@ struct LineReader {
     std::span<const std::byte>::iterator it;
 
     explicit LineReader(std::span<const std::byte> buffer, size_t max_line_length);
+    explicit LineReader(std::string_view str, size_t max_line_length) : LineReader{std::as_bytes(std::span{str}), max_line_length} {}
 
     /**
      * Returns a string from current iterator position up to (but not including) next \n
@@ -294,6 +296,11 @@ struct LineReader {
      * Returns remaining size of bytes in buffer
      */
     size_t Remaining() const;
+
+    /**
+     * Returns number of bytes already read from buffer
+     */
+    size_t Consumed() const;
 };
 } // namespace util
 
diff --git a/src/util/subprocess.h b/src/util/subprocess.h
index 8b9171308dd9..3d01f4b7f9c5 100644
--- a/src/util/subprocess.h
+++ b/src/util/subprocess.h
@@ -36,10 +36,10 @@ Documentation for C++ subprocessing library.
 #ifndef BITCOIN_UTIL_SUBPROCESS_H
 #define BITCOIN_UTIL_SUBPROCESS_H
 
+#include <util/check.h>
 #include <util/syserror.h>
 
 #include <algorithm>
-#include <cassert>
 #include <csignal>
 #include <cstdio>
 #include <cstdlib>
diff --git a/src/util/syserror.cpp b/src/util/syserror.cpp
index e06ed0cdbbff..e7637afe49c1 100644
--- a/src/util/syserror.cpp
+++ b/src/util/syserror.cpp
@@ -4,9 +4,10 @@
 
 #include <bitcoin-build-config.h> // IWYU pragma: keep
 
-#include <tinyformat.h>
 #include <util/syserror.h>
 
+#include <tinyformat.h>
+
 #include <cstring>
 #include <string>
 
diff --git a/src/util/thread.cpp b/src/util/thread.cpp
index 0fde73c4e298..5b20e807b4c7 100644
--- a/src/util/thread.cpp
+++ b/src/util/thread.cpp
@@ -11,7 +11,6 @@
 #include <exception>
 #include <functional>
 #include <string>
-#include <utility>
 
 void util::TraceThread(std::string_view thread_name, std::function<void()> thread_func)
 {
diff --git a/src/util/thread.h b/src/util/thread.h
index cb1dd86a741c..d398b188a7be 100644
--- a/src/util/thread.h
+++ b/src/util/thread.h
@@ -6,7 +6,7 @@
 #define BITCOIN_UTIL_THREAD_H
 
 #include <functional>
-#include <string>
+#include <string_view>
 
 namespace util {
 /**
diff --git a/src/util/threadinterrupt.h b/src/util/threadinterrupt.h
index 84ced9277aa8..ba45f11795e2 100644
--- a/src/util/threadinterrupt.h
+++ b/src/util/threadinterrupt.h
@@ -6,10 +6,9 @@
 #define BITCOIN_UTIL_THREADINTERRUPT_H
 
 #include <sync.h>
-#include <threadsafety.h>
+#include <util/time.h>
 
 #include <atomic>
-#include <chrono>
 #include <condition_variable>
 
 /**
diff --git a/src/util/threadnames.cpp b/src/util/threadnames.cpp
index 310f60f639ce..0615b331994d 100644
--- a/src/util/threadnames.cpp
+++ b/src/util/threadnames.cpp
@@ -2,18 +2,17 @@
 // Distributed under the MIT software license, see the accompanying
 // file COPYING or http://www.opensource.org/licenses/mit-license.php.
 
+#include <util/threadnames.h>
+
+#include <algorithm>
 #include <cstring>
 #include <string>
-#include <thread>
-#include <utility>
 
 #if (defined(__FreeBSD__) || defined(__OpenBSD__) || defined(__DragonFly__))
 #include <pthread.h>
 #include <pthread_np.h>
 #endif
 
-#include <util/threadnames.h>
-
 #if __has_include(<sys/prctl.h>)
 #include <sys/prctl.h>
 #endif
diff --git a/src/util/threadpool.h b/src/util/threadpool.h
index ca39afd4ab29..ff0590f860a5 100644
--- a/src/util/threadpool.h
+++ b/src/util/threadpool.h
@@ -7,8 +7,8 @@
 
 #include <sync.h>
 #include <tinyformat.h>
-#include <util/expected.h>
 #include <util/check.h>
+#include <util/expected.h>
 #include <util/thread.h>
 
 #include <algorithm>
@@ -16,6 +16,7 @@
 #include <functional>
 #include <future>
 #include <queue>
+#include <ranges>
 #include <thread>
 #include <type_traits>
 #include <utility>
@@ -156,6 +157,15 @@ class ThreadPool
         Interrupted,
     };
 
+    template <class F>
+    using Future = std::future<std::invoke_result_t<F>>;
+
+    template <class R>
+    using RangeFuture = Future<std::ranges::range_reference_t<R>>;
+
+    template <class F>
+    using PackagedTask = std::packaged_task<std::invoke_result_t<F>()>;
+
     /**
      * @brief Enqueues a new task for asynchronous execution.
      *
@@ -171,9 +181,9 @@ class ThreadPool
      *          uncaught exceptions, as they would otherwise be silently discarded.
      */
     template <class F>
-    [[nodiscard]] util::Expected<std::future<std::invoke_result_t<F>>, SubmitError> Submit(F&& fn) noexcept EXCLUSIVE_LOCKS_REQUIRED(!m_mutex)
+    [[nodiscard]] util::Expected<Future<F>, SubmitError> Submit(F&& fn) noexcept EXCLUSIVE_LOCKS_REQUIRED(!m_mutex)
     {
-        std::packaged_task<std::invoke_result_t<F>()> task{std::forward<F>(fn)};
+        PackagedTask<F> task{std::forward<F>(fn)};
         auto future{task.get_future()};
         {
             LOCK(m_mutex);
@@ -186,6 +196,46 @@ class ThreadPool
         return {std::move(future)};
     }
 
+    /**
+     * @brief Enqueues a range of tasks for asynchronous execution.
+     *
+     * @param  fns Callables to execute asynchronously.
+     * @return On success, a vector of futures containing each element of fns's result in order.
+     *         On failure, an error indicating why the range was rejected:
+     *         - SubmitError::Inactive: Pool has no workers (never started or already stopped).
+     *         - SubmitError::Interrupted: Pool task acceptance has been interrupted.
+     *
+     * This is more efficient when submitting many tasks at once, since
+     * the queue lock is only taken once internally and all worker threads are
+     * notified. For single tasks, Submit() is preferred since only one worker
+     * thread is notified.
+     *
+     * Thread-safe: Can be called from any thread, including within submitted callables.
+     *
+     * @warning Ignoring the returned futures requires guarding tasks against
+     *          uncaught exceptions, as they would otherwise be silently discarded.
+     */
+    template <std::ranges::sized_range R>
+        requires(!std::is_lvalue_reference_v<R>)
+    [[nodiscard]] util::Expected<std::vector<RangeFuture<R>>, SubmitError> Submit(R&& fns) noexcept EXCLUSIVE_LOCKS_REQUIRED(!m_mutex)
+    {
+        std::vector<RangeFuture<R>> futures;
+        futures.reserve(std::ranges::size(fns));
+
+        {
+            LOCK(m_mutex);
+            if (m_workers.empty()) return util::Unexpected{SubmitError::Inactive};
+            if (m_interrupt) return util::Unexpected{SubmitError::Interrupted};
+            for (auto&& fn : fns) {
+                PackagedTask<std::ranges::range_reference_t<R>> task{std::move(fn)};
+                futures.emplace_back(task.get_future());
+                m_work_queue.emplace(std::move(task));
+            }
+        }
+        m_cv.notify_all();
+        return {std::move(futures)};
+    }
+
     /**
      * @brief Execute a single queued task synchronously.
      * Removes one task from the queue and executes it on the calling thread.
diff --git a/src/util/time.cpp b/src/util/time.cpp
index 9e0715e52509..6a199ebc36a5 100644
--- a/src/util/time.cpp
+++ b/src/util/time.cpp
@@ -5,7 +5,6 @@
 
 #include <util/time.h>
 
-#include <compat/compat.h>
 #include <tinyformat.h>
 #include <util/check.h>
 #include <util/strencodings.h>
@@ -13,11 +12,18 @@
 #include <array>
 #include <atomic>
 #include <chrono>
+#include <compare>
 #include <optional>
 #include <string>
 #include <string_view>
 #include <thread>
 
+#ifdef WIN32
+#include <winsock2.h>
+#else
+#include <sys/time.h>
+#endif
+
 static constexpr std::array<std::string_view, 7> weekdays{"Thu", "Fri", "Sat", "Sun", "Mon", "Tue", "Wed"}; // 1970-01-01 was a Thursday.
 static constexpr std::array<std::string_view, 12> months{"Jan", "Feb", "Mar", "Apr", "May", "Jun", "Jul", "Aug", "Sep", "Oct", "Nov", "Dec"};
 
diff --git a/src/util/time.h b/src/util/time.h
index 59abc4d5a7f6..4630798954b7 100644
--- a/src/util/time.h
+++ b/src/util/time.h
@@ -6,15 +6,24 @@
 #ifndef BITCOIN_UTIL_TIME_H
 #define BITCOIN_UTIL_TIME_H
 
+// The `util/time.h` header is designed to be a drop-in replacement for `chrono`.
 #include <chrono> // IWYU pragma: export
 #include <cstdint>
+#include <ctime>
 #include <optional>
 #include <string>
 #include <string_view>
 
+#ifdef WIN32
+#include <winsock2.h>
+#else
+#include <sys/time.h>
+#endif
+
 using namespace std::chrono_literals;
 
-/** Mockable clock in the context of tests, otherwise the system clock */
+/// Version of the system clock that is mockable in the context of tests (via
+/// NodeClockContext or ::SetMockTime), otherwise the system clock.
 struct NodeClock : public std::chrono::system_clock {
     using time_point = std::chrono::time_point<NodeClock>;
     /** Return current system time or mocked time, if set */
@@ -31,10 +40,9 @@ using SteadyMicroseconds = std::chrono::time_point<std::chrono::steady_clock, st
 
 using SystemClock = std::chrono::system_clock;
 
-/**
- * Version of SteadyClock that is mockable in the context of tests (set the
- * current value with SetMockTime), otherwise the system steady clock.
- */
+/// Version of SteadyClock that is mockable in the context of tests (via
+/// SteadyClockContext, or Self::SetMockTime), otherwise the system steady
+/// clock.
 struct MockableSteadyClock : public std::chrono::steady_clock {
     using time_point = std::chrono::time_point<MockableSteadyClock>;
 
diff --git a/src/util/tokenpipe.cpp b/src/util/tokenpipe.cpp
index c982fa6fc474..6f701e457467 100644
--- a/src/util/tokenpipe.cpp
+++ b/src/util/tokenpipe.cpp
@@ -1,15 +1,18 @@
 // Copyright (c) 2021-present The Bitcoin Core developers
 // Distributed under the MIT software license, see the accompanying
 // file COPYING or http://www.opensource.org/licenses/mit-license.php.
-#include <util/tokenpipe.h>
 
 #include <bitcoin-build-config.h> // IWYU pragma: keep
 
+#include <util/tokenpipe.h>
+
 #ifndef WIN32
 
 #include <cerrno>
-#include <fcntl.h>
 #include <optional>
+
+#include <fcntl.h>
+#include <sys/types.h>
 #include <unistd.h>
 
 TokenPipeEnd TokenPipe::TakeReadEnd()
diff --git a/src/util/translation.h b/src/util/translation.h
index cc29eef660ca..26fb4b8cfbfe 100644
--- a/src/util/translation.h
+++ b/src/util/translation.h
@@ -6,9 +6,9 @@
 #define BITCOIN_UTIL_TRANSLATION_H
 
 #include <tinyformat.h>
+#include <util/check.h>
 #include <util/string.h>
 
-#include <cassert>
 #include <functional>
 #include <string>
 
diff --git a/src/validation.cpp b/src/validation.cpp
index 5c02ec2341cd..a2b93233b910 100644
--- a/src/validation.cpp
+++ b/src/validation.cpp
@@ -437,7 +437,7 @@ class MemPoolAccept
 public:
     explicit MemPoolAccept(CTxMemPool& mempool, Chainstate& active_chainstate) :
         m_pool(mempool),
-        m_view(&m_dummy),
+        m_view(&CoinsViewEmpty::Get()),
         m_viewmempool(&active_chainstate.CoinsTip(), m_pool),
         m_active_chainstate(active_chainstate)
     {
@@ -737,10 +737,6 @@ class MemPoolAccept
     /** When m_view is connected to m_viewmempool as its backend, it can pull coins from the mempool and from the UTXO
      * set. This is also where temporary coins are stored. */
     CCoinsViewMemPool m_viewmempool;
-    /** When m_view is connected to m_dummy, it can no longer look up coins from the mempool or UTXO set (meaning no disk
-     * operations happen), but can still return coins it accessed previously. Useful for keeping track of which coins
-     * were pulled from disk. */
-    CCoinsView m_dummy;
 
     Chainstate& m_active_chainstate;
 
@@ -867,14 +863,14 @@ bool MemPoolAccept::PreChecks(ATMPArgs& args, Workspace& ws)
         }
     }
 
-    // This is const, but calls into the back end CoinsViews. The CCoinsViewDB at the bottom of the
-    // hierarchy brings the best block into scope. See CCoinsViewDB::GetBestBlock().
-    m_view.GetBestBlock();
+    // This is const, but calls into `CCoinsViewCache::GetBestBlock()` to refresh
+    // the cached best block through `m_viewmempool` after caching inputs.
+    (void)m_view.GetBestBlock();
 
-    // we have all inputs cached now, so switch back to dummy (to protect
-    // against bugs where we pull more inputs from disk that miss being added
-    // to coins_to_uncache)
-    m_view.SetBackend(m_dummy);
+    // All required inputs are cached now, so switch m_view to the empty backend.
+    // This keeps already-fetched cache entries for later checks and prevents new
+    // backend lookups (which would avoid coins_to_uncache tracking).
+    m_view.SetBackend(CoinsViewEmpty::Get());
 
     assert(m_active_chainstate.m_blockman.LookupBlockIndex(m_view.GetBestBlock()) == m_active_chainstate.m_chain.Tip());
 
@@ -893,8 +889,11 @@ bool MemPoolAccept::PreChecks(ATMPArgs& args, Workspace& ws)
         return false; // state filled in by CheckTxInputs
     }
 
-    if (m_pool.m_opts.require_standard && !AreInputsStandard(tx, m_view)) {
-        return state.Invalid(TxValidationResult::TX_INPUTS_NOT_STANDARD, "bad-txns-nonstandard-inputs");
+    if (m_pool.m_opts.require_standard) {
+        state = ValidateInputsStandardness(tx, m_view);
+        if (state.IsInvalid()) {
+            return false;
+        }
     }
 
     // Check for non-standard witnesses.
@@ -1969,12 +1968,12 @@ void Chainstate::InvalidChainFound(CBlockIndex* pindexNew)
         m_chainman.RecalculateBestHeader();
     }
 
-    LogInfo("%s: invalid block=%s  height=%d  log2_work=%f  date=%s\n", __func__,
+    LogInfo("%s: invalid block=%s height=%d log2_work=%f date=%s", __func__,
       pindexNew->GetBlockHash().ToString(), pindexNew->nHeight,
       log(pindexNew->nChainWork.getdouble())/log(2.0), FormatISO8601DateTime(pindexNew->GetBlockTime()));
     CBlockIndex *tip = m_chain.Tip();
     assert (tip);
-    LogInfo("%s:  current best=%s  height=%d  log2_work=%f  date=%s\n", __func__,
+    LogInfo("%s: current best=%s height=%d log2_work=%f date=%s", __func__,
       tip->GetBlockHash().ToString(), m_chain.Height(), log(tip->nChainWork.getdouble())/log(2.0),
       FormatISO8601DateTime(tip->GetBlockTime()));
     CheckForkWarningConditions();
@@ -2858,7 +2857,8 @@ static void UpdateTipLog(
     const CBlockIndex* tip,
     const std::string& func_name,
     const std::string& prefix,
-    const std::string& warning_messages) EXCLUSIVE_LOCKS_REQUIRED(::cs_main)
+    const std::string& warning_messages,
+    const bool background_validation) EXCLUSIVE_LOCKS_REQUIRED(::cs_main)
 {
 
     AssertLockHeld(::cs_main);
@@ -2869,7 +2869,7 @@ static void UpdateTipLog(
                    tip->GetBlockHash().ToString(), tip->nHeight, tip->nVersion,
                    log(tip->nChainWork.getdouble()) / log(2.0), tip->m_chain_tx_count,
                    FormatISO8601DateTime(tip->GetBlockTime()),
-                   chainman.GuessVerificationProgress(tip),
+                   background_validation ? chainman.GetBackgroundVerificationProgress(*tip) : chainman.GuessVerificationProgress(tip),
                    coins_tip.DynamicMemoryUsage() * (1.0 / (1 << 20)),
                    coins_tip.GetCacheSize(),
                    !warning_messages.empty() ? strprintf(" warning='%s'", warning_messages) : "");
@@ -2886,7 +2886,7 @@ void Chainstate::UpdateTip(const CBlockIndex* pindexNew)
         // Only log every so often so that we don't bury log messages at the tip.
         constexpr int BACKGROUND_LOG_INTERVAL = 2000;
         if (pindexNew->nHeight % BACKGROUND_LOG_INTERVAL == 0) {
-            UpdateTipLog(m_chainman, coins_tip, pindexNew, __func__, "[background validation] ", "");
+            UpdateTipLog(m_chainman, coins_tip, pindexNew, __func__, "[background validation] ", "", /*background_validation=*/true);
         }
         return;
     }
@@ -2909,7 +2909,7 @@ void Chainstate::UpdateTip(const CBlockIndex* pindexNew)
         }
     }
     UpdateTipLog(m_chainman, coins_tip, pindexNew, __func__, "",
-                 util::Join(warning_messages, Untranslated(", ")).original);
+                 util::Join(warning_messages, Untranslated(", ")).original, /*background_validation=*/false);
 }
 
 /** Disconnect m_chain's tip.
@@ -2982,62 +2982,27 @@ bool Chainstate::DisconnectTip(BlockValidationState& state, DisconnectedBlockTra
     // Let wallets know transactions went from 1-confirmed to
     // 0-confirmed or conflicted:
     if (m_chainman.m_options.signals) {
-        m_chainman.m_options.signals->BlockDisconnected(pblock, pindexDelete);
+        m_chainman.m_options.signals->BlockDisconnected(std::move(pblock), pindexDelete);
     }
     return true;
 }
 
-struct PerBlockConnectTrace {
-    CBlockIndex* pindex = nullptr;
+struct ConnectedBlock {
+    const CBlockIndex* pindex;
     std::shared_ptr<const CBlock> pblock;
-    PerBlockConnectTrace() = default;
-};
-/**
- * Used to track blocks whose transactions were applied to the UTXO state as a
- * part of a single ActivateBestChainStep call.
- *
- * This class is single-use, once you call GetBlocksConnected() you have to throw
- * it away and make a new one.
- */
-class ConnectTrace {
-private:
-    std::vector<PerBlockConnectTrace> blocksConnected;
-
-public:
-    explicit ConnectTrace() : blocksConnected(1) {}
-
-    void BlockConnected(CBlockIndex* pindex, std::shared_ptr<const CBlock> pblock) {
-        assert(!blocksConnected.back().pindex);
-        assert(pindex);
-        assert(pblock);
-        blocksConnected.back().pindex = pindex;
-        blocksConnected.back().pblock = std::move(pblock);
-        blocksConnected.emplace_back();
-    }
-
-    std::vector<PerBlockConnectTrace>& GetBlocksConnected() {
-        // We always keep one extra block at the end of our list because
-        // blocks are added after all the conflicted transactions have
-        // been filled in. Thus, the last entry should always be an empty
-        // one waiting for the transactions from the next block. We pop
-        // the last entry here to make sure the list we return is sane.
-        assert(!blocksConnected.back().pindex);
-        blocksConnected.pop_back();
-        return blocksConnected;
-    }
 };
 
 /**
  * Connect a new block to m_chain. block_to_connect is either nullptr or a pointer to a CBlock
  * corresponding to pindexNew, to bypass loading it again from disk.
  *
- * The block is added to connectTrace if connection succeeds.
+ * The block is added to connected_blocks if connection succeeds.
  */
 bool Chainstate::ConnectTip(
     BlockValidationState& state,
     CBlockIndex* pindexNew,
     std::shared_ptr<const CBlock> block_to_connect,
-    ConnectTrace& connectTrace,
+    std::vector<ConnectedBlock>& connected_blocks,
     DisconnectedBlockTransactions& disconnectpool)
 {
     AssertLockHeld(cs_main);
@@ -3134,7 +3099,7 @@ bool Chainstate::ConnectTip(
     Chainstate& current_cs{m_chainman.CurrentChainstate()};
     m_chainman.MaybeValidateSnapshot(*this, current_cs);
 
-    connectTrace.BlockConnected(pindexNew, std::move(block_to_connect));
+    connected_blocks.emplace_back(pindexNew, std::move(block_to_connect));
     return true;
 }
 
@@ -3158,9 +3123,8 @@ CBlockIndex* Chainstate::FindMostWorkChain()
 
         // Check whether all blocks on the path between the currently active chain and the candidate are valid.
         // Just going until the active chain is an optimization, as we know all blocks in it are valid already.
-        CBlockIndex *pindexTest = pindexNew;
         bool fInvalidAncestor = false;
-        while (pindexTest && !m_chain.Contains(pindexTest)) {
+        for (CBlockIndex *pindexTest = pindexNew; pindexTest && !m_chain.Contains(pindexTest); pindexTest = pindexTest->pprev) {
             assert(pindexTest->HaveNumChainTxs() || pindexTest->nHeight == 0);
 
             // Pruned nodes may have entries in setBlockIndexCandidates for
@@ -3174,27 +3138,21 @@ CBlockIndex* Chainstate::FindMostWorkChain()
                 if (fFailedChain && (m_chainman.m_best_invalid == nullptr || pindexNew->nChainWork > m_chainman.m_best_invalid->nChainWork)) {
                     m_chainman.m_best_invalid = pindexNew;
                 }
-                CBlockIndex *pindexFailed = pindexNew;
                 // Remove the entire chain from the set.
-                while (pindexTest != pindexFailed) {
-                    if (fFailedChain) {
-                        pindexFailed->nStatus |= BLOCK_FAILED_VALID;
-                        m_blockman.m_dirty_blockindex.insert(pindexFailed);
-                    } else if (fMissingData) {
-                        // If we're missing data, then add back to m_blocks_unlinked,
-                        // so that if the block arrives in the future we can try adding
-                        // to setBlockIndexCandidates again.
+                for (CBlockIndex *pindexFailed = pindexNew; pindexFailed != pindexTest; pindexFailed = pindexFailed->pprev) {
+                    if (fMissingData && !fFailedChain) {
+                        // If we're missing data and not a descendant of an invalid block,
+                        // then add back to m_blocks_unlinked, so that if the block arrives in the future
+                        // we can try adding to setBlockIndexCandidates again.
                         m_blockman.m_blocks_unlinked.insert(
                             std::make_pair(pindexFailed->pprev, pindexFailed));
                     }
                     setBlockIndexCandidates.erase(pindexFailed);
-                    pindexFailed = pindexFailed->pprev;
                 }
                 setBlockIndexCandidates.erase(pindexTest);
                 fInvalidAncestor = true;
                 break;
             }
-            pindexTest = pindexTest->pprev;
         }
         if (!fInvalidAncestor)
             return pindexNew;
@@ -3219,7 +3177,7 @@ void Chainstate::PruneBlockIndexCandidates() {
  *
  * @returns true unless a system error occurred
  */
-bool Chainstate::ActivateBestChainStep(BlockValidationState& state, CBlockIndex* pindexMostWork, const std::shared_ptr<const CBlock>& pblock, bool& fInvalidFound, ConnectTrace& connectTrace)
+bool Chainstate::ActivateBestChainStep(BlockValidationState& state, CBlockIndex* pindexMostWork, const std::shared_ptr<const CBlock>& pblock, bool& fInvalidFound, std::vector<ConnectedBlock>& connected_blocks)
 {
     AssertLockHeld(cs_main);
     if (m_mempool) AssertLockHeld(m_mempool->cs);
@@ -3264,7 +3222,7 @@ bool Chainstate::ActivateBestChainStep(BlockValidationState& state, CBlockIndex*
 
         // Connect new blocks.
         for (CBlockIndex* pindexConnect : vpindexToConnect | std::views::reverse) {
-            if (!ConnectTip(state, pindexConnect, pindexConnect == pindexMostWork ? pblock : std::shared_ptr<const CBlock>(), connectTrace, disconnectpool)) {
+            if (!ConnectTip(state, pindexConnect, pindexConnect == pindexMostWork ? pblock : std::shared_ptr<const CBlock>(), connected_blocks, disconnectpool)) {
                 if (state.IsInvalid()) {
                     // The block violates a consensus rule.
                     if (state.GetResult() != BlockValidationResult::BLOCK_MUTATED) {
@@ -3389,7 +3347,7 @@ bool Chainstate::ActivateBestChain(BlockValidationState& state, std::shared_ptr<
         {
             LOCK(cs_main);
             {
-            // Lock transaction pool for at least as long as it takes for connectTrace to be consumed
+            // Lock transaction pool for at least as long as it takes for connected_blocks to be consumed
             LOCK(MempoolMutex());
             const bool was_in_ibd = m_chainman.IsInitialBlockDownload();
             CBlockIndex* starting_tip = m_chain.Tip();
@@ -3397,7 +3355,7 @@ bool Chainstate::ActivateBestChain(BlockValidationState& state, std::shared_ptr<
             do {
                 // We absolutely may not unlock cs_main until we've made forward progress
                 // (with the exception of shutdown due to hardware issues, low disk space, etc).
-                ConnectTrace connectTrace; // Destructed before cs_main is unlocked
+                std::vector<ConnectedBlock> connected_blocks; // Destructed before cs_main is unlocked
 
                 if (pindexMostWork == nullptr) {
                     pindexMostWork = FindMostWorkChain();
@@ -3414,7 +3372,7 @@ bool Chainstate::ActivateBestChain(BlockValidationState& state, std::shared_ptr<
                 // in case snapshot validation is completed during ActivateBestChainStep, the
                 // result of GetRole() changes from BACKGROUND to NORMAL.
                const ChainstateRole chainstate_role{this->GetRole()};
-                if (!ActivateBestChainStep(state, pindexMostWork, pblock && pblock->GetHash() == pindexMostWork->GetBlockHash() ? pblock : nullBlockPtr, fInvalidFound, connectTrace)) {
+                if (!ActivateBestChainStep(state, pindexMostWork, pblock && pblock->GetHash() == pindexMostWork->GetBlockHash() ? pblock : nullBlockPtr, fInvalidFound, connected_blocks)) {
                     // A system error occurred
                     return false;
                 }
@@ -3426,10 +3384,9 @@ bool Chainstate::ActivateBestChain(BlockValidationState& state, std::shared_ptr<
                 }
                 pindexNewTip = m_chain.Tip();
 
-                for (const PerBlockConnectTrace& trace : connectTrace.GetBlocksConnected()) {
-                    assert(trace.pblock && trace.pindex);
+                for (auto& [index, block] : std::move(connected_blocks)) {
                     if (m_chainman.m_options.signals) {
-                        m_chainman.m_options.signals->BlockConnected(chainstate_role, trace.pblock, trace.pindex);
+                        m_chainman.m_options.signals->BlockConnected(chainstate_role, std::move(Assert(block)), Assert(index));
                     }
                 }
 
@@ -4109,7 +4066,7 @@ arith_uint256 CalculateClaimedHeadersWork(std::span<const CBlockHeader> headers)
  *  v0.12 and v0.15 (when no additional protection was in place) whereby an attacker could unboundedly
  *  grow our in-memory block index. See https://bitcoincore.org/en/2024/07/03/disclose-header-spam.
  */
-static bool ContextualCheckBlockHeader(const CBlockHeader& block, BlockValidationState& state, BlockManager& blockman, const ChainstateManager& chainman, const CBlockIndex* pindexPrev) EXCLUSIVE_LOCKS_REQUIRED(::cs_main)
+static bool ContextualCheckBlockHeader(const CBlockHeader& block, BlockValidationState& state, const ChainstateManager& chainman, const CBlockIndex* pindexPrev) EXCLUSIVE_LOCKS_REQUIRED(::cs_main)
 {
     AssertLockHeld(::cs_main);
     assert(pindexPrev != nullptr);
@@ -4253,7 +4210,7 @@ bool ChainstateManager::AcceptBlockHeader(const CBlockHeader& block, BlockValida
             LogDebug(BCLog::VALIDATION, "header %s has prev block invalid: %s\n", hash.ToString(), block.hashPrevBlock.ToString());
             return state.Invalid(BlockValidationResult::BLOCK_INVALID_PREV, "bad-prevblk");
         }
-        if (!ContextualCheckBlockHeader(block, state, m_blockman, *this, pindexPrev)) {
+        if (!ContextualCheckBlockHeader(block, state, *this, pindexPrev)) {
             LogDebug(BCLog::VALIDATION, "%s: Consensus::ContextualCheckBlockHeader: %s, %s\n", __func__, hash.ToString(), state.ToString());
             return false;
         }
@@ -4534,7 +4491,7 @@ BlockValidationState TestBlockValidity(
      * - do run ContextualCheckBlock()
      */
 
-    if (!ContextualCheckBlockHeader(block, state, chainstate.m_blockman, chainstate.m_chainman, tip)) {
+    if (!ContextualCheckBlockHeader(block, state, chainstate.m_chainman, tip)) {
         if (state.IsValid()) NONFATAL_UNREACHABLE();
         return state;
     }
@@ -4921,7 +4878,7 @@ void Chainstate::PopulateBlockIndexCandidates()
         // With assumeutxo, the snapshot block is a candidate for the tip, but it
         // may not have BLOCK_VALID_TRANSACTIONS (e.g. if we haven't yet downloaded
         // the block), so we special-case it here.
-        if (pindex == SnapshotBase() || pindex == TargetBlock() ||
+        if (pindex == SnapshotBase() ||
                 (pindex->IsValid(BLOCK_VALID_TRANSACTIONS) &&
                  (pindex->HaveNumChainTxs() || pindex->pprev == nullptr))) {
             TryAddBlockIndexCandidate(pindex);
@@ -5556,6 +5513,19 @@ double ChainstateManager::GuessVerificationProgress(const CBlockIndex* pindex) c
     return std::min<double>(pindex->m_chain_tx_count / fTxTotal, 1.0);
 }
 
+double ChainstateManager::GetBackgroundVerificationProgress(const CBlockIndex& pindex) const
+{
+    AssertLockHeld(GetMutex());
+    Assert(HistoricalChainstate());
+    auto target_block = HistoricalChainstate()->TargetBlock();
+
+    if (pindex.m_chain_tx_count == 0 || target_block->m_chain_tx_count == 0) {
+        LogDebug(BCLog::VALIDATION, "[background validation] Block %d has unset m_chain_tx_count. Unable to estimate verification progress.", pindex.nHeight);
+        return 0.0;
+    }
+    return static_cast<double>(pindex.m_chain_tx_count) / static_cast<double>(target_block->m_chain_tx_count);
+}
+
 Chainstate& ChainstateManager::InitializeChainstate(CTxMemPool* mempool)
 {
     AssertLockHeld(::cs_main);
diff --git a/src/validation.h b/src/validation.h
index 7aeaafe322a8..cee0dd728b30 100644
--- a/src/validation.h
+++ b/src/validation.h
@@ -455,7 +455,7 @@ enum DisconnectResult
     DISCONNECT_FAILED   // Something else went wrong.
 };
 
-class ConnectTrace;
+struct ConnectedBlock;
 
 /** @see Chainstate::FlushStateToDisk */
 inline constexpr std::array FlushStateModeNames{"NONE", "IF_NEEDED", "PERIODIC", "FORCE_FLUSH", "FORCE_SYNC"};
@@ -851,12 +851,12 @@ class Chainstate
     std::pair<int, int> GetPruneRange(int last_height_can_prune) const EXCLUSIVE_LOCKS_REQUIRED(::cs_main);
 
 protected:
-    bool ActivateBestChainStep(BlockValidationState& state, CBlockIndex* pindexMostWork, const std::shared_ptr<const CBlock>& pblock, bool& fInvalidFound, ConnectTrace& connectTrace) EXCLUSIVE_LOCKS_REQUIRED(cs_main, m_mempool->cs);
+    bool ActivateBestChainStep(BlockValidationState& state, CBlockIndex* pindexMostWork, const std::shared_ptr<const CBlock>& pblock, bool& fInvalidFound, std::vector<ConnectedBlock>& connected_blocks) EXCLUSIVE_LOCKS_REQUIRED(cs_main, m_mempool->cs);
     bool ConnectTip(
         BlockValidationState& state,
         CBlockIndex* pindexNew,
         std::shared_ptr<const CBlock> block_to_connect,
-        ConnectTrace& connectTrace,
+        std::vector<ConnectedBlock>& connected_blocks,
         DisconnectedBlockTransactions& disconnectpool) EXCLUSIVE_LOCKS_REQUIRED(cs_main, m_mempool->cs);
 
     void InvalidBlockFound(CBlockIndex* pindex, const BlockValidationState& state) EXCLUSIVE_LOCKS_REQUIRED(cs_main);
@@ -1194,9 +1194,15 @@ class ChainstateManager
     /** Check whether we are doing an initial block download (synchronizing from disk or network) */
     bool IsInitialBlockDownload() const noexcept;
 
-    /** Guess verification progress (as a fraction between 0.0=genesis and 1.0=current tip). */
+    /** Guess verification progress (as a fraction between 0.0=genesis and 1.0=current tip).
+    * This is also the case in the assumeutxo context, meaning that the progress reported for
+    * the snapshot chainstate may suggest that all historical blocks have already been verified
+    * even though that may not actually be the case. */
     double GuessVerificationProgress(const CBlockIndex* pindex) const EXCLUSIVE_LOCKS_REQUIRED(GetMutex());
 
+    /** Guess background verification progress in case assume-utxo was used (as a fraction between 0.0=genesis and 1.0=snapshot blocks). */
+    double GetBackgroundVerificationProgress(const CBlockIndex& pindex) const EXCLUSIVE_LOCKS_REQUIRED(GetMutex());
+
     /**
      * Import blocks from an external file
      *
diff --git a/src/validationinterface.cpp b/src/validationinterface.cpp
index c7be6abc3a1e..45f38b3740b3 100644
--- a/src/validationinterface.cpp
+++ b/src/validationinterface.cpp
@@ -156,33 +156,39 @@ void ValidationSignals::SyncWithValidationInterfaceQueue()
 
 // Use a macro instead of a function for conditional logging to prevent
 // evaluating arguments when logging is not enabled.
-//
-// NOTE: The lambda captures all local variables by value.
-#define ENQUEUE_AND_LOG_EVENT(event, fmt, name, ...)           \
-    do {                                                       \
-        auto local_name = (name);                              \
-        LOG_EVENT("Enqueuing " fmt, local_name, __VA_ARGS__);  \
-        m_internals->m_task_runner->insert([=] { \
-            LOG_EVENT(fmt, local_name, __VA_ARGS__);           \
-            event();                                           \
-        });                                                    \
+#define ENQUEUE_AND_LOG_EVENT(event, log_msg)                                                                    \
+    do {                                                                                                         \
+        static_assert(std::is_rvalue_reference_v<decltype((event))>,                                             \
+                      "event must be passed as an rvalue");                                                      \
+        static_assert(std::is_rvalue_reference_v<decltype((log_msg))>,                                           \
+                      "log_msg must be passed as an rvalue");                                                    \
+        auto enqueue_log_msg = (log_msg);                                                                        \
+        LOG_EVENT("Enqueuing %s", enqueue_log_msg);                                                              \
+        m_internals->m_task_runner->insert([local_log_msg = std::move(enqueue_log_msg), local_event = (event)] { \
+            LOG_EVENT("%s", local_log_msg);                                                                      \
+            local_event();                                                                                       \
+        });                                                                                                      \
     } while (0)
 
+#define LOG_MSG(fmt, ...) \
+    (ShouldLog(BCLog::VALIDATION, BCLog::Level::Debug) ? tfm::format((fmt), __VA_ARGS__) : std::string{})
+
 #define LOG_EVENT(fmt, ...) \
-    LogDebug(BCLog::VALIDATION, fmt "\n", __VA_ARGS__)
+    LogDebug(BCLog::VALIDATION, fmt, __VA_ARGS__)
 
 void ValidationSignals::UpdatedBlockTip(const CBlockIndex *pindexNew, const CBlockIndex *pindexFork, bool fInitialDownload) {
     // Dependencies exist that require UpdatedBlockTip events to be delivered in the order in which
     // the chain actually updates. One way to ensure this is for the caller to invoke this signal
     // in the same critical section where the chain is updated
 
-    auto event = [pindexNew, pindexFork, fInitialDownload, this] {
-        m_internals->Iterate([&](CValidationInterface& callbacks) { callbacks.UpdatedBlockTip(pindexNew, pindexFork, fInitialDownload); });
-    };
-    ENQUEUE_AND_LOG_EVENT(event, "%s: new block hash=%s fork block hash=%s (in IBD=%s)", __func__,
+    auto log_msg = LOG_MSG("%s: new block hash=%s fork block hash=%s (in IBD=%s)", __func__,
                           pindexNew->GetBlockHash().ToString(),
                           pindexFork ? pindexFork->GetBlockHash().ToString() : "null",
                           fInitialDownload);
+    auto event = [pindexNew, pindexFork, fInitialDownload, this] {
+        m_internals->Iterate([&](CValidationInterface& callbacks) { callbacks.UpdatedBlockTip(pindexNew, pindexFork, fInitialDownload); });
+    };
+    ENQUEUE_AND_LOG_EVENT(std::move(event), std::move(log_msg));
 }
 
 void ValidationSignals::ActiveTipChange(const CBlockIndex& new_tip, bool is_ibd)
@@ -193,61 +199,67 @@ void ValidationSignals::ActiveTipChange(const CBlockIndex& new_tip, bool is_ibd)
 
 void ValidationSignals::TransactionAddedToMempool(const NewMempoolTransactionInfo& tx, uint64_t mempool_sequence)
 {
+    auto log_msg = LOG_MSG("%s: txid=%s wtxid=%s", __func__,
+                          tx.info.m_tx->GetHash().ToString(),
+                          tx.info.m_tx->GetWitnessHash().ToString());
     auto event = [tx, mempool_sequence, this] {
         m_internals->Iterate([&](CValidationInterface& callbacks) { callbacks.TransactionAddedToMempool(tx, mempool_sequence); });
     };
-    ENQUEUE_AND_LOG_EVENT(event, "%s: txid=%s wtxid=%s", __func__,
-                          tx.info.m_tx->GetHash().ToString(),
-                          tx.info.m_tx->GetWitnessHash().ToString());
+    ENQUEUE_AND_LOG_EVENT(std::move(event), std::move(log_msg));
 }
 
 void ValidationSignals::TransactionRemovedFromMempool(const CTransactionRef& tx, MemPoolRemovalReason reason, uint64_t mempool_sequence) {
-    auto event = [tx, reason, mempool_sequence, this] {
-        m_internals->Iterate([&](CValidationInterface& callbacks) { callbacks.TransactionRemovedFromMempool(tx, reason, mempool_sequence); });
-    };
-    ENQUEUE_AND_LOG_EVENT(event, "%s: txid=%s wtxid=%s reason=%s", __func__,
+    auto log_msg = LOG_MSG("%s: txid=%s wtxid=%s reason=%s", __func__,
                           tx->GetHash().ToString(),
                           tx->GetWitnessHash().ToString(),
                           RemovalReasonToString(reason));
+    auto event = [tx, reason, mempool_sequence, this] {
+        m_internals->Iterate([&](CValidationInterface& callbacks) { callbacks.TransactionRemovedFromMempool(tx, reason, mempool_sequence); });
+    };
+    ENQUEUE_AND_LOG_EVENT(std::move(event), std::move(log_msg));
 }
 
-void ValidationSignals::BlockConnected(const ChainstateRole& role, const std::shared_ptr<const CBlock>& pblock, const CBlockIndex* pindex)
+void ValidationSignals::BlockConnected(const ChainstateRole& role, std::shared_ptr<const CBlock> pblock, const CBlockIndex* pindex)
 {
-    auto event = [role, pblock, pindex, this] {
-        m_internals->Iterate([&](CValidationInterface& callbacks) { callbacks.BlockConnected(role, pblock, pindex); });
-    };
-    ENQUEUE_AND_LOG_EVENT(event, "%s: block hash=%s block height=%d", __func__,
+    auto log_msg = LOG_MSG("%s: block hash=%s block height=%d", __func__,
                           pblock->GetHash().ToString(),
                           pindex->nHeight);
+    auto event = [role, pblock = std::move(pblock), pindex, this] {
+        m_internals->Iterate([&](CValidationInterface& callbacks) { callbacks.BlockConnected(role, pblock, pindex); });
+    };
+    ENQUEUE_AND_LOG_EVENT(std::move(event), std::move(log_msg));
 }
 
 void ValidationSignals::MempoolTransactionsRemovedForBlock(const std::vector<RemovedMempoolTransactionInfo>& txs_removed_for_block, unsigned int nBlockHeight)
 {
+    auto log_msg = LOG_MSG("%s: block height=%s txs removed=%s", __func__,
+                          nBlockHeight,
+                          txs_removed_for_block.size());
     auto event = [txs_removed_for_block, nBlockHeight, this] {
         m_internals->Iterate([&](CValidationInterface& callbacks) { callbacks.MempoolTransactionsRemovedForBlock(txs_removed_for_block, nBlockHeight); });
     };
-    ENQUEUE_AND_LOG_EVENT(event, "%s: block height=%s txs removed=%s", __func__,
-                          nBlockHeight,
-                          txs_removed_for_block.size());
+    ENQUEUE_AND_LOG_EVENT(std::move(event), std::move(log_msg));
 }
 
-void ValidationSignals::BlockDisconnected(const std::shared_ptr<const CBlock>& pblock, const CBlockIndex* pindex)
+void ValidationSignals::BlockDisconnected(std::shared_ptr<const CBlock> pblock, const CBlockIndex* pindex)
 {
-    auto event = [pblock, pindex, this] {
-        m_internals->Iterate([&](CValidationInterface& callbacks) { callbacks.BlockDisconnected(pblock, pindex); });
-    };
-    ENQUEUE_AND_LOG_EVENT(event, "%s: block hash=%s block height=%d", __func__,
+    auto log_msg = LOG_MSG("%s: block hash=%s block height=%d", __func__,
                           pblock->GetHash().ToString(),
                           pindex->nHeight);
+    auto event = [pblock = std::move(pblock), pindex, this] {
+        m_internals->Iterate([&](CValidationInterface& callbacks) { callbacks.BlockDisconnected(pblock, pindex); });
+    };
+    ENQUEUE_AND_LOG_EVENT(std::move(event), std::move(log_msg));
 }
 
 void ValidationSignals::ChainStateFlushed(const ChainstateRole& role, const CBlockLocator& locator)
 {
+    auto log_msg = LOG_MSG("%s: block hash=%s", __func__,
+                          locator.IsNull() ? "null" : locator.vHave.front().ToString());
     auto event = [role, locator, this] {
         m_internals->Iterate([&](CValidationInterface& callbacks) { callbacks.ChainStateFlushed(role, locator); });
     };
-    ENQUEUE_AND_LOG_EVENT(event, "%s: block hash=%s", __func__,
-                          locator.IsNull() ? "null" : locator.vHave.front().ToString());
+    ENQUEUE_AND_LOG_EVENT(std::move(event), std::move(log_msg));
 }
 
 void ValidationSignals::BlockChecked(const std::shared_ptr<const CBlock>& block, const BlockValidationState& state)
diff --git a/src/validationinterface.h b/src/validationinterface.h
index 4777e8dca8db..8cfe41380ecd 100644
--- a/src/validationinterface.h
+++ b/src/validationinterface.h
@@ -223,8 +223,8 @@ class ValidationSignals {
     void TransactionAddedToMempool(const NewMempoolTransactionInfo&, uint64_t mempool_sequence);
     void TransactionRemovedFromMempool(const CTransactionRef&, MemPoolRemovalReason, uint64_t mempool_sequence);
     void MempoolTransactionsRemovedForBlock(const std::vector<RemovedMempoolTransactionInfo>&, unsigned int nBlockHeight);
-    void BlockConnected(const kernel::ChainstateRole&, const std::shared_ptr<const CBlock>&, const CBlockIndex* pindex);
-    void BlockDisconnected(const std::shared_ptr<const CBlock> &, const CBlockIndex* pindex);
+    void BlockConnected(const kernel::ChainstateRole&, std::shared_ptr<const CBlock>, const CBlockIndex* pindex);
+    void BlockDisconnected(std::shared_ptr<const CBlock>, const CBlockIndex* pindex);
     void ChainStateFlushed(const kernel::ChainstateRole&, const CBlockLocator&);
     void BlockChecked(const std::shared_ptr<const CBlock>&, const BlockValidationState&);
     void NewPoWValidBlock(const CBlockIndex *, const std::shared_ptr<const CBlock>&);
diff --git a/src/wallet/CMakeLists.txt b/src/wallet/CMakeLists.txt
index 8ec381df5a8c..36fd3ef95aec 100644
--- a/src/wallet/CMakeLists.txt
+++ b/src/wallet/CMakeLists.txt
@@ -38,8 +38,7 @@ target_link_libraries(bitcoin_wallet
   PRIVATE
     core_interface
     bitcoin_common
-    $<TARGET_NAME_IF_EXISTS:unofficial::sqlite3::sqlite3>
-    $<TARGET_NAME_IF_EXISTS:SQLite::SQLite3>
+    SQLite3::SQLite3
     univalue
     Boost::headers
     $<TARGET_NAME_IF_EXISTS:USDT::headers>
diff --git a/src/wallet/coinselection.cpp b/src/wallet/coinselection.cpp
index d7fde38991c7..d6ea6851e648 100644
--- a/src/wallet/coinselection.cpp
+++ b/src/wallet/coinselection.cpp
@@ -967,8 +967,7 @@ std::string GetAlgorithmName(const SelectionAlgorithm algo)
     case SelectionAlgorithm::SRD: return "srd";
     case SelectionAlgorithm::CG: return "cg";
     case SelectionAlgorithm::MANUAL: return "manual";
-    // No default case to allow for compiler to warn
-    }
+    } // no default case, so the compiler can warn about missing cases
     assert(false);
 }
 
diff --git a/src/wallet/external_signer_scriptpubkeyman.cpp b/src/wallet/external_signer_scriptpubkeyman.cpp
index f66686254a45..274da09ec6e6 100644
--- a/src/wallet/external_signer_scriptpubkeyman.cpp
+++ b/src/wallet/external_signer_scriptpubkeyman.cpp
@@ -88,7 +88,6 @@ std::optional<PSBTError> ExternalSignerScriptPubKeyMan::FillPSBT(PartiallySigned
     // Already complete if every input is now signed
     bool complete = true;
     for (const auto& input : psbt.inputs) {
-        // TODO: for multisig wallets, we should only care if all _our_ inputs are signed
         complete &= PSBTInputSigned(input);
     }
     if (complete) return {};
@@ -104,7 +103,7 @@ std::optional<PSBTError> ExternalSignerScriptPubKeyMan::FillPSBT(PartiallySigned
         LogWarning("Failed to sign: %s\n", failure_reason);
         return PSBTError::EXTERNAL_SIGNER_FAILED;
     }
-    if (finalize) FinalizePSBT(psbt); // This won't work in a multisig setup
+    if (finalize) FinalizePSBT(psbt);
     return {};
 }
 } // namespace wallet
diff --git a/src/wallet/feebumper.cpp b/src/wallet/feebumper.cpp
index ff7a9f5a3ac5..7f84c6fa6682 100644
--- a/src/wallet/feebumper.cpp
+++ b/src/wallet/feebumper.cpp
@@ -80,9 +80,10 @@ static feebumper::Result CheckFeeRate(const CWallet& wallet, const CMutableTrans
         reused_inputs.push_back(txin.prevout);
     }
 
-    std::optional<CAmount> combined_bump_fee = wallet.chain().calculateCombinedBumpFee(reused_inputs, newFeerate);
+    const std::optional<CAmount> combined_bump_fee = wallet.chain().calculateCombinedBumpFee(reused_inputs, newFeerate);
     if (!combined_bump_fee.has_value()) {
         errors.push_back(Untranslated(strprintf("Failed to calculate bump fees, because unconfirmed UTXOs depend on an enormous cluster of unconfirmed transactions.")));
+        return feebumper::Result::WALLET_ERROR;
     }
     CAmount new_total_fee = newFeerate.GetFee(maxTxSize) + combined_bump_fee.value();
 
diff --git a/src/wallet/rpc/addresses.cpp b/src/wallet/rpc/addresses.cpp
index a04e0903b9cd..ed966d894414 100644
--- a/src/wallet/rpc/addresses.cpp
+++ b/src/wallet/rpc/addresses.cpp
@@ -18,9 +18,9 @@
 #include <univalue.h>
 
 namespace wallet {
-RPCHelpMan getnewaddress()
+RPCMethod getnewaddress()
 {
-    return RPCHelpMan{
+    return RPCMethod{
         "getnewaddress",
         "Returns a new Bitcoin address for receiving payments.\n"
                 "If 'label' is specified, it is added to the address book \n"
@@ -36,7 +36,7 @@ RPCHelpMan getnewaddress()
                     HelpExampleCli("getnewaddress", "")
             + HelpExampleRpc("getnewaddress", "")
                 },
-        [&](const RPCHelpMan& self, const JSONRPCRequest& request) -> UniValue
+        [](const RPCMethod& self, const JSONRPCRequest& request) -> UniValue
 {
     std::shared_ptr<CWallet> const pwallet = GetWalletForJSONRPCRequest(request);
     if (!pwallet) return UniValue::VNULL;
@@ -69,9 +69,9 @@ RPCHelpMan getnewaddress()
     };
 }
 
-RPCHelpMan getrawchangeaddress()
+RPCMethod getrawchangeaddress()
 {
-    return RPCHelpMan{
+    return RPCMethod{
         "getrawchangeaddress",
         "Returns a new Bitcoin address, for receiving change.\n"
                 "This is for use with raw transactions, NOT normal use.\n",
@@ -85,7 +85,7 @@ RPCHelpMan getrawchangeaddress()
                     HelpExampleCli("getrawchangeaddress", "")
             + HelpExampleRpc("getrawchangeaddress", "")
                 },
-        [&](const RPCHelpMan& self, const JSONRPCRequest& request) -> UniValue
+        [](const RPCMethod& self, const JSONRPCRequest& request) -> UniValue
 {
     std::shared_ptr<CWallet> const pwallet = GetWalletForJSONRPCRequest(request);
     if (!pwallet) return UniValue::VNULL;
@@ -115,9 +115,9 @@ RPCHelpMan getrawchangeaddress()
 }
 
 
-RPCHelpMan setlabel()
+RPCMethod setlabel()
 {
-    return RPCHelpMan{
+    return RPCMethod{
         "setlabel",
         "Sets the label associated with the given address.\n",
                 {
@@ -129,7 +129,7 @@ RPCHelpMan setlabel()
                     HelpExampleCli("setlabel", "\"" + EXAMPLE_ADDRESS[0] + "\" \"tabby\"")
             + HelpExampleRpc("setlabel", "\"" + EXAMPLE_ADDRESS[0] + "\", \"tabby\"")
                 },
-        [&](const RPCHelpMan& self, const JSONRPCRequest& request) -> UniValue
+        [](const RPCMethod& self, const JSONRPCRequest& request) -> UniValue
 {
     std::shared_ptr<CWallet> const pwallet = GetWalletForJSONRPCRequest(request);
     if (!pwallet) return UniValue::VNULL;
@@ -154,9 +154,9 @@ RPCHelpMan setlabel()
     };
 }
 
-RPCHelpMan listaddressgroupings()
+RPCMethod listaddressgroupings()
 {
-    return RPCHelpMan{
+    return RPCMethod{
         "listaddressgroupings",
         "Lists groups of addresses which have had their common ownership\n"
                 "made public by common use as inputs or as the resulting change\n"
@@ -180,7 +180,7 @@ RPCHelpMan listaddressgroupings()
                     HelpExampleCli("listaddressgroupings", "")
             + HelpExampleRpc("listaddressgroupings", "")
                 },
-        [&](const RPCHelpMan& self, const JSONRPCRequest& request) -> UniValue
+        [](const RPCMethod& self, const JSONRPCRequest& request) -> UniValue
 {
     const std::shared_ptr<const CWallet> pwallet = GetWalletForJSONRPCRequest(request);
     if (!pwallet) return UniValue::VNULL;
@@ -215,9 +215,9 @@ RPCHelpMan listaddressgroupings()
     };
 }
 
-RPCHelpMan keypoolrefill()
+RPCMethod keypoolrefill()
 {
-    return RPCHelpMan{"keypoolrefill",
+    return RPCMethod{"keypoolrefill",
                 "Refills each descriptor keypool in the wallet up to the specified number of new keys.\n"
                 "By default, descriptor wallets have 4 active ranged descriptors (" + FormatAllOutputTypes() + "), each with " + util::ToString(DEFAULT_KEYPOOL_SIZE) + " entries.\n" +
         HELP_REQUIRING_PASSPHRASE,
@@ -229,7 +229,7 @@ RPCHelpMan keypoolrefill()
                     HelpExampleCli("keypoolrefill", "")
             + HelpExampleRpc("keypoolrefill", "")
                 },
-        [&](const RPCHelpMan& self, const JSONRPCRequest& request) -> UniValue
+        [](const RPCMethod& self, const JSONRPCRequest& request) -> UniValue
 {
     std::shared_ptr<CWallet> const pwallet = GetWalletForJSONRPCRequest(request);
     if (!pwallet) return UniValue::VNULL;
@@ -365,9 +365,9 @@ static UniValue DescribeWalletAddress(const CWallet& wallet, const CTxDestinatio
     return ret;
 }
 
-RPCHelpMan getaddressinfo()
+RPCMethod getaddressinfo()
 {
-    return RPCHelpMan{
+    return RPCMethod{
         "getaddressinfo",
         "Return information about the given bitcoin address.\n"
                 "Some of the information will only be present if the address is in the active wallet.\n",
@@ -420,7 +420,7 @@ RPCHelpMan getaddressinfo()
                     HelpExampleCli("getaddressinfo", "\"" + EXAMPLE_ADDRESS[0] + "\"") +
                     HelpExampleRpc("getaddressinfo", "\"" + EXAMPLE_ADDRESS[0] + "\"")
                 },
-        [&](const RPCHelpMan& self, const JSONRPCRequest& request) -> UniValue
+        [](const RPCMethod& self, const JSONRPCRequest& request) -> UniValue
 {
     const std::shared_ptr<const CWallet> pwallet = GetWalletForJSONRPCRequest(request);
     if (!pwallet) return UniValue::VNULL;
@@ -512,9 +512,9 @@ RPCHelpMan getaddressinfo()
     };
 }
 
-RPCHelpMan getaddressesbylabel()
+RPCMethod getaddressesbylabel()
 {
-    return RPCHelpMan{
+    return RPCMethod{
         "getaddressesbylabel",
         "Returns the list of addresses assigned the specified label.\n",
                 {
@@ -533,7 +533,7 @@ RPCHelpMan getaddressesbylabel()
                     HelpExampleCli("getaddressesbylabel", "\"tabby\"")
             + HelpExampleRpc("getaddressesbylabel", "\"tabby\"")
                 },
-        [&](const RPCHelpMan& self, const JSONRPCRequest& request) -> UniValue
+        [](const RPCMethod& self, const JSONRPCRequest& request) -> UniValue
 {
     const std::shared_ptr<const CWallet> pwallet = GetWalletForJSONRPCRequest(request);
     if (!pwallet) return UniValue::VNULL;
@@ -573,9 +573,9 @@ RPCHelpMan getaddressesbylabel()
     };
 }
 
-RPCHelpMan listlabels()
+RPCMethod listlabels()
 {
-    return RPCHelpMan{
+    return RPCMethod{
         "listlabels",
         "Returns the list of all labels, or labels that are assigned to addresses with a specific purpose.\n",
                 {
@@ -597,7 +597,7 @@ RPCHelpMan listlabels()
             "\nAs a JSON-RPC call\n"
             + HelpExampleRpc("listlabels", "receive")
                 },
-        [&](const RPCHelpMan& self, const JSONRPCRequest& request) -> UniValue
+        [](const RPCMethod& self, const JSONRPCRequest& request) -> UniValue
 {
     const std::shared_ptr<const CWallet> pwallet = GetWalletForJSONRPCRequest(request);
     if (!pwallet) return UniValue::VNULL;
@@ -630,9 +630,9 @@ RPCHelpMan listlabels()
 
 
 #ifdef ENABLE_EXTERNAL_SIGNER
-RPCHelpMan walletdisplayaddress()
+RPCMethod walletdisplayaddress()
 {
-    return RPCHelpMan{
+    return RPCMethod{
         "walletdisplayaddress",
         "Display address on an external signer for verification.",
         {
@@ -645,7 +645,7 @@ RPCHelpMan walletdisplayaddress()
             }
         },
         RPCExamples{""},
-        [&](const RPCHelpMan& self, const JSONRPCRequest& request) -> UniValue
+        [](const RPCMethod& self, const JSONRPCRequest& request) -> UniValue
         {
             std::shared_ptr<CWallet> const wallet = GetWalletForJSONRPCRequest(request);
             if (!wallet) return UniValue::VNULL;
diff --git a/src/wallet/rpc/backup.cpp b/src/wallet/rpc/backup.cpp
index 9b70f5bbb078..4b87ba232385 100644
--- a/src/wallet/rpc/backup.cpp
+++ b/src/wallet/rpc/backup.cpp
@@ -36,9 +36,9 @@
 using interfaces::FoundBlock;
 
 namespace wallet {
-RPCHelpMan importprunedfunds()
+RPCMethod importprunedfunds()
 {
-    return RPCHelpMan{
+    return RPCMethod{
         "importprunedfunds",
         "Imports funds without rescan. Corresponding address or script must previously be included in wallet. Aimed towards pruned wallets. The end-user is responsible to import additional transactions that subsequently spend the imported outputs or rescan after the point in the blockchain the transaction is included.\n",
                 {
@@ -47,7 +47,7 @@ RPCHelpMan importprunedfunds()
                 },
                 RPCResult{RPCResult::Type::NONE, "", ""},
                 RPCExamples{""},
-        [&](const RPCHelpMan& self, const JSONRPCRequest& request) -> UniValue
+        [](const RPCMethod& self, const JSONRPCRequest& request) -> UniValue
 {
     std::shared_ptr<CWallet> const pwallet = GetWalletForJSONRPCRequest(request);
     if (!pwallet) return UniValue::VNULL;
@@ -91,9 +91,9 @@ RPCHelpMan importprunedfunds()
     };
 }
 
-RPCHelpMan removeprunedfunds()
+RPCMethod removeprunedfunds()
 {
-    return RPCHelpMan{
+    return RPCMethod{
         "removeprunedfunds",
         "Deletes the specified transaction from the wallet. Meant for use with pruned wallets and as a companion to importprunedfunds. This will affect wallet balances.\n",
                 {
@@ -105,7 +105,7 @@ RPCHelpMan removeprunedfunds()
             "\nAs a JSON-RPC call\n"
             + HelpExampleRpc("removeprunedfunds", "\"a8d0c0184dde994a09ec054286f1ce581bebf46446a512166eae7628734ea0a5\"")
                 },
-        [&](const RPCHelpMan& self, const JSONRPCRequest& request) -> UniValue
+        [](const RPCMethod& self, const JSONRPCRequest& request) -> UniValue
 {
     std::shared_ptr<CWallet> const pwallet = GetWalletForJSONRPCRequest(request);
     if (!pwallet) return UniValue::VNULL;
@@ -299,9 +299,9 @@ static UniValue ProcessDescriptorImport(CWallet& wallet, const UniValue& data, c
     return result;
 }
 
-RPCHelpMan importdescriptors()
+RPCMethod importdescriptors()
 {
-    return RPCHelpMan{
+    return RPCMethod{
         "importdescriptors",
         "Import descriptors. This will trigger a rescan of the blockchain based on the earliest timestamp of all descriptors being imported. Requires a new wallet backup.\n"
         "When importing descriptors with multipath key expressions, if the multipath specifier contains exactly two elements, the descriptor produced from the second element will be imported as an internal descriptor.\n"
@@ -343,7 +343,8 @@ RPCHelpMan importdescriptors()
                             }},
                             {RPCResult::Type::OBJ, "error", /*optional=*/true, "",
                             {
-                                {RPCResult::Type::ELISION, "", "JSONRPC error"},
+                                {RPCResult::Type::NUM, "code", "JSONRPC error code"},
+                                {RPCResult::Type::STR, "message", "JSONRPC error message"},
                             }},
                         }},
                     }
@@ -353,7 +354,7 @@ RPCHelpMan importdescriptors()
                                           "{ \"desc\": \"<my descriptor 2>\", \"label\": \"example 2\", \"timestamp\": 1455191480 }]'") +
                     HelpExampleCli("importdescriptors", "'[{ \"desc\": \"<my descriptor>\", \"timestamp\":1455191478, \"active\": true, \"range\": [0,100], \"label\": \"<my bech32 wallet>\" }]'")
                 },
-        [&](const RPCHelpMan& self, const JSONRPCRequest& main_request) -> UniValue
+        [](const RPCMethod& self, const JSONRPCRequest& main_request) -> UniValue
 {
     std::shared_ptr<CWallet> const pwallet = GetWalletForJSONRPCRequest(main_request);
     if (!pwallet) return UniValue::VNULL;
@@ -461,9 +462,9 @@ RPCHelpMan importdescriptors()
     };
 }
 
-RPCHelpMan listdescriptors()
+RPCMethod listdescriptors()
 {
-    return RPCHelpMan{
+    return RPCMethod{
         "listdescriptors",
         "List all descriptors present in a wallet.\n",
         {
@@ -491,7 +492,7 @@ RPCHelpMan listdescriptors()
             HelpExampleCli("listdescriptors", "") + HelpExampleRpc("listdescriptors", "")
             + HelpExampleCli("listdescriptors", "true") + HelpExampleRpc("listdescriptors", "true")
         },
-        [&](const RPCHelpMan& self, const JSONRPCRequest& request) -> UniValue
+        [](const RPCMethod& self, const JSONRPCRequest& request) -> UniValue
 {
     const std::shared_ptr<const CWallet> wallet = GetWalletForJSONRPCRequest(request);
     if (!wallet) return UniValue::VNULL;
@@ -571,9 +572,9 @@ RPCHelpMan listdescriptors()
     };
 }
 
-RPCHelpMan backupwallet()
+RPCMethod backupwallet()
 {
-    return RPCHelpMan{
+    return RPCMethod{
         "backupwallet",
         "Safely copies the current wallet file to the specified destination, which can either be a directory or a path with a filename.\n",
                 {
@@ -584,7 +585,7 @@ RPCHelpMan backupwallet()
                     HelpExampleCli("backupwallet", "\"backup.dat\"")
             + HelpExampleRpc("backupwallet", "\"backup.dat\"")
                 },
-        [&](const RPCHelpMan& self, const JSONRPCRequest& request) -> UniValue
+        [](const RPCMethod& self, const JSONRPCRequest& request) -> UniValue
 {
     const std::shared_ptr<const CWallet> pwallet = GetWalletForJSONRPCRequest(request);
     if (!pwallet) return UniValue::VNULL;
@@ -606,9 +607,9 @@ RPCHelpMan backupwallet()
 }
 
 
-RPCHelpMan restorewallet()
+RPCMethod restorewallet()
 {
-    return RPCHelpMan{
+    return RPCMethod{
         "restorewallet",
         "Restores and loads a wallet from backup.\n"
         "\nThe rescan is significantly faster if block filters are available"
@@ -634,7 +635,7 @@ RPCHelpMan restorewallet()
             + HelpExampleCliNamed("restorewallet", {{"wallet_name", "testwallet"}, {"backup_file", "home\\backups\\backup-file.bak\""}, {"load_on_startup", true}})
             + HelpExampleRpcNamed("restorewallet", {{"wallet_name", "testwallet"}, {"backup_file", "home\\backups\\backup-file.bak\""}, {"load_on_startup", true}})
         },
-        [&](const RPCHelpMan& self, const JSONRPCRequest& request) -> UniValue
+        [](const RPCMethod& self, const JSONRPCRequest& request) -> UniValue
 {
 
     WalletContext& context = EnsureWalletContext(request.context);
diff --git a/src/wallet/rpc/coins.cpp b/src/wallet/rpc/coins.cpp
index 1cf586ad009e..79889b5a38d4 100644
--- a/src/wallet/rpc/coins.cpp
+++ b/src/wallet/rpc/coins.cpp
@@ -77,9 +77,9 @@ static CAmount GetReceived(const CWallet& wallet, const UniValue& params, bool b
 }
 
 
-RPCHelpMan getreceivedbyaddress()
+RPCMethod getreceivedbyaddress()
 {
-    return RPCHelpMan{
+    return RPCMethod{
         "getreceivedbyaddress",
         "Returns the total amount received by the given address in transactions with at least minconf confirmations.\n",
                 {
@@ -102,7 +102,7 @@ RPCHelpMan getreceivedbyaddress()
             "\nAs a JSON-RPC call\n"
             + HelpExampleRpc("getreceivedbyaddress", "\"" + EXAMPLE_ADDRESS[0] + "\", 6")
                 },
-        [&](const RPCHelpMan& self, const JSONRPCRequest& request) -> UniValue
+        [](const RPCMethod& self, const JSONRPCRequest& request) -> UniValue
 {
     const std::shared_ptr<const CWallet> pwallet = GetWalletForJSONRPCRequest(request);
     if (!pwallet) return UniValue::VNULL;
@@ -119,9 +119,9 @@ RPCHelpMan getreceivedbyaddress()
 }
 
 
-RPCHelpMan getreceivedbylabel()
+RPCMethod getreceivedbylabel()
 {
-    return RPCHelpMan{
+    return RPCMethod{
         "getreceivedbylabel",
         "Returns the total amount received by addresses with <label> in transactions with at least [minconf] confirmations.\n",
                 {
@@ -144,7 +144,7 @@ RPCHelpMan getreceivedbylabel()
             "\nAs a JSON-RPC call\n"
             + HelpExampleRpc("getreceivedbylabel", "\"tabby\", 6, true")
                 },
-        [&](const RPCHelpMan& self, const JSONRPCRequest& request) -> UniValue
+        [](const RPCMethod& self, const JSONRPCRequest& request) -> UniValue
 {
     const std::shared_ptr<const CWallet> pwallet = GetWalletForJSONRPCRequest(request);
     if (!pwallet) return UniValue::VNULL;
@@ -161,9 +161,9 @@ RPCHelpMan getreceivedbylabel()
 }
 
 
-RPCHelpMan getbalance()
+RPCMethod getbalance()
 {
-    return RPCHelpMan{
+    return RPCMethod{
         "getbalance",
         "Returns the total available balance.\n"
                 "The available balance is what the wallet considers currently spendable, and is\n"
@@ -185,7 +185,7 @@ RPCHelpMan getbalance()
             "\nAs a JSON-RPC call\n"
             + HelpExampleRpc("getbalance", "\"*\", 6")
                 },
-        [&](const RPCHelpMan& self, const JSONRPCRequest& request) -> UniValue
+        [](const RPCMethod& self, const JSONRPCRequest& request) -> UniValue
 {
     const std::shared_ptr<const CWallet> pwallet = GetWalletForJSONRPCRequest(request);
     if (!pwallet) return UniValue::VNULL;
@@ -211,9 +211,9 @@ RPCHelpMan getbalance()
     };
 }
 
-RPCHelpMan lockunspent()
+RPCMethod lockunspent()
 {
-    return RPCHelpMan{
+    return RPCMethod{
         "lockunspent",
         "Updates list of temporarily unspendable outputs.\n"
                 "Temporarily lock (unlock=false) or unlock (unlock=true) specified transaction outputs.\n"
@@ -255,7 +255,7 @@ RPCHelpMan lockunspent()
             "\nAs a JSON-RPC call\n"
             + HelpExampleRpc("lockunspent", "false, \"[{\\\"txid\\\":\\\"a08e6907dbbd3d809776dbfc5d82e371b764ed838b5655e72f463568df1aadf0\\\",\\\"vout\\\":1}]\"")
                 },
-        [&](const RPCHelpMan& self, const JSONRPCRequest& request) -> UniValue
+        [](const RPCMethod& self, const JSONRPCRequest& request) -> UniValue
 {
     std::shared_ptr<CWallet> const pwallet = GetWalletForJSONRPCRequest(request);
     if (!pwallet) return UniValue::VNULL;
@@ -344,9 +344,9 @@ RPCHelpMan lockunspent()
     };
 }
 
-RPCHelpMan listlockunspent()
+RPCMethod listlockunspent()
 {
-    return RPCHelpMan{
+    return RPCMethod{
         "listlockunspent",
         "Returns list of temporarily unspendable outputs.\n"
                 "See the lockunspent call to lock and unlock transactions for spending.\n",
@@ -373,7 +373,7 @@ RPCHelpMan listlockunspent()
             "\nAs a JSON-RPC call\n"
             + HelpExampleRpc("listlockunspent", "")
                 },
-        [&](const RPCHelpMan& self, const JSONRPCRequest& request) -> UniValue
+        [](const RPCMethod& self, const JSONRPCRequest& request) -> UniValue
 {
     const std::shared_ptr<const CWallet> pwallet = GetWalletForJSONRPCRequest(request);
     if (!pwallet) return UniValue::VNULL;
@@ -398,9 +398,9 @@ RPCHelpMan listlockunspent()
     };
 }
 
-RPCHelpMan getbalances()
+RPCMethod getbalances()
 {
-    return RPCHelpMan{
+    return RPCMethod{
         "getbalances",
         "Returns an object with all balances in " + CURRENCY_UNIT + ".\n",
         {},
@@ -420,7 +420,7 @@ RPCHelpMan getbalances()
         RPCExamples{
             HelpExampleCli("getbalances", "") +
             HelpExampleRpc("getbalances", "")},
-        [&](const RPCHelpMan& self, const JSONRPCRequest& request) -> UniValue
+        [](const RPCMethod& self, const JSONRPCRequest& request) -> UniValue
 {
     const std::shared_ptr<const CWallet> rpc_wallet = GetWalletForJSONRPCRequest(request);
     if (!rpc_wallet) return UniValue::VNULL;
@@ -453,9 +453,9 @@ RPCHelpMan getbalances()
     };
 }
 
-RPCHelpMan listunspent()
+RPCMethod listunspent()
 {
-    return RPCHelpMan{
+    return RPCMethod{
         "listunspent",
         "Returns array of unspent transaction outputs\n"
                 "with between minconf and maxconf (inclusive) confirmations.\n"
@@ -517,7 +517,7 @@ RPCHelpMan listunspent()
             + HelpExampleCli("listunspent", "6 9999999 '[]' true '{ \"minimumAmount\": 0.005 }'")
             + HelpExampleRpc("listunspent", "6, 9999999, [] , true, { \"minimumAmount\": 0.005 } ")
                 },
-        [&](const RPCHelpMan& self, const JSONRPCRequest& request) -> UniValue
+        [](const RPCMethod& self, const JSONRPCRequest& request) -> UniValue
 {
     const std::shared_ptr<const CWallet> pwallet = GetWalletForJSONRPCRequest(request);
     if (!pwallet) return UniValue::VNULL;
diff --git a/src/wallet/rpc/encrypt.cpp b/src/wallet/rpc/encrypt.cpp
index e2c22ad6819e..68a80eb80e1b 100644
--- a/src/wallet/rpc/encrypt.cpp
+++ b/src/wallet/rpc/encrypt.cpp
@@ -10,9 +10,9 @@
 
 
 namespace wallet {
-RPCHelpMan walletpassphrase()
+RPCMethod walletpassphrase()
 {
-    return RPCHelpMan{
+    return RPCMethod{
         "walletpassphrase",
         "Stores the wallet decryption key in memory for 'timeout' seconds.\n"
                 "This is needed prior to performing transactions related to private keys such as sending bitcoins\n"
@@ -32,7 +32,7 @@ RPCHelpMan walletpassphrase()
             "\nAs a JSON-RPC call\n"
             + HelpExampleRpc("walletpassphrase", "\"my pass phrase\", 60")
                 },
-        [&](const RPCHelpMan& self, const JSONRPCRequest& request) -> UniValue
+        [](const RPCMethod& self, const JSONRPCRequest& request) -> UniValue
 {
     std::shared_ptr<CWallet> const wallet = GetWalletForJSONRPCRequest(request);
     if (!wallet) return UniValue::VNULL;
@@ -115,9 +115,9 @@ RPCHelpMan walletpassphrase()
 }
 
 
-RPCHelpMan walletpassphrasechange()
+RPCMethod walletpassphrasechange()
 {
-    return RPCHelpMan{
+    return RPCMethod{
         "walletpassphrasechange",
         "Changes the wallet passphrase from 'oldpassphrase' to 'newpassphrase'.\n",
                 {
@@ -129,7 +129,7 @@ RPCHelpMan walletpassphrasechange()
                     HelpExampleCli("walletpassphrasechange", "\"old one\" \"new one\"")
             + HelpExampleRpc("walletpassphrasechange", "\"old one\", \"new one\"")
                 },
-        [&](const RPCHelpMan& self, const JSONRPCRequest& request) -> UniValue
+        [](const RPCMethod& self, const JSONRPCRequest& request) -> UniValue
 {
     std::shared_ptr<CWallet> const pwallet = GetWalletForJSONRPCRequest(request);
     if (!pwallet) return UniValue::VNULL;
@@ -175,9 +175,9 @@ RPCHelpMan walletpassphrasechange()
 }
 
 
-RPCHelpMan walletlock()
+RPCMethod walletlock()
 {
-    return RPCHelpMan{
+    return RPCMethod{
         "walletlock",
         "Removes the wallet encryption key from memory, locking the wallet.\n"
                 "After calling this method, you will need to call walletpassphrase again\n"
@@ -194,7 +194,7 @@ RPCHelpMan walletlock()
             "\nAs a JSON-RPC call\n"
             + HelpExampleRpc("walletlock", "")
                 },
-        [&](const RPCHelpMan& self, const JSONRPCRequest& request) -> UniValue
+        [](const RPCMethod& self, const JSONRPCRequest& request) -> UniValue
 {
     std::shared_ptr<CWallet> const pwallet = GetWalletForJSONRPCRequest(request);
     if (!pwallet) return UniValue::VNULL;
@@ -218,9 +218,9 @@ RPCHelpMan walletlock()
 }
 
 
-RPCHelpMan encryptwallet()
+RPCMethod encryptwallet()
 {
-    return RPCHelpMan{
+    return RPCMethod{
         "encryptwallet",
         "Encrypts the wallet with 'passphrase'. This is for first time encryption.\n"
         "After this, any calls that interact with private keys such as sending or signing \n"
@@ -247,7 +247,7 @@ RPCHelpMan encryptwallet()
             "\nAs a JSON-RPC call\n"
             + HelpExampleRpc("encryptwallet", "\"my pass phrase\"")
                 },
-        [&](const RPCHelpMan& self, const JSONRPCRequest& request) -> UniValue
+        [](const RPCMethod& self, const JSONRPCRequest& request) -> UniValue
 {
     std::shared_ptr<CWallet> const pwallet = GetWalletForJSONRPCRequest(request);
     if (!pwallet) return UniValue::VNULL;
diff --git a/src/wallet/rpc/signmessage.cpp b/src/wallet/rpc/signmessage.cpp
index 1929e4773610..bd49f3e393c8 100644
--- a/src/wallet/rpc/signmessage.cpp
+++ b/src/wallet/rpc/signmessage.cpp
@@ -11,9 +11,9 @@
 #include <univalue.h>
 
 namespace wallet {
-RPCHelpMan signmessage()
+RPCMethod signmessage()
 {
-    return RPCHelpMan{
+    return RPCMethod{
         "signmessage",
         "Sign a message with the private key of an address" +
           HELP_REQUIRING_PASSPHRASE,
@@ -34,7 +34,7 @@ RPCHelpMan signmessage()
             "\nAs a JSON-RPC call\n"
             + HelpExampleRpc("signmessage", "\"1D1ZrZNe3JUo7ZycKEYQQiQAWd9y54F4XX\", \"my message\"")
         },
-        [&](const RPCHelpMan& self, const JSONRPCRequest& request) -> UniValue
+        [](const RPCMethod& self, const JSONRPCRequest& request) -> UniValue
         {
             const std::shared_ptr<const CWallet> pwallet = GetWalletForJSONRPCRequest(request);
             if (!pwallet) return UniValue::VNULL;
diff --git a/src/wallet/rpc/spend.cpp b/src/wallet/rpc/spend.cpp
index 2991a27594ed..5f9de93a9fff 100644
--- a/src/wallet/rpc/spend.cpp
+++ b/src/wallet/rpc/spend.cpp
@@ -235,9 +235,9 @@ static void SetFeeEstimateMode(const CWallet& wallet, CCoinControl& cc, const Un
     }
 }
 
-RPCHelpMan sendtoaddress()
+RPCMethod sendtoaddress()
 {
-    return RPCHelpMan{
+    return RPCMethod{
         "sendtoaddress",
         "Send an amount to a given address." +
         HELP_REQUIRING_PASSPHRASE,
@@ -285,7 +285,7 @@ RPCHelpMan sendtoaddress()
                     + HelpExampleCli("-named sendtoaddress", "address=\"" + EXAMPLE_ADDRESS[0] + "\" amount=0.5 fee_rate=25")
                     + HelpExampleCli("-named sendtoaddress", "address=\"" + EXAMPLE_ADDRESS[0] + "\" amount=0.5 fee_rate=25 subtractfeefromamount=false replaceable=true avoid_reuse=true comment=\"2 pizzas\" comment_to=\"jeremy\" verbose=true")
                 },
-        [&](const RPCHelpMan& self, const JSONRPCRequest& request) -> UniValue
+        [](const RPCMethod& self, const JSONRPCRequest& request) -> UniValue
 {
     std::shared_ptr<CWallet> const pwallet = GetWalletForJSONRPCRequest(request);
     if (!pwallet) return UniValue::VNULL;
@@ -333,9 +333,9 @@ RPCHelpMan sendtoaddress()
     };
 }
 
-RPCHelpMan sendmany()
+RPCMethod sendmany()
 {
-    return RPCHelpMan{"sendmany",
+    return RPCMethod{"sendmany",
         "Send multiple times. Amounts are double-precision floating point numbers." +
         HELP_REQUIRING_PASSPHRASE,
                 {
@@ -389,7 +389,7 @@ RPCHelpMan sendmany()
             "\nAs a JSON-RPC call\n"
             + HelpExampleRpc("sendmany", "\"\", {\"" + EXAMPLE_ADDRESS[0] + "\":0.01,\"" + EXAMPLE_ADDRESS[1] + "\":0.02}, 6, \"testing\"")
                 },
-        [&](const RPCHelpMan& self, const JSONRPCRequest& request) -> UniValue
+        [](const RPCMethod& self, const JSONRPCRequest& request) -> UniValue
 {
     std::shared_ptr<CWallet> const pwallet = GetWalletForJSONRPCRequest(request);
     if (!pwallet) return UniValue::VNULL;
@@ -703,9 +703,9 @@ static void SetOptionsInputWeights(const UniValue& inputs, UniValue& options)
     options.pushKV("input_weights", std::move(weights));
 }
 
-RPCHelpMan fundrawtransaction()
+RPCMethod fundrawtransaction()
 {
-    return RPCHelpMan{
+    return RPCMethod{
         "fundrawtransaction",
         "If the transaction has no inputs, they will be automatically selected to meet its out value.\n"
                 "It will add at most one change output to the outputs.\n"
@@ -796,7 +796,7 @@ RPCHelpMan fundrawtransaction()
                             "\nSend the transaction\n"
                             + HelpExampleCli("sendrawtransaction", "\"signedtransactionhex\"")
                                 },
-        [&](const RPCHelpMan& self, const JSONRPCRequest& request) -> UniValue
+        [](const RPCMethod& self, const JSONRPCRequest& request) -> UniValue
 {
     std::shared_ptr<CWallet> const pwallet = GetWalletForJSONRPCRequest(request);
     if (!pwallet) return UniValue::VNULL;
@@ -838,9 +838,9 @@ RPCHelpMan fundrawtransaction()
     };
 }
 
-RPCHelpMan signrawtransactionwithwallet()
+RPCMethod signrawtransactionwithwallet()
 {
-    return RPCHelpMan{
+    return RPCMethod{
         "signrawtransactionwithwallet",
         "Sign inputs for raw transaction (serialized, hex-encoded).\n"
                 "The second optional argument (may be null) is an array of previous transaction outputs that\n"
@@ -897,7 +897,7 @@ RPCHelpMan signrawtransactionwithwallet()
                     HelpExampleCli("signrawtransactionwithwallet", "\"myhex\"")
             + HelpExampleRpc("signrawtransactionwithwallet", "\"myhex\"")
                 },
-        [&](const RPCHelpMan& self, const JSONRPCRequest& request) -> UniValue
+        [](const RPCMethod& self, const JSONRPCRequest& request) -> UniValue
 {
     const std::shared_ptr<const CWallet> pwallet = GetWalletForJSONRPCRequest(request);
     if (!pwallet) return UniValue::VNULL;
@@ -957,12 +957,12 @@ static std::vector<RPCArg> OutputsDoc()
     };
 }
 
-static RPCHelpMan bumpfee_helper(std::string method_name)
+static RPCMethod bumpfee_helper(std::string method_name)
 {
     const bool want_psbt = method_name == "psbtbumpfee";
     const std::string incremental_fee{CFeeRate(DEFAULT_INCREMENTAL_RELAY_FEE).ToString(FeeRateFormat::SAT_VB)};
 
-    return RPCHelpMan{method_name,
+    return RPCMethod{method_name,
         "Bumps the fee of a transaction T, replacing it with a new transaction B.\n"
         + std::string(want_psbt ? "Returns a PSBT instead of creating and signing a new transaction.\n" : "") +
         "A transaction with the given txid must be in the wallet.\n"
@@ -1027,7 +1027,7 @@ static RPCHelpMan bumpfee_helper(std::string method_name)
     "\nBump the fee, get the new transaction\'s " + std::string(want_psbt ? "psbt" : "txid") + "\n" +
             HelpExampleCli(method_name, "<txid>")
         },
-        [want_psbt](const RPCHelpMan& self, const JSONRPCRequest& request) -> UniValue
+        [want_psbt](const RPCMethod& self, const JSONRPCRequest& request) -> UniValue
 {
     std::shared_ptr<CWallet> const pwallet = GetWalletForJSONRPCRequest(request);
     if (!pwallet) return UniValue::VNULL;
@@ -1098,28 +1098,24 @@ static RPCHelpMan bumpfee_helper(std::string method_name)
     CAmount old_fee;
     CAmount new_fee;
     CMutableTransaction mtx;
-    feebumper::Result res;
     // Targeting feerate bump.
-    res = feebumper::CreateRateBumpTransaction(*pwallet, hash, coin_control, errors, old_fee, new_fee, mtx, /*require_mine=*/ !want_psbt, outputs, original_change_index);
-    if (res != feebumper::Result::OK) {
-        switch(res) {
+    [&](){
+        switch (feebumper::CreateRateBumpTransaction(*pwallet, hash, coin_control, errors, old_fee, new_fee, mtx, /*require_mine=*/ !want_psbt, outputs, original_change_index)) {
+            case feebumper::Result::OK:
+                return;
             case feebumper::Result::INVALID_ADDRESS_OR_KEY:
                 throw JSONRPCError(RPC_INVALID_ADDRESS_OR_KEY, errors[0].original);
-                break;
             case feebumper::Result::INVALID_REQUEST:
                 throw JSONRPCError(RPC_INVALID_REQUEST, errors[0].original);
-                break;
             case feebumper::Result::INVALID_PARAMETER:
                 throw JSONRPCError(RPC_INVALID_PARAMETER, errors[0].original);
-                break;
             case feebumper::Result::WALLET_ERROR:
                 throw JSONRPCError(RPC_WALLET_ERROR, errors[0].original);
-                break;
-            default:
+            case feebumper::Result::MISC_ERROR:
                 throw JSONRPCError(RPC_MISC_ERROR, errors[0].original);
-                break;
-        }
-    }
+        } // no default case, so the compiler can warn about missing cases
+        NONFATAL_UNREACHABLE();
+    }();
 
     UniValue result(UniValue::VOBJ);
 
@@ -1163,12 +1159,12 @@ static RPCHelpMan bumpfee_helper(std::string method_name)
     };
 }
 
-RPCHelpMan bumpfee() { return bumpfee_helper("bumpfee"); }
-RPCHelpMan psbtbumpfee() { return bumpfee_helper("psbtbumpfee"); }
+RPCMethod bumpfee() { return bumpfee_helper("bumpfee"); }
+RPCMethod psbtbumpfee() { return bumpfee_helper("psbtbumpfee"); }
 
-RPCHelpMan send()
+RPCMethod send()
 {
-    return RPCHelpMan{
+    return RPCMethod{
         "send",
         "EXPERIMENTAL warning: this call may be changed in future releases.\n"
         "\nSend a transaction.\n",
@@ -1251,7 +1247,7 @@ RPCHelpMan send()
         "Create a transaction that should confirm the next block, with a specific input, and return result without adding to wallet or broadcasting to the network\n"
         + HelpExampleCli("send", "'{\"" + EXAMPLE_ADDRESS[0] + "\": 0.1}' 1 economical null '{\"add_to_wallet\": false, \"inputs\": [{\"txid\":\"a08e6907dbbd3d809776dbfc5d82e371b764ed838b5655e72f463568df1aadf0\", \"vout\":1}]}'")
         },
-        [&](const RPCHelpMan& self, const JSONRPCRequest& request) -> UniValue
+        [](const RPCMethod& self, const JSONRPCRequest& request) -> UniValue
         {
             std::shared_ptr<CWallet> const pwallet = GetWalletForJSONRPCRequest(request);
             if (!pwallet) return UniValue::VNULL;
@@ -1290,9 +1286,9 @@ RPCHelpMan send()
     };
 }
 
-RPCHelpMan sendall()
+RPCMethod sendall()
 {
-    return RPCHelpMan{"sendall",
+    return RPCMethod{"sendall",
         "EXPERIMENTAL warning: this call may be changed in future releases.\n"
         "\nSpend the value of all (or specific) confirmed UTXOs and unconfirmed change in the wallet to one or more recipients.\n"
         "Unconfirmed inbound UTXOs and locked UTXOs will not be spent. Sendall will respect the avoid_reuse wallet flag.\n"
@@ -1365,7 +1361,7 @@ RPCHelpMan sendall()
         "Spend all UTXOs with a fee rate of 1.3 " + CURRENCY_ATOM + "/vB using named arguments and sending a 0.25 " + CURRENCY_UNIT + " to another recipient\n"
         + HelpExampleCli("-named sendall", "recipients='[{\"" + EXAMPLE_ADDRESS[1] + "\": 0.25}, \""+ EXAMPLE_ADDRESS[0] + "\"]' fee_rate=1.3\n")
         },
-        [&](const RPCHelpMan& self, const JSONRPCRequest& request) -> UniValue
+        [](const RPCMethod& self, const JSONRPCRequest& request) -> UniValue
         {
             std::shared_ptr<CWallet> const pwallet{GetWalletForJSONRPCRequest(request)};
             if (!pwallet) return UniValue::VNULL;
@@ -1435,7 +1431,16 @@ RPCHelpMan sendall()
             // Do not, ever, assume that it's fine to change the fee rate if the user has explicitly
             // provided one
             if (coin_control.m_feerate && fee_rate > *coin_control.m_feerate) {
-                throw JSONRPCError(RPC_INVALID_PARAMETER, strprintf("Fee rate (%s) is lower than the minimum fee rate setting (%s)", coin_control.m_feerate->ToString(FeeRateFormat::SAT_VB), fee_rate.ToString(FeeRateFormat::SAT_VB)));
+                const auto feerate_format = FeeRateFormat::SAT_VB;
+                auto msg{strprintf("Fee rate (%s) is lower than the minimum fee rate setting (%s).",
+                    coin_control.m_feerate->ToString(feerate_format),
+                    fee_rate.ToString(feerate_format))};
+                if (fee_calc_out.reason == FeeReason::REQUIRED) {
+                    msg += strprintf("\nConsider modifying -mintxfee (%s) or -minrelaytxfee (%s).",
+                        pwallet->m_min_fee.ToString(feerate_format),
+                        pwallet->chain().relayMinFee().ToString(feerate_format));
+                }
+                throw JSONRPCError(RPC_INVALID_PARAMETER, msg);
             }
             if (fee_calc_out.reason == FeeReason::FALLBACK && !pwallet->m_allow_fallback_fee) {
                 // eventually allow a fallback fee
@@ -1570,9 +1575,9 @@ RPCHelpMan sendall()
     };
 }
 
-RPCHelpMan walletprocesspsbt()
+RPCMethod walletprocesspsbt()
 {
-    return RPCHelpMan{
+    return RPCMethod{
         "walletprocesspsbt",
         "Update a PSBT with input information from our wallet and then sign inputs\n"
                 "that we can sign for." +
@@ -1602,7 +1607,7 @@ RPCHelpMan walletprocesspsbt()
                 RPCExamples{
                     HelpExampleCli("walletprocesspsbt", "\"psbt\"")
                 },
-        [&](const RPCHelpMan& self, const JSONRPCRequest& request) -> UniValue
+        [](const RPCMethod& self, const JSONRPCRequest& request) -> UniValue
 {
     const std::shared_ptr<const CWallet> pwallet = GetWalletForJSONRPCRequest(request);
     if (!pwallet) return UniValue::VNULL;
@@ -1654,9 +1659,9 @@ RPCHelpMan walletprocesspsbt()
     };
 }
 
-RPCHelpMan walletcreatefundedpsbt()
+RPCMethod walletcreatefundedpsbt()
 {
-    return RPCHelpMan{
+    return RPCMethod{
         "walletcreatefundedpsbt",
         "Creates and funds a transaction in the Partially Signed Transaction format.\n"
                 "Implements the Creator and Updater roles.\n"
@@ -1733,7 +1738,7 @@ RPCHelpMan walletcreatefundedpsbt()
                             + "\nCreate the same PSBT as the above one instead using named arguments:\n"
                             + HelpExampleCli("-named walletcreatefundedpsbt", "outputs=\"[{\\\"" + EXAMPLE_ADDRESS[0] + "\\\":0.5}]\" add_inputs=true fee_rate=2")
                                 },
-        [&](const RPCHelpMan& self, const JSONRPCRequest& request) -> UniValue
+        [](const RPCMethod& self, const JSONRPCRequest& request) -> UniValue
 {
     std::shared_ptr<CWallet> const pwallet = GetWalletForJSONRPCRequest(request);
     if (!pwallet) return UniValue::VNULL;
diff --git a/src/wallet/rpc/transactions.cpp b/src/wallet/rpc/transactions.cpp
index 34ebdea79c73..1a7480b80dff 100644
--- a/src/wallet/rpc/transactions.cpp
+++ b/src/wallet/rpc/transactions.cpp
@@ -187,9 +187,9 @@ static UniValue ListReceived(const CWallet& wallet, const UniValue& params, cons
     return ret;
 }
 
-RPCHelpMan listreceivedbyaddress()
+RPCMethod listreceivedbyaddress()
 {
-    return RPCHelpMan{
+    return RPCMethod{
         "listreceivedbyaddress",
         "List balances by receiving address.\n",
                 {
@@ -222,7 +222,7 @@ RPCHelpMan listreceivedbyaddress()
             + HelpExampleRpc("listreceivedbyaddress", "6, true, true")
             + HelpExampleRpc("listreceivedbyaddress", "6, true, true, \"" + EXAMPLE_ADDRESS[0] + "\", true")
                 },
-        [&](const RPCHelpMan& self, const JSONRPCRequest& request) -> UniValue
+        [](const RPCMethod& self, const JSONRPCRequest& request) -> UniValue
 {
     const std::shared_ptr<const CWallet> pwallet = GetWalletForJSONRPCRequest(request);
     if (!pwallet) return UniValue::VNULL;
@@ -240,9 +240,9 @@ RPCHelpMan listreceivedbyaddress()
     };
 }
 
-RPCHelpMan listreceivedbylabel()
+RPCMethod listreceivedbylabel()
 {
-    return RPCHelpMan{
+    return RPCMethod{
         "listreceivedbylabel",
         "List received transactions by label.\n",
                 {
@@ -267,7 +267,7 @@ RPCHelpMan listreceivedbylabel()
             + HelpExampleCli("listreceivedbylabel", "6 true")
             + HelpExampleRpc("listreceivedbylabel", "6, true, true, true")
                 },
-        [&](const RPCHelpMan& self, const JSONRPCRequest& request) -> UniValue
+        [](const RPCMethod& self, const JSONRPCRequest& request) -> UniValue
 {
     const std::shared_ptr<const CWallet> pwallet = GetWalletForJSONRPCRequest(request);
     if (!pwallet) return UniValue::VNULL;
@@ -413,9 +413,9 @@ static std::vector<RPCResult> TransactionDescriptionString()
            };
 }
 
-RPCHelpMan listtransactions()
+RPCMethod listtransactions()
 {
-    return RPCHelpMan{
+    return RPCMethod{
         "listtransactions",
         "If a label name is provided, this will return only incoming transactions paying to addresses with the specified label.\n"
                 "Returns up to 'count' most recent transactions ordered from oldest to newest while skipping the first number of \n"
@@ -463,7 +463,7 @@ RPCHelpMan listtransactions()
             "\nAs a JSON-RPC call\n"
             + HelpExampleRpc("listtransactions", "\"*\", 20, 100")
                 },
-        [&](const RPCHelpMan& self, const JSONRPCRequest& request) -> UniValue
+        [](const RPCMethod& self, const JSONRPCRequest& request) -> UniValue
 {
     const std::shared_ptr<const CWallet> pwallet = GetWalletForJSONRPCRequest(request);
     if (!pwallet) return UniValue::VNULL;
@@ -521,9 +521,9 @@ RPCHelpMan listtransactions()
     };
 }
 
-RPCHelpMan listsinceblock()
+RPCMethod listsinceblock()
 {
-    return RPCHelpMan{
+    return RPCMethod{
         "listsinceblock",
         "Get all transactions in blocks since block [blockhash], or all transactions if omitted.\n"
                 "If \"blockhash\" is no longer a part of the main chain, transactions from the fork point onward are included.\n"
@@ -574,7 +574,7 @@ RPCHelpMan listsinceblock()
             + HelpExampleCli("listsinceblock", "\"000000000000000bacf66f7497b7dc45ef753ee9a7d38571037cdb1a57f663ad\" 6")
             + HelpExampleRpc("listsinceblock", "\"000000000000000bacf66f7497b7dc45ef753ee9a7d38571037cdb1a57f663ad\", 6")
                 },
-        [&](const RPCHelpMan& self, const JSONRPCRequest& request) -> UniValue
+        [](const RPCMethod& self, const JSONRPCRequest& request) -> UniValue
 {
     const std::shared_ptr<const CWallet> pwallet = GetWalletForJSONRPCRequest(request);
     if (!pwallet) return UniValue::VNULL;
@@ -660,9 +660,9 @@ RPCHelpMan listsinceblock()
     };
 }
 
-RPCHelpMan gettransaction()
+RPCMethod gettransaction()
 {
-    return RPCHelpMan{
+    return RPCMethod{
         "gettransaction",
         "Get detailed information about in-wallet transaction <txid>\n",
                 {
@@ -705,7 +705,7 @@ RPCHelpMan gettransaction()
                         {RPCResult::Type::STR_HEX, "hex", "Raw data for transaction"},
                         {RPCResult::Type::OBJ, "decoded", /*optional=*/true, "The decoded transaction (only present when `verbose` is passed)",
                         {
-                            DecodeTxDoc(/*txid_field_doc=*/"The transaction id", /*wallet=*/true),
+                            TxDoc({.wallet = true}),
                         }},
                         RESULT_LAST_PROCESSED_BLOCK,
                     })
@@ -716,7 +716,7 @@ RPCHelpMan gettransaction()
             + HelpExampleCli("gettransaction", "\"1075db55d416d3ca199f55b6084e2115b9345e16c5cf302fc80e9d5fbf5d48d\" false true")
             + HelpExampleRpc("gettransaction", "\"1075db55d416d3ca199f55b6084e2115b9345e16c5cf302fc80e9d5fbf5d48d\"")
                 },
-        [&](const RPCHelpMan& self, const JSONRPCRequest& request) -> UniValue
+        [](const RPCMethod& self, const JSONRPCRequest& request) -> UniValue
 {
     const std::shared_ptr<const CWallet> pwallet = GetWalletForJSONRPCRequest(request);
     if (!pwallet) return UniValue::VNULL;
@@ -776,9 +776,9 @@ RPCHelpMan gettransaction()
     };
 }
 
-RPCHelpMan abandontransaction()
+RPCMethod abandontransaction()
 {
-    return RPCHelpMan{
+    return RPCMethod{
         "abandontransaction",
         "Mark in-wallet transaction <txid> as abandoned\n"
                 "This will mark this transaction and all its in-wallet descendants as abandoned which will allow\n"
@@ -793,7 +793,7 @@ RPCHelpMan abandontransaction()
                     HelpExampleCli("abandontransaction", "\"1075db55d416d3ca199f55b6084e2115b9345e16c5cf302fc80e9d5fbf5d48d\"")
             + HelpExampleRpc("abandontransaction", "\"1075db55d416d3ca199f55b6084e2115b9345e16c5cf302fc80e9d5fbf5d48d\"")
                 },
-        [&](const RPCHelpMan& self, const JSONRPCRequest& request) -> UniValue
+        [](const RPCMethod& self, const JSONRPCRequest& request) -> UniValue
 {
     std::shared_ptr<CWallet> const pwallet = GetWalletForJSONRPCRequest(request);
     if (!pwallet) return UniValue::VNULL;
@@ -818,9 +818,9 @@ RPCHelpMan abandontransaction()
     };
 }
 
-RPCHelpMan rescanblockchain()
+RPCMethod rescanblockchain()
 {
-    return RPCHelpMan{
+    return RPCMethod{
         "rescanblockchain",
         "Rescan the local blockchain for wallet related transactions.\n"
                 "Note: Use \"getwalletinfo\" to query the scanning progress.\n"
@@ -841,7 +841,7 @@ RPCHelpMan rescanblockchain()
                     HelpExampleCli("rescanblockchain", "100000 120000")
             + HelpExampleRpc("rescanblockchain", "100000, 120000")
                 },
-        [&](const RPCHelpMan& self, const JSONRPCRequest& request) -> UniValue
+        [](const RPCMethod& self, const JSONRPCRequest& request) -> UniValue
 {
     std::shared_ptr<CWallet> const pwallet = GetWalletForJSONRPCRequest(request);
     if (!pwallet) return UniValue::VNULL;
@@ -905,8 +905,7 @@ RPCHelpMan rescanblockchain()
         throw JSONRPCError(RPC_MISC_ERROR, "Rescan failed. Potentially corrupted data files.");
     case CWallet::ScanResult::USER_ABORT:
         throw JSONRPCError(RPC_MISC_ERROR, "Rescan aborted.");
-        // no default case, so the compiler can warn about missing cases
-    }
+    } // no default case, so the compiler can warn about missing cases
     UniValue response(UniValue::VOBJ);
     response.pushKV("start_height", start_height);
     response.pushKV("stop_height", result.last_scanned_height ? *result.last_scanned_height : UniValue());
@@ -915,9 +914,9 @@ RPCHelpMan rescanblockchain()
     };
 }
 
-RPCHelpMan abortrescan()
+RPCMethod abortrescan()
 {
-    return RPCHelpMan{"abortrescan",
+    return RPCMethod{"abortrescan",
                 "Stops current wallet rescan triggered by an RPC call, e.g. by a rescanblockchain call.\n"
                 "Note: Use \"getwalletinfo\" to query the scanning progress.\n",
                 {},
@@ -930,7 +929,7 @@ RPCHelpMan abortrescan()
             "\nAs a JSON-RPC call\n"
             + HelpExampleRpc("abortrescan", "")
                 },
-        [&](const RPCHelpMan& self, const JSONRPCRequest& request) -> UniValue
+        [](const RPCMethod& self, const JSONRPCRequest& request) -> UniValue
 {
     std::shared_ptr<CWallet> const pwallet = GetWalletForJSONRPCRequest(request);
     if (!pwallet) return UniValue::VNULL;
diff --git a/src/wallet/rpc/util.cpp b/src/wallet/rpc/util.cpp
index 2b980149462f..77a8745ced7e 100644
--- a/src/wallet/rpc/util.cpp
+++ b/src/wallet/rpc/util.cpp
@@ -32,14 +32,13 @@ bool GetAvoidReuseFlag(const CWallet& wallet, const UniValue& param) {
 
 std::string EnsureUniqueWalletName(const JSONRPCRequest& request, std::optional<std::string_view> wallet_name)
 {
-    std::string endpoint_wallet;
-    if (GetWalletNameFromJSONRPCRequest(request, endpoint_wallet)) {
+    if (auto endpoint_wallet{GetWalletNameFromJSONRPCRequest(request)}) {
         // wallet endpoint was used
-        if (wallet_name && *wallet_name != endpoint_wallet) {
+        if (wallet_name && *wallet_name != *endpoint_wallet) {
             throw JSONRPCError(RPC_INVALID_PARAMETER,
                 "The RPC endpoint wallet and the wallet name parameter specify different wallets");
         }
-        return endpoint_wallet;
+        return *endpoint_wallet;
     }
 
     // Not a wallet endpoint; parameter must be provided
@@ -51,14 +50,13 @@ std::string EnsureUniqueWalletName(const JSONRPCRequest& request, std::optional<
     return std::string{*wallet_name};
 }
 
-bool GetWalletNameFromJSONRPCRequest(const JSONRPCRequest& request, std::string& wallet_name)
+std::optional<std::string> GetWalletNameFromJSONRPCRequest(const JSONRPCRequest& request)
 {
     if (request.URI.starts_with(WALLET_ENDPOINT_BASE)) {
         // wallet endpoint was used
-        wallet_name = UrlDecode(std::string_view{request.URI}.substr(WALLET_ENDPOINT_BASE.size()));
-        return true;
+        return UrlDecode(std::string_view{request.URI}.substr(WALLET_ENDPOINT_BASE.size()));
     }
-    return false;
+    return std::nullopt;
 }
 
 std::shared_ptr<CWallet> GetWalletForJSONRPCRequest(const JSONRPCRequest& request)
@@ -66,9 +64,8 @@ std::shared_ptr<CWallet> GetWalletForJSONRPCRequest(const JSONRPCRequest& reques
     CHECK_NONFATAL(request.mode == JSONRPCRequest::EXECUTE);
     WalletContext& context = EnsureWalletContext(request.context);
 
-    std::string wallet_name;
-    if (GetWalletNameFromJSONRPCRequest(request, wallet_name)) {
-        std::shared_ptr<CWallet> pwallet = GetWallet(context, wallet_name);
+    if (auto wallet_name{GetWalletNameFromJSONRPCRequest(request)}) {
+        std::shared_ptr<CWallet> pwallet{GetWallet(context, *wallet_name)};
         if (!pwallet) throw JSONRPCError(RPC_WALLET_NOT_FOUND, "Requested wallet does not exist or is not loaded");
         return pwallet;
     }
diff --git a/src/wallet/rpc/util.h b/src/wallet/rpc/util.h
index 89729218d1a1..88fdc6639f41 100644
--- a/src/wallet/rpc/util.h
+++ b/src/wallet/rpc/util.h
@@ -39,7 +39,7 @@ static const RPCResult RESULT_LAST_PROCESSED_BLOCK { RPCResult::Type::OBJ, "last
  * @return nullptr if no wallet should be used, or a pointer to the CWallet
  */
 std::shared_ptr<CWallet> GetWalletForJSONRPCRequest(const JSONRPCRequest& request);
-bool GetWalletNameFromJSONRPCRequest(const JSONRPCRequest& request, std::string& wallet_name);
+std::optional<std::string> GetWalletNameFromJSONRPCRequest(const JSONRPCRequest& request);
 /**
  * Ensures that a wallet name is specified across the endpoint and wallet_name.
  * Throws `RPC_INVALID_PARAMETER` if none or different wallet names are specified.
diff --git a/src/wallet/rpc/wallet.cpp b/src/wallet/rpc/wallet.cpp
index 9ce274973a6b..b6c9179d19db 100644
--- a/src/wallet/rpc/wallet.cpp
+++ b/src/wallet/rpc/wallet.cpp
@@ -31,9 +31,9 @@ static const std::map<uint64_t, std::string> WALLET_FLAG_CAVEATS{
      "be considered unused, even if the opposite is the case."},
 };
 
-static RPCHelpMan getwalletinfo()
+static RPCMethod getwalletinfo()
 {
-    return RPCHelpMan{"getwalletinfo",
+    return RPCMethod{"getwalletinfo",
                 "Returns an object containing various wallet state info.\n",
                 {},
                 RPCResult{
@@ -53,7 +53,7 @@ static RPCHelpMan getwalletinfo()
                         {
                             {RPCResult::Type::NUM, "duration", "elapsed seconds since scan start"},
                             {RPCResult::Type::NUM, "progress", "scanning progress percentage [0.0, 1.0]"},
-                        }, /*skip_type_check=*/true},
+                        }, {.skip_type_check=true}, },
                         {RPCResult::Type::BOOL, "descriptors", "whether this wallet uses descriptors for output script management"},
                         {RPCResult::Type::BOOL, "external_signer", "whether this wallet is configured to use an external signer such as a hardware wallet"},
                         {RPCResult::Type::BOOL, "blank", "Whether this wallet intentionally does not contain any keys, scripts, or descriptors"},
@@ -69,7 +69,7 @@ static RPCHelpMan getwalletinfo()
                     HelpExampleCli("getwalletinfo", "")
             + HelpExampleRpc("getwalletinfo", "")
                 },
-        [&](const RPCHelpMan& self, const JSONRPCRequest& request) -> UniValue
+        [](const RPCMethod& self, const JSONRPCRequest& request) -> UniValue
 {
     const std::shared_ptr<const CWallet> pwallet = GetWalletForJSONRPCRequest(request);
     if (!pwallet) return UniValue::VNULL;
@@ -133,9 +133,9 @@ static RPCHelpMan getwalletinfo()
     };
 }
 
-static RPCHelpMan listwalletdir()
+static RPCMethod listwalletdir()
 {
-    return RPCHelpMan{"listwalletdir",
+    return RPCMethod{"listwalletdir",
                 "Returns a list of wallets in the wallet directory.\n",
                 {},
                 RPCResult{
@@ -158,7 +158,7 @@ static RPCHelpMan listwalletdir()
                     HelpExampleCli("listwalletdir", "")
             + HelpExampleRpc("listwalletdir", "")
                 },
-        [&](const RPCHelpMan& self, const JSONRPCRequest& request) -> UniValue
+        [](const RPCMethod& self, const JSONRPCRequest& request) -> UniValue
 {
     UniValue wallets(UniValue::VARR);
     for (const auto& [path, db_type] : ListDatabases(GetWalletDir())) {
@@ -179,9 +179,9 @@ static RPCHelpMan listwalletdir()
     };
 }
 
-static RPCHelpMan listwallets()
+static RPCMethod listwallets()
 {
-    return RPCHelpMan{"listwallets",
+    return RPCMethod{"listwallets",
                 "Returns a list of currently loaded wallets.\n"
                 "For full information on the wallet, use \"getwalletinfo\"\n",
                 {},
@@ -195,7 +195,7 @@ static RPCHelpMan listwallets()
                     HelpExampleCli("listwallets", "")
             + HelpExampleRpc("listwallets", "")
                 },
-        [&](const RPCHelpMan& self, const JSONRPCRequest& request) -> UniValue
+        [](const RPCMethod& self, const JSONRPCRequest& request) -> UniValue
 {
     UniValue obj(UniValue::VARR);
 
@@ -210,9 +210,9 @@ static RPCHelpMan listwallets()
     };
 }
 
-static RPCHelpMan loadwallet()
+static RPCMethod loadwallet()
 {
-    return RPCHelpMan{
+    return RPCMethod{
         "loadwallet",
         "Loads a wallet from a wallet file or directory."
                 "\nNote that all wallet command-line options used when starting bitcoind will be"
@@ -242,7 +242,7 @@ static RPCHelpMan loadwallet()
                     + HelpExampleCli("loadwallet", "\"DriveLetter:\\path\\to\\walletname\\\"")
                     + HelpExampleRpc("loadwallet", "\"DriveLetter:\\path\\to\\walletname\\\"")
                 },
-        [&](const RPCHelpMan& self, const JSONRPCRequest& request) -> UniValue
+        [](const RPCMethod& self, const JSONRPCRequest& request) -> UniValue
 {
     WalletContext& context = EnsureWalletContext(request.context);
     const std::string name(request.params[0].get_str());
@@ -275,14 +275,14 @@ static RPCHelpMan loadwallet()
     };
 }
 
-static RPCHelpMan setwalletflag()
+static RPCMethod setwalletflag()
 {
             std::string flags;
             for (auto& it : STRING_TO_WALLET_FLAG)
                 if (it.second & MUTABLE_WALLET_FLAGS)
                     flags += (flags == "" ? "" : ", ") + it.first;
 
-    return RPCHelpMan{
+    return RPCMethod{
         "setwalletflag",
         "Change the state of the given wallet flag for a wallet.\n",
                 {
@@ -301,7 +301,7 @@ static RPCHelpMan setwalletflag()
                     HelpExampleCli("setwalletflag", "avoid_reuse")
                   + HelpExampleRpc("setwalletflag", "\"avoid_reuse\"")
                 },
-        [&](const RPCHelpMan& self, const JSONRPCRequest& request) -> UniValue
+        [](const RPCMethod& self, const JSONRPCRequest& request) -> UniValue
 {
     std::shared_ptr<CWallet> const pwallet = GetWalletForJSONRPCRequest(request);
     if (!pwallet) return UniValue::VNULL;
@@ -343,9 +343,9 @@ static RPCHelpMan setwalletflag()
     };
 }
 
-static RPCHelpMan createwallet()
+static RPCMethod createwallet()
 {
-    return RPCHelpMan{
+    return RPCMethod{
         "createwallet",
         "Creates and loads a new wallet.\n",
         {
@@ -374,7 +374,7 @@ static RPCHelpMan createwallet()
             + HelpExampleCliNamed("createwallet", {{"wallet_name", "descriptors"}, {"avoid_reuse", true}, {"load_on_startup", true}})
             + HelpExampleRpcNamed("createwallet", {{"wallet_name", "descriptors"}, {"avoid_reuse", true}, {"load_on_startup", true}})
         },
-        [&](const RPCHelpMan& self, const JSONRPCRequest& request) -> UniValue
+        [](const RPCMethod& self, const JSONRPCRequest& request) -> UniValue
 {
     WalletContext& context = EnsureWalletContext(request.context);
     uint64_t flags = 0;
@@ -431,9 +431,9 @@ static RPCHelpMan createwallet()
     };
 }
 
-static RPCHelpMan unloadwallet()
+static RPCMethod unloadwallet()
 {
-    return RPCHelpMan{"unloadwallet",
+    return RPCMethod{"unloadwallet",
                 "Unloads the wallet referenced by the request endpoint or the wallet_name argument.\n"
                 "If both are specified, they must be identical.",
                 {
@@ -450,7 +450,7 @@ static RPCHelpMan unloadwallet()
                     HelpExampleCli("unloadwallet", "wallet_name")
             + HelpExampleRpc("unloadwallet", "wallet_name")
                 },
-        [&](const RPCHelpMan& self, const JSONRPCRequest& request) -> UniValue
+        [](const RPCMethod& self, const JSONRPCRequest& request) -> UniValue
 {
     const std::string wallet_name{EnsureUniqueWalletName(request, self.MaybeArg<std::string_view>("wallet_name"))};
 
@@ -486,9 +486,9 @@ static RPCHelpMan unloadwallet()
     };
 }
 
-RPCHelpMan simulaterawtransaction()
+RPCMethod simulaterawtransaction()
 {
-    return RPCHelpMan{
+    return RPCMethod{
         "simulaterawtransaction",
         "Calculate the balance change resulting in the signing and broadcasting of the given transaction(s).\n",
         {
@@ -513,7 +513,7 @@ RPCHelpMan simulaterawtransaction()
             HelpExampleCli("simulaterawtransaction", "[\"myhex\"]")
             + HelpExampleRpc("simulaterawtransaction", "[\"myhex\"]")
         },
-    [&](const RPCHelpMan& self, const JSONRPCRequest& request) -> UniValue
+    [](const RPCMethod& self, const JSONRPCRequest& request) -> UniValue
 {
     const std::shared_ptr<const CWallet> rpc_wallet = GetWalletForJSONRPCRequest(request);
     if (!rpc_wallet) return UniValue::VNULL;
@@ -579,9 +579,9 @@ RPCHelpMan simulaterawtransaction()
     };
 }
 
-static RPCHelpMan migratewallet()
+static RPCMethod migratewallet()
 {
-    return RPCHelpMan{
+    return RPCMethod{
         "migratewallet",
         "Migrate the wallet to a descriptor wallet.\n"
         "A new wallet backup will need to be made.\n"
@@ -607,7 +607,7 @@ static RPCHelpMan migratewallet()
             HelpExampleCli("migratewallet", "")
             + HelpExampleRpc("migratewallet", "")
         },
-        [&](const RPCHelpMan& self, const JSONRPCRequest& request) -> UniValue
+        [](const RPCMethod& self, const JSONRPCRequest& request) -> UniValue
         {
             const std::string wallet_name{EnsureUniqueWalletName(request, self.MaybeArg<std::string_view>("wallet_name"))};
 
@@ -638,9 +638,9 @@ static RPCHelpMan migratewallet()
     };
 }
 
-RPCHelpMan gethdkeys()
+RPCMethod gethdkeys()
 {
-    return RPCHelpMan{
+    return RPCMethod{
         "gethdkeys",
         "List all BIP 32 HD keys in the wallet and which descriptors use them.\n",
         {
@@ -658,7 +658,7 @@ RPCHelpMan gethdkeys()
                     {RPCResult::Type::ARR, "descriptors", "Array of descriptor objects that use this HD key",
                     {
                         {RPCResult::Type::OBJ, "", "", {
-                            {RPCResult::Type::STR, "desc", "Descriptor string representation"},
+                            {RPCResult::Type::STR, "desc", "Descriptor string public representation"},
                             {RPCResult::Type::BOOL, "active", "Whether this descriptor is currently used to generate new addresses"},
                         }},
                     }},
@@ -669,7 +669,7 @@ RPCHelpMan gethdkeys()
             HelpExampleCli("gethdkeys", "") + HelpExampleRpc("gethdkeys", "")
             + HelpExampleCliNamed("gethdkeys", {{"active_only", "true"}, {"private", "true"}}) + HelpExampleRpcNamed("gethdkeys", {{"active_only", "true"}, {"private", "true"}})
         },
-        [&](const RPCHelpMan& self, const JSONRPCRequest& request) -> UniValue
+        [](const RPCMethod& self, const JSONRPCRequest& request) -> UniValue
         {
             const std::shared_ptr<const CWallet> wallet = GetWalletForJSONRPCRequest(request);
             if (!wallet) return UniValue::VNULL;
@@ -705,7 +705,7 @@ RPCHelpMan gethdkeys()
                 w_desc.descriptor->GetPubKeys(desc_pubkeys, desc_xpubs);
                 for (const CExtPubKey& xpub : desc_xpubs) {
                     std::string desc_str;
-                    bool ok = desc_spkm->GetDescriptorString(desc_str, false);
+                    bool ok = desc_spkm->GetDescriptorString(desc_str, /*priv=*/false);
                     CHECK_NONFATAL(ok);
                     wallet_xpubs[xpub].emplace(desc_str, wallet->IsActiveScriptPubKeyMan(*spkm), desc_spkm->HasPrivKey(xpub.pubkey.GetID()));
                     if (std::optional<CKey> key = priv ? desc_spkm->GetKey(xpub.pubkey.GetID()) : std::nullopt) {
@@ -729,7 +729,7 @@ RPCHelpMan gethdkeys()
                 UniValue xpub_info(UniValue::VOBJ);
                 xpub_info.pushKV("xpub", EncodeExtPubKey(xpub));
                 xpub_info.pushKV("has_private", has_xprv);
-                if (priv) {
+                if (priv && has_xprv) {
                     xpub_info.pushKV("xprv", EncodeExtKey(wallet_xprvs.at(xpub)));
                 }
                 xpub_info.pushKV("descriptors", std::move(descriptors));
@@ -742,9 +742,9 @@ RPCHelpMan gethdkeys()
     };
 }
 
-static RPCHelpMan createwalletdescriptor()
+static RPCMethod createwalletdescriptor()
 {
-    return RPCHelpMan{"createwalletdescriptor",
+    return RPCMethod{"createwalletdescriptor",
         "Creates the wallet's descriptor for the given address type. "
         "The address type must be one that the wallet does not already have a descriptor for."
         + HELP_REQUIRING_PASSPHRASE,
@@ -767,7 +767,7 @@ static RPCHelpMan createwalletdescriptor()
             HelpExampleCli("createwalletdescriptor", "bech32m")
             + HelpExampleRpc("createwalletdescriptor", "bech32m")
         },
-        [&](const RPCHelpMan& self, const JSONRPCRequest& request) -> UniValue
+        [](const RPCMethod& self, const JSONRPCRequest& request) -> UniValue
         {
             std::shared_ptr<CWallet> const pwallet = GetWalletForJSONRPCRequest(request);
             if (!pwallet) return UniValue::VNULL;
@@ -841,65 +841,65 @@ static RPCHelpMan createwalletdescriptor()
 }
 
 // addresses
-RPCHelpMan getaddressinfo();
-RPCHelpMan getnewaddress();
-RPCHelpMan getrawchangeaddress();
-RPCHelpMan setlabel();
-RPCHelpMan listaddressgroupings();
-RPCHelpMan keypoolrefill();
-RPCHelpMan getaddressesbylabel();
-RPCHelpMan listlabels();
+RPCMethod getaddressinfo();
+RPCMethod getnewaddress();
+RPCMethod getrawchangeaddress();
+RPCMethod setlabel();
+RPCMethod listaddressgroupings();
+RPCMethod keypoolrefill();
+RPCMethod getaddressesbylabel();
+RPCMethod listlabels();
 #ifdef ENABLE_EXTERNAL_SIGNER
-RPCHelpMan walletdisplayaddress();
+RPCMethod walletdisplayaddress();
 #endif // ENABLE_EXTERNAL_SIGNER
 
 // backup
-RPCHelpMan importprunedfunds();
-RPCHelpMan removeprunedfunds();
-RPCHelpMan importdescriptors();
-RPCHelpMan listdescriptors();
-RPCHelpMan backupwallet();
-RPCHelpMan restorewallet();
+RPCMethod importprunedfunds();
+RPCMethod removeprunedfunds();
+RPCMethod importdescriptors();
+RPCMethod listdescriptors();
+RPCMethod backupwallet();
+RPCMethod restorewallet();
 
 // coins
-RPCHelpMan getreceivedbyaddress();
-RPCHelpMan getreceivedbylabel();
-RPCHelpMan getbalance();
-RPCHelpMan lockunspent();
-RPCHelpMan listlockunspent();
-RPCHelpMan getbalances();
-RPCHelpMan listunspent();
+RPCMethod getreceivedbyaddress();
+RPCMethod getreceivedbylabel();
+RPCMethod getbalance();
+RPCMethod lockunspent();
+RPCMethod listlockunspent();
+RPCMethod getbalances();
+RPCMethod listunspent();
 
 // encryption
-RPCHelpMan walletpassphrase();
-RPCHelpMan walletpassphrasechange();
-RPCHelpMan walletlock();
-RPCHelpMan encryptwallet();
+RPCMethod walletpassphrase();
+RPCMethod walletpassphrasechange();
+RPCMethod walletlock();
+RPCMethod encryptwallet();
 
 // spend
-RPCHelpMan sendtoaddress();
-RPCHelpMan sendmany();
-RPCHelpMan fundrawtransaction();
-RPCHelpMan bumpfee();
-RPCHelpMan psbtbumpfee();
-RPCHelpMan send();
-RPCHelpMan sendall();
-RPCHelpMan walletprocesspsbt();
-RPCHelpMan walletcreatefundedpsbt();
-RPCHelpMan signrawtransactionwithwallet();
+RPCMethod sendtoaddress();
+RPCMethod sendmany();
+RPCMethod fundrawtransaction();
+RPCMethod bumpfee();
+RPCMethod psbtbumpfee();
+RPCMethod send();
+RPCMethod sendall();
+RPCMethod walletprocesspsbt();
+RPCMethod walletcreatefundedpsbt();
+RPCMethod signrawtransactionwithwallet();
 
 // signmessage
-RPCHelpMan signmessage();
+RPCMethod signmessage();
 
 // transactions
-RPCHelpMan listreceivedbyaddress();
-RPCHelpMan listreceivedbylabel();
-RPCHelpMan listtransactions();
-RPCHelpMan listsinceblock();
-RPCHelpMan gettransaction();
-RPCHelpMan abandontransaction();
-RPCHelpMan rescanblockchain();
-RPCHelpMan abortrescan();
+RPCMethod listreceivedbyaddress();
+RPCMethod listreceivedbylabel();
+RPCMethod listtransactions();
+RPCMethod listsinceblock();
+RPCMethod gettransaction();
+RPCMethod abandontransaction();
+RPCMethod rescanblockchain();
+RPCMethod abortrescan();
 
 std::span<const CRPCCommand> GetWalletRPCCommands()
 {
diff --git a/src/wallet/scriptpubkeyman.h b/src/wallet/scriptpubkeyman.h
index 00dd6eed4d1a..4ac09add62b2 100644
--- a/src/wallet/scriptpubkeyman.h
+++ b/src/wallet/scriptpubkeyman.h
@@ -6,6 +6,7 @@
 #define BITCOIN_WALLET_SCRIPTPUBKEYMAN_H
 
 #include <addresstype.h>
+#include <btcsignals.h>
 #include <common/messages.h>
 #include <common/signmessage.h>
 #include <common/types.h>
@@ -23,8 +24,6 @@
 #include <wallet/walletdb.h>
 #include <wallet/walletutil.h>
 
-#include <boost/signals2/signal.hpp>
-
 #include <functional>
 #include <optional>
 #include <unordered_map>
@@ -120,9 +119,6 @@ class ScriptPubKeyMan
     virtual bool HavePrivateKeys() const { return false; }
     virtual bool HaveCryptedKeys() const { return false; }
 
-    //! The action to do when the DB needs rewrite
-    virtual void RewriteDB() {}
-
     virtual unsigned int GetKeyPoolSize() const { return 0; }
 
     virtual int64_t GetTimeFirstKey() const { return 0; }
@@ -156,10 +152,10 @@ class ScriptPubKeyMan
     };
 
     /** Keypool has new keys */
-    boost::signals2::signal<void ()> NotifyCanGetAddressesChanged;
+    btcsignals::signal<void ()> NotifyCanGetAddressesChanged;
 
     /** Birth time changed */
-    boost::signals2::signal<void (const ScriptPubKeyMan* spkm, int64_t new_birth_time)> NotifyFirstKeyTimeChanged;
+    btcsignals::signal<void (const ScriptPubKeyMan* spkm, int64_t new_birth_time)> NotifyFirstKeyTimeChanged;
 };
 
 /** OutputTypes supported by the LegacyScriptPubKeyMan */
diff --git a/src/wallet/spend.cpp b/src/wallet/spend.cpp
index 3db42d1b162a..0a6d00561e07 100644
--- a/src/wallet/spend.cpp
+++ b/src/wallet/spend.cpp
@@ -939,7 +939,7 @@ util::Result<SelectionResult> AutomaticCoinSelection(const CWallet& wallet, Coin
             if (group.m_ancestors >= max_ancestors || group.m_max_cluster_count >= max_cluster_count) total_unconf_long_chain += group.GetSelectionAmount();
         }
 
-        if (CAmount total_amount = available_coins.GetTotalAmount() - total_discarded < value_to_select) {
+        if (CAmount total_amount = available_coins.GetTotalAmount() - total_discarded; total_amount < value_to_select) {
             // Special case, too-long-mempool cluster.
             if (total_amount + total_unconf_long_chain > value_to_select) {
                 return util::Error{_("Unconfirmed UTXOs are available, but spending them creates a chain of transactions that will be rejected by the mempool")};
@@ -1159,7 +1159,18 @@ static util::Result<CreatedTransactionResult> CreateTransactionInternal(
     // Do not, ever, assume that it's fine to change the fee rate if the user has explicitly
     // provided one
     if (coin_control.m_feerate && coin_selection_params.m_effective_feerate > *coin_control.m_feerate) {
-        return util::Error{strprintf(_("Fee rate (%s) is lower than the minimum fee rate setting (%s)"), coin_control.m_feerate->ToString(FeeRateFormat::SAT_VB), coin_selection_params.m_effective_feerate.ToString(FeeRateFormat::SAT_VB))};
+        const auto feerate_format = FeeRateFormat::SAT_VB;
+        auto msg{strprintf(_("Fee rate (%s) is lower than the minimum fee rate setting (%s)."),
+            coin_control.m_feerate->ToString(feerate_format),
+            coin_selection_params.m_effective_feerate.ToString(feerate_format))};
+        if (feeCalc.reason == FeeReason::REQUIRED) {
+            msg += strprintf(_("\nConsider modifying %s (%s) or %s (%s)."),
+                "-mintxfee",
+                wallet.m_min_fee.ToString(feerate_format),
+                "-minrelaytxfee",
+                wallet.chain().relayMinFee().ToString(feerate_format));
+        }
+        return util::Error{msg};
     }
     if (feeCalc.reason == FeeReason::FALLBACK && !wallet.m_allow_fallback_fee) {
         // eventually allow a fallback fee
diff --git a/src/wallet/test/coinselection_tests.cpp b/src/wallet/test/coinselection_tests.cpp
index 4a0eed8f0901..6e60af1c0e30 100644
--- a/src/wallet/test/coinselection_tests.cpp
+++ b/src/wallet/test/coinselection_tests.cpp
@@ -18,30 +18,46 @@ static FastRandomContext default_rand;
 static const int P2WPKH_INPUT_VSIZE = 68;
 static const int P2WPKH_OUTPUT_VSIZE = 31;
 
-/** Default coin selection parameters (dcsp) allow us to only explicitly set
- * parameters when a diverging value is relevant in the context of a test.
- * We use P2WPKH input and output weights for the change weights. */
-static CoinSelectionParams init_default_params()
+/**
+ * This set of feerates is used in the tests to test edge cases around the
+ * default minimum feerate and other potential special cases:
+ * - zero: 0 s/kvB
+ * - minimum non-zero s/kvB: 1 s/kvB
+ * - just below the new default minimum feerate: 99 s/kvB
+ * - new default minimum feerate: 100 s/kvB
+ * - old default minimum feerate: 1000 s/kvB
+ * - a few non-round realistic feerates around default minimum feerate,
+ * dust feerate, and default LTFRE: 315 s/kvB, 2345 s/kvB, and
+ * 10'292 s/kvB
+ * - a high feerate that has been exceeded occasionally: 59'764 s/kvB
+ * - a huge feerate that is extremely uncommon: 1'500'000 s/kvB */
+static const std::vector<int> FEERATES = {0, 1, 99, 100, 315, 1'000, 2'345, 10'292, 59'764, 1'500'000};
+
+/** Default coin selection parameters allow us to only explicitly set
+ * parameters when a diverging value is relevant in the context of a test,
+ * without reiterating the defaults in every test. We use P2WPKH input and
+ * output weights for the change weights. */
+static CoinSelectionParams init_cs_params(int eff_feerate = 5000)
 {
-    CoinSelectionParams dcsp{
+    CoinSelectionParams csp{
         /*rng_fast=*/default_rand,
         /*change_output_size=*/P2WPKH_OUTPUT_VSIZE,
         /*change_spend_size=*/P2WPKH_INPUT_VSIZE,
         /*min_change_target=*/50'000,
-        /*effective_feerate=*/CFeeRate(5000),
+        /*effective_feerate=*/CFeeRate(eff_feerate),
         /*long_term_feerate=*/CFeeRate(10'000),
         /*discard_feerate=*/CFeeRate(3000),
         /*tx_noinputs_size=*/11 + P2WPKH_OUTPUT_VSIZE, //static header size + output size
         /*avoid_partial=*/false,
     };
-    dcsp.m_change_fee = /*155 sats=*/dcsp.m_effective_feerate.GetFee(dcsp.change_output_size);
-    dcsp.min_viable_change = /*204 sats=*/dcsp.m_discard_feerate.GetFee(dcsp.change_spend_size);
-    dcsp.m_cost_of_change = /*204 + 155 sats=*/dcsp.min_viable_change + dcsp.m_change_fee;
-    dcsp.m_subtract_fee_outputs = false;
-    return dcsp;
+    csp.m_change_fee = csp.m_effective_feerate.GetFee(csp.change_output_size); // 155 sats for default feerate of 5000 s/kvB
+    csp.min_viable_change = /*204 sats=*/csp.m_discard_feerate.GetFee(csp.change_spend_size);
+    csp.m_cost_of_change = csp.min_viable_change + csp.m_change_fee; // 204 + 155 sats for default feerate of 5000 s/kvB
+    csp.m_subtract_fee_outputs = false;
+    return csp;
 }
 
-static const CoinSelectionParams default_cs_params = init_default_params();
+static const CoinSelectionParams default_cs_params = init_cs_params();
 
 /** Make one OutputGroup with a single UTXO that either has a given effective value (default) or a given amount (`is_eff_value = false`). */
 static OutputGroup MakeCoin(const CAmount& amount, bool is_eff_value = true, CoinSelectionParams cs_params = default_cs_params, int custom_spending_vsize = P2WPKH_INPUT_VSIZE)
@@ -106,15 +122,16 @@ static void TestBnBSuccess(std::string test_title, std::vector<OutputGroup>& utx
         expected_result.AddInput(group);
     }
 
-    const auto result = SelectCoinsBnB(utxo_pool, selection_target, /*cost_of_change=*/default_cs_params.m_cost_of_change, max_selection_weight);
+    const auto result = SelectCoinsBnB(utxo_pool, selection_target, /*cost_of_change=*/cs_params.m_cost_of_change, max_selection_weight);
     BOOST_CHECK_MESSAGE(result, "Falsy result in BnB-Success: " + test_title);
     BOOST_CHECK_MESSAGE(HaveEquivalentValues(expected_result, *result), strprintf("Result mismatch in BnB-Success: %s. Expected %s, but got %s", test_title, InputAmountsToString(expected_result), InputAmountsToString(*result)));
     BOOST_CHECK_MESSAGE(result->GetSelectedValue() == expected_amount, strprintf("Selected amount mismatch in BnB-Success: %s. Expected %d, but got %d", test_title, expected_amount, result->GetSelectedValue()));
+    BOOST_CHECK_MESSAGE(result->GetWeight() <= max_selection_weight, strprintf("Selected weight is higher than permitted in BnB-Success: %s. Expected %d, but got %d", test_title, max_selection_weight, result->GetWeight()));
 }
 
-static void TestBnBFail(std::string test_title, std::vector<OutputGroup>& utxo_pool, const CAmount& selection_target, int max_selection_weight = MAX_STANDARD_TX_WEIGHT, const bool expect_max_weight_exceeded = false)
+static void TestBnBFail(std::string test_title, std::vector<OutputGroup>& utxo_pool, const CAmount& selection_target, const CoinSelectionParams& cs_params = default_cs_params, int max_selection_weight = MAX_STANDARD_TX_WEIGHT, const bool expect_max_weight_exceeded = false)
 {
-    const auto result = SelectCoinsBnB(utxo_pool, selection_target, /*cost_of_change=*/default_cs_params.m_cost_of_change, max_selection_weight);
+    const auto result = SelectCoinsBnB(utxo_pool, selection_target, /*cost_of_change=*/cs_params.m_cost_of_change, max_selection_weight);
     BOOST_CHECK_MESSAGE(!result, "BnB-Fail: " + test_title);
     bool max_weight_exceeded = util::ErrorString(result).original.find("The inputs size exceeds the maximum weight") != std::string::npos;
     BOOST_CHECK(expect_max_weight_exceeded == max_weight_exceeded);
@@ -122,16 +139,12 @@ static void TestBnBFail(std::string test_title, std::vector<OutputGroup>& utxo_p
 
 BOOST_AUTO_TEST_CASE(bnb_test)
 {
-    std::vector<int> feerates = {0, 1, 5'000, 10'000, 25'000, 59'764, 500'000, 999'000, 1'500'000};
-
-    for (int feerate : feerates) {
+    for (int feerate : FEERATES) {
         std::vector<OutputGroup> utxo_pool;
 
-        CoinSelectionParams cs_params = init_default_params();
-        cs_params.m_effective_feerate = CFeeRate{feerate};
+        const CoinSelectionParams cs_params = init_cs_params(feerate);
 
-        // Fail for empty UTXO pool
-        TestBnBFail("Empty UTXO pool", utxo_pool, /*selection_target=*/1 * CENT);
+        TestBnBFail("Empty UTXO pool", utxo_pool, /*selection_target=*/1 * CENT, cs_params);
 
         AddCoins(utxo_pool, {1 * CENT, 3 * CENT, 5 * CENT}, cs_params);
 
@@ -143,24 +156,24 @@ BOOST_AUTO_TEST_CASE(bnb_test)
         TestBnBSuccess("Select all UTXOs", utxo_pool, /*selection_target=*/9 * CENT, /*expected_input_amounts=*/{1 * CENT, 3 * CENT, 5 * CENT}, cs_params);
 
         // BnB finds changeless solution while overshooting by up to cost_of_change
-        TestBnBSuccess("Select upper bound", utxo_pool, /*selection_target=*/4 * CENT - default_cs_params.m_cost_of_change, /*expected_input_amounts=*/{1 * CENT, 3 * CENT}, cs_params);
+        TestBnBSuccess("Select upper bound", utxo_pool, /*selection_target=*/4 * CENT - cs_params.m_cost_of_change, /*expected_input_amounts=*/{1 * CENT, 3 * CENT}, cs_params);
 
         // BnB fails to find changeless solution when overshooting by cost_of_change + 1 sat
-        TestBnBFail("Overshoot upper bound", utxo_pool, /*selection_target=*/4 * CENT - default_cs_params.m_cost_of_change - 1);
+        TestBnBFail("Overshoot upper bound", utxo_pool, /*selection_target=*/4 * CENT - cs_params.m_cost_of_change - 1, cs_params);
 
         TestBnBSuccess("Select max weight", utxo_pool, /*selection_target=*/4 * CENT, /*expected_input_amounts=*/{1 * CENT, 3 * CENT}, cs_params, /*custom_spending_vsize=*/P2WPKH_INPUT_VSIZE, /*max_selection_weight=*/4 * 2 * P2WPKH_INPUT_VSIZE);
 
-        TestBnBFail("Exceed max weight", utxo_pool, /*selection_target=*/4 * CENT, /*max_selection_weight=*/4 * 2 * P2WPKH_INPUT_VSIZE - 1, /*expect_max_weight_exceeded=*/true);
+        TestBnBFail("Exceed max weight", utxo_pool, /*selection_target=*/4 * CENT, cs_params, /*max_selection_weight=*/4 * 2 * P2WPKH_INPUT_VSIZE - 1, /*expect_max_weight_exceeded=*/true);
 
         // Simple cases without BnB solution
-        TestBnBFail("Smallest combination too big", utxo_pool, /*selection_target=*/0.5 * CENT);
-        TestBnBFail("No UTXO combination in target window", utxo_pool, /*selection_target=*/7 * CENT);
-        TestBnBFail("Select more than available", utxo_pool, /*selection_target=*/10 * CENT);
+        TestBnBFail("Smallest combination too big", utxo_pool, /*selection_target=*/0.5 * CENT, cs_params);
+        TestBnBFail("No UTXO combination in target window", utxo_pool, /*selection_target=*/7 * CENT, cs_params);
+        TestBnBFail("Select more than available", utxo_pool, /*selection_target=*/10 * CENT, cs_params);
 
         // Test skipping of equivalent input sets
         std::vector<OutputGroup> clone_pool;
         AddCoins(clone_pool, {2 * CENT, 7 * CENT, 7 * CENT}, cs_params);
-        AddDuplicateCoins(clone_pool, 50'000, 5 * CENT, cs_params);
+        AddDuplicateCoins(clone_pool, /*count=*/50'000, /*amount=*/5 * CENT, cs_params);
         TestBnBSuccess("Skip equivalent input sets", clone_pool, /*selection_target=*/16 * CENT, /*expected_input_amounts=*/{2 * CENT, 7 * CENT, 7 * CENT}, cs_params);
 
         /* Test BnB attempt limit (`TOTAL_TRIES`)
@@ -189,7 +202,7 @@ BOOST_AUTO_TEST_CASE(bnb_test)
                 expected_inputs.push_back(doppelgangers[i]);
             } else {
                 // Any eight UTXOs including at least one UTXO with the added cost_of_change will exceed target window
-                doppelgangers.push_back(1 * CENT + default_cs_params.m_cost_of_change + i);
+                doppelgangers.push_back(1 * CENT + cs_params.m_cost_of_change + i);
             }
         }
         AddCoins(doppelganger_pool, doppelgangers, cs_params);
@@ -197,8 +210,8 @@ BOOST_AUTO_TEST_CASE(bnb_test)
         TestBnBSuccess("Combine smallest 8 of 17 unique UTXOs", doppelganger_pool, /*selection_target=*/8 * CENT, /*expected_input_amounts=*/expected_inputs, cs_params);
 
         // Starting with 18 unique UTXOs of similar effective value we will not find the solution due to exceeding the attempt limit
-        AddCoins(doppelganger_pool, {1 * CENT + default_cs_params.m_cost_of_change + 17}, cs_params);
-        TestBnBFail("Exhaust looking for smallest 8 of 18 unique UTXOs", doppelganger_pool, /*selection_target=*/8 * CENT);
+        AddCoins(doppelganger_pool, {1 * CENT + cs_params.m_cost_of_change + 17}, cs_params);
+        TestBnBFail("Exhaust looking for smallest 8 of 18 unique UTXOs", doppelganger_pool, /*selection_target=*/8 * CENT, cs_params);
     }
 }
 
@@ -209,8 +222,7 @@ BOOST_AUTO_TEST_CASE(bnb_feerate_sensitivity_test)
     AddCoins(low_feerate_pool, {2 * CENT, 3 * CENT, 5 * CENT, 10 * CENT});
     TestBnBSuccess("Select many inputs at low feerates", low_feerate_pool, /*selection_target=*/10 * CENT, /*expected_input_amounts=*/{2 * CENT, 3 * CENT, 5 * CENT});
 
-    CoinSelectionParams high_feerate_params = init_default_params();
-    high_feerate_params.m_effective_feerate = CFeeRate{25'000};
+    const CoinSelectionParams high_feerate_params = init_cs_params(/*eff_feerate=*/25'000);
     std::vector<OutputGroup> high_feerate_pool; // 25 sat/vB (greater than long_term_feerate of 10 sat/vB)
     AddCoins(high_feerate_pool, {2 * CENT, 3 * CENT, 5 * CENT, 10 * CENT}, high_feerate_params);
     TestBnBSuccess("Select one input at high feerates", high_feerate_pool, /*selection_target=*/10 * CENT, /*expected_input_amounts=*/{10 * CENT}, high_feerate_params);
@@ -225,5 +237,54 @@ BOOST_AUTO_TEST_CASE(bnb_feerate_sensitivity_test)
     TestBnBSuccess("Prefer two light inputs over two heavy inputs at high feerates", high_feerate_pool, /*selection_target=*/13 * CENT, /*expected_input_amounts=*/{3 * CENT, 10 * CENT}, high_feerate_params);
 }
 
+static void TestSRDSuccess(std::string test_title, std::vector<OutputGroup>& utxo_pool, const CAmount& selection_target, const CoinSelectionParams& cs_params = default_cs_params, const int max_selection_weight = MAX_STANDARD_TX_WEIGHT)
+{
+    CAmount expected_min_amount = selection_target + cs_params.m_change_fee + CHANGE_LOWER;
+
+    const auto result = SelectCoinsSRD(utxo_pool, selection_target, cs_params.m_change_fee, cs_params.rng_fast, max_selection_weight);
+    BOOST_CHECK_MESSAGE(result, "Falsy result in SRD-Success: " + test_title);
+    const CAmount selected_effective_value = result->GetSelectedEffectiveValue();
+    BOOST_CHECK_MESSAGE(selected_effective_value >= expected_min_amount, strprintf("Selected effective value is lower than expected in SRD-Success: %s. Expected %d, but got %d", test_title, expected_min_amount, selected_effective_value));
+    BOOST_CHECK_MESSAGE(result->GetWeight() <= max_selection_weight, strprintf("Selected weight is higher than permitted in SRD-Success: %s. Expected %d, but got %d", test_title, max_selection_weight, result->GetWeight()));
+}
+
+static void TestSRDFail(std::string test_title, std::vector<OutputGroup>& utxo_pool, const CAmount& selection_target, const CoinSelectionParams& cs_params = default_cs_params, int max_selection_weight = MAX_STANDARD_TX_WEIGHT, const bool expect_max_weight_exceeded = false)
+{
+    const auto result = SelectCoinsSRD(utxo_pool, selection_target, cs_params.m_change_fee, cs_params.rng_fast, max_selection_weight);
+    BOOST_CHECK_MESSAGE(!result, "SRD-Fail: " + test_title);
+    bool max_weight_exceeded = util::ErrorString(result).original.find("The inputs size exceeds the maximum weight") != std::string::npos;
+    BOOST_CHECK(expect_max_weight_exceeded == max_weight_exceeded);
+}
+
+BOOST_AUTO_TEST_CASE(srd_test)
+{
+    for (int feerate : FEERATES) {
+        std::vector<OutputGroup> utxo_pool;
+
+        const CoinSelectionParams cs_params = init_cs_params(feerate);
+
+        TestSRDFail("Empty UTXO pool", utxo_pool, /*selection_target=*/1 * CENT, cs_params);
+
+        AddCoins(utxo_pool, {1 * CENT, 3 * CENT, 5 * CENT}, cs_params);
+
+        TestSRDSuccess("Select 21k sats", utxo_pool, /*selection_target=*/21'000, cs_params);
+        TestSRDSuccess("Select 1 CENT", utxo_pool, /*selection_target=*/1 * CENT, cs_params);
+        TestSRDSuccess("Select 3.125 CENT", utxo_pool, /*selection_target=*/3'125'000, cs_params);
+        TestSRDSuccess("Select 4 CENT", utxo_pool, /*selection_target=*/4 * CENT, cs_params);
+        TestSRDSuccess("Select 7 CENT", utxo_pool, /*selection_target=*/7 * CENT, cs_params);
+
+        // The minimum change amount for SRD is the feerate dependent `change_fee` plus CHANGE_LOWER
+        TestSRDSuccess("Create minimum change", utxo_pool, /*selection_target=*/9 * CENT - cs_params.m_change_fee - CHANGE_LOWER, cs_params);
+        TestSRDFail("Undershoot minimum change by one sat", utxo_pool, /*selection_target=*/9 * CENT - cs_params.m_change_fee - CHANGE_LOWER + 1, cs_params);
+        TestSRDFail("Spend more than available", utxo_pool, /*selection_target=*/9 * CENT + 1, cs_params);
+        TestSRDFail("Spend everything", utxo_pool, /*selection_target=*/9 * CENT, cs_params);
+
+        AddDuplicateCoins(utxo_pool, /*count=*/100, /*amount=*/5 * CENT, cs_params);
+        AddDuplicateCoins(utxo_pool, /*count=*/3, /*amount=*/7 * CENT, cs_params);
+        TestSRDSuccess("Select most valuable UTXOs for acceptable weight", utxo_pool, /*selection_target=*/20 * CENT, cs_params, /*max_selection_weight=*/4 * 4 * (P2WPKH_INPUT_VSIZE - 1 ));
+        TestSRDFail("No acceptable weight possible", utxo_pool, /*selection_target=*/25 * CENT, cs_params, /*max_selection_weight=*/4 * 3 * P2WPKH_INPUT_VSIZE, /*expect_max_weight_exceeded=*/true);
+    }
+}
+
 BOOST_AUTO_TEST_SUITE_END()
 } // namespace wallet
diff --git a/src/wallet/test/coinselector_tests.cpp b/src/wallet/test/coinselector_tests.cpp
index fe33e9347e78..ee6a639a43db 100644
--- a/src/wallet/test/coinselector_tests.cpp
+++ b/src/wallet/test/coinselector_tests.cpp
@@ -1185,96 +1185,6 @@ BOOST_AUTO_TEST_CASE(coin_grinder_tests)
     }
 }
 
-static util::Result<SelectionResult> SelectCoinsSRD(const CAmount& target,
-                                                    const CoinSelectionParams& cs_params,
-                                                    const node::NodeContext& m_node,
-                                                    int max_selection_weight,
-                                                    std::function<CoinsResult(CWallet&)> coin_setup)
-{
-    std::unique_ptr<CWallet> wallet = NewWallet(m_node);
-    CoinEligibilityFilter filter(0, 0, 0); // accept all coins without ancestors
-    Groups group = GroupOutputs(*wallet, coin_setup(*wallet), cs_params, {{filter}})[filter].all_groups;
-    return SelectCoinsSRD(group.positive_group, target, cs_params.m_change_fee, cs_params.rng_fast, max_selection_weight);
-}
-
-BOOST_AUTO_TEST_CASE(srd_tests)
-{
-    // Test SRD:
-    // 1) Insufficient funds, select all provided coins and fail.
-    // 2) Exceeded max weight, coin selection always surpasses the max allowed weight.
-    // 3) Select coins without surpassing the max weight (some coins surpasses the max allowed weight, some others not)
-
-    FastRandomContext rand;
-    CoinSelectionParams dummy_params{ // Only used to provide the 'avoid_partial' flag.
-            rand,
-            /*change_output_size=*/34,
-            /*change_spend_size=*/68,
-            /*min_change_target=*/CENT,
-            /*effective_feerate=*/CFeeRate(0),
-            /*long_term_feerate=*/CFeeRate(0),
-            /*discard_feerate=*/CFeeRate(0),
-            /*tx_noinputs_size=*/10 + 34, // static header size + output size
-            /*avoid_partial=*/false,
-    };
-
-    {
-        // #########################################################
-        // 1) Insufficient funds, select all provided coins and fail
-        // #########################################################
-        CAmount target = 49.5L * COIN;
-        int max_selection_weight = 10000; // high enough to not fail for this reason.
-        const auto& res = SelectCoinsSRD(target, dummy_params, m_node, max_selection_weight, [&](CWallet& wallet) {
-            CoinsResult available_coins;
-            for (int j = 0; j < 10; ++j) {
-                add_coin(available_coins, wallet, CAmount(1 * COIN));
-                add_coin(available_coins, wallet, CAmount(2 * COIN));
-            }
-            return available_coins;
-        });
-        BOOST_CHECK(!res);
-        BOOST_CHECK(util::ErrorString(res).empty()); // empty means "insufficient funds"
-    }
-
-    {
-        // ###########################
-        // 2) Test max weight exceeded
-        // ###########################
-        CAmount target = 49.5L * COIN;
-        int max_selection_weight = 3000;
-        const auto& res = SelectCoinsSRD(target, dummy_params, m_node, max_selection_weight, [&](CWallet& wallet) {
-            CoinsResult available_coins;
-            for (int j = 0; j < 10; ++j) {
-                /* 10 × 1 BTC + 10 × 2 BTC = 30 BTC. 20 × 272 WU = 5440 WU */
-                add_coin(available_coins, wallet, CAmount(1 * COIN), CFeeRate(0), 144, false, 0, true);
-                add_coin(available_coins, wallet, CAmount(2 * COIN), CFeeRate(0), 144, false, 0, true);
-            }
-            return available_coins;
-        });
-        BOOST_CHECK(!res);
-        BOOST_CHECK(util::ErrorString(res).original.find("The inputs size exceeds the maximum weight") != std::string::npos);
-    }
-
-    {
-        // ################################################################################################################
-        // 3) Test that SRD result does not exceed the max weight
-        // ################################################################################################################
-        CAmount target = 25.33L * COIN;
-        int max_selection_weight = 10000; // WU
-        const auto& res = SelectCoinsSRD(target, dummy_params, m_node, max_selection_weight, [&](CWallet& wallet) {
-            CoinsResult available_coins;
-            for (int j = 0; j < 60; ++j) { // 60 UTXO --> 19,8 BTC total --> 60 × 272 WU = 16320 WU
-                add_coin(available_coins, wallet, CAmount(0.33 * COIN), CFeeRate(0), 144, false, 0, true);
-            }
-            for (int i = 0; i < 10; i++) { // 10 UTXO --> 20 BTC total --> 10 × 272 WU = 2720 WU
-                add_coin(available_coins, wallet, CAmount(2 * COIN), CFeeRate(0), 144, false, 0, true);
-            }
-            return available_coins;
-        });
-        BOOST_CHECK(res);
-        BOOST_CHECK(res->GetWeight() <= max_selection_weight);
-    }
-}
-
 static util::Result<SelectionResult> select_coins(const CAmount& target, const CoinSelectionParams& cs_params, const CCoinControl& cc, std::function<CoinsResult(CWallet&)> coin_setup, const node::NodeContext& m_node)
 {
     std::unique_ptr<CWallet> wallet = NewWallet(m_node);
diff --git a/src/wallet/test/fuzz/coinselection.cpp b/src/wallet/test/fuzz/coinselection.cpp
index 8b30423c6f22..42a53a83c345 100644
--- a/src/wallet/test/fuzz/coinselection.cpp
+++ b/src/wallet/test/fuzz/coinselection.cpp
@@ -275,7 +275,7 @@ FUZZ_TARGET(bnb_finds_min_waste)
 
     // Brute force optimal solution (lowest waste, but cannot be superset of another solution)
     std::vector<uint32_t> solutions;
-    int best_waste{std::numeric_limits<int>::max()};
+    CAmount best_waste{std::numeric_limits<int64_t>::max()};
     int best_weight{std::numeric_limits<int>::max()};
     for (uint32_t pattern = 1; (pattern >> num_groups) == 0; ++pattern) {
         // BnB does not permit adding more inputs to a solution, i.e. a superset of a solution cannot ever be a solution.
diff --git a/src/wallet/test/fuzz/crypter.cpp b/src/wallet/test/fuzz/crypter.cpp
index f8f5935416e8..81f8240333e5 100644
--- a/src/wallet/test/fuzz/crypter.cpp
+++ b/src/wallet/test/fuzz/crypter.cpp
@@ -11,11 +11,9 @@
 namespace wallet {
 namespace {
 
-const TestingSetup* g_setup;
 void initialize_crypter()
 {
     static const auto testing_setup = MakeNoLogFileContext<const TestingSetup>();
-    g_setup = testing_setup.get();
 }
 
 FUZZ_TARGET(crypter, .init = initialize_crypter)
diff --git a/src/wallet/test/fuzz/fees.cpp b/src/wallet/test/fuzz/fees.cpp
index 5d6c67b74290..0d332c5908ba 100644
--- a/src/wallet/test/fuzz/fees.cpp
+++ b/src/wallet/test/fuzz/fees.cpp
@@ -6,6 +6,7 @@
 #include <test/fuzz/fuzz.h>
 #include <test/fuzz/util.h>
 #include <test/util/setup_common.h>
+#include <test/util/time.h>
 #include <test/util/txmempool.h>
 #include <validation.h>
 #include <wallet/coincontrol.h>
@@ -62,7 +63,7 @@ FUZZ_TARGET(wallet_fees, .init = initialize_setup)
 {
     SeedRandomStateForTest(SeedRand::ZEROS);
     FuzzedDataProvider fuzzed_data_provider{buffer.data(), buffer.size()};
-    SetMockTime(ConsumeTime(fuzzed_data_provider));
+    NodeClockContext clock_ctx{ConsumeTime(fuzzed_data_provider)};
     auto& node{g_setup->m_node};
     Chainstate* chainstate = &node.chainman->ActiveChainstate();
 
diff --git a/src/wallet/test/fuzz/scriptpubkeyman.cpp b/src/wallet/test/fuzz/scriptpubkeyman.cpp
index 243c9c69114d..fa8bc250d07e 100644
--- a/src/wallet/test/fuzz/scriptpubkeyman.cpp
+++ b/src/wallet/test/fuzz/scriptpubkeyman.cpp
@@ -18,10 +18,13 @@
 #include <test/fuzz/util.h>
 #include <test/fuzz/util/descriptor.h>
 #include <test/util/setup_common.h>
+#include <test/util/time.h>
 #include <util/check.h>
 #include <util/time.h>
 #include <util/translation.h>
+#include <util/string.h>
 #include <validation.h>
+#include <wallet/context.h>
 #include <wallet/scriptpubkeyman.h>
 #include <wallet/test/util.h>
 #include <wallet/types.h>
@@ -46,10 +49,15 @@ void initialize_spkm()
 {
     static const auto testing_setup{MakeNoLogFileContext<const TestingSetup>()};
     g_setup = testing_setup.get();
-    SelectParams(ChainType::MAIN);
     MOCKED_DESC_CONVERTER.Init();
 }
 
+void initialize_spkm_migration()
+{
+    static const auto testing_setup{MakeNoLogFileContext<const TestingSetup>()};
+    g_setup = testing_setup.get();
+}
+
 static std::optional<std::pair<WalletDescriptor, FlatSigningProvider>> CreateWalletDescriptor(FuzzedDataProvider& fuzzed_data_provider)
 {
     const std::string mocked_descriptor{fuzzed_data_provider.ConsumeRandomLengthString()};
@@ -78,7 +86,7 @@ FUZZ_TARGET(scriptpubkeyman, .init = initialize_spkm)
 {
     SeedRandomStateForTest(SeedRand::ZEROS);
     FuzzedDataProvider fuzzed_data_provider{buffer.data(), buffer.size()};
-    SetMockTime(ConsumeTime(fuzzed_data_provider));
+    NodeClockContext clock_ctx{ConsumeTime(fuzzed_data_provider)};
     const auto& node{g_setup->m_node};
     Chainstate& chainstate{node.chainman->ActiveChainstate()};
     std::unique_ptr<CWallet> wallet_ptr{std::make_unique<CWallet>(node.chain.get(), "", CreateMockableWalletDatabase())};
@@ -193,5 +201,141 @@ FUZZ_TARGET(scriptpubkeyman, .init = initialize_spkm)
     (void)spk_manager->GetKeyPoolSize();
 }
 
+FUZZ_TARGET(spkm_migration, .init = initialize_spkm_migration)
+{
+    SeedRandomStateForTest(SeedRand::ZEROS);
+    FuzzedDataProvider fuzzed_data_provider{buffer.data(), buffer.size()};
+    NodeClockContext clock_ctx{ConsumeTime(fuzzed_data_provider)};
+    const auto& node{g_setup->m_node};
+    Chainstate& chainstate{node.chainman->ActiveChainstate()};
+
+    std::unique_ptr<CWallet> wallet_ptr{std::make_unique<CWallet>(node.chain.get(), "", CreateMockableWalletDatabase())};
+    CWallet& wallet{*wallet_ptr};
+    wallet.m_keypool_size = 1;
+    {
+        LOCK(wallet.cs_wallet);
+        wallet.UnsetWalletFlag(WALLET_FLAG_DESCRIPTORS);
+        wallet.SetLastBlockProcessed(chainstate.m_chain.Height(), chainstate.m_chain.Tip()->GetBlockHash());
+    }
+
+    auto& legacy_data{*wallet.GetOrCreateLegacyDataSPKM()};
+
+    std::vector<CKey> keys;
+    LIMITED_WHILE(fuzzed_data_provider.ConsumeBool(), 30) {
+        const auto key{ConsumePrivateKey(fuzzed_data_provider)};
+        if (!key.IsValid()) return;
+        auto pub_key{key.GetPubKey()};
+        if (!pub_key.IsFullyValid()) return;
+        if (legacy_data.LoadKey(key, pub_key) && std::find(keys.begin(), keys.end(), key) == keys.end()) keys.push_back(key);
+    }
+
+    bool add_hd_chain{fuzzed_data_provider.ConsumeBool() && !keys.empty()};
+    CHDChain hd_chain;
+    auto version{fuzzed_data_provider.ConsumeBool() ? CHDChain::VERSION_HD_CHAIN_SPLIT : CHDChain::VERSION_HD_BASE};
+    CKey hd_key;
+    if (add_hd_chain) {
+        hd_key = PickValue(fuzzed_data_provider, keys);
+        hd_chain.nVersion = version;
+        hd_chain.seed_id = hd_key.GetPubKey().GetID();
+        legacy_data.LoadHDChain(hd_chain);
+    }
+
+    bool add_inactive_hd_chain{fuzzed_data_provider.ConsumeBool() && !keys.empty()};
+    if (add_inactive_hd_chain) {
+        hd_key = PickValue(fuzzed_data_provider, keys);
+        hd_chain.nVersion = fuzzed_data_provider.ConsumeBool() ? CHDChain::VERSION_HD_CHAIN_SPLIT : CHDChain::VERSION_HD_BASE;
+        hd_chain.seed_id = hd_key.GetPubKey().GetID();
+        legacy_data.AddInactiveHDChain(hd_chain);
+    }
+
+    bool watch_only = false;
+    const auto pub_key = ConsumeDeserializable<CPubKey>(fuzzed_data_provider);
+    if (!pub_key || !pub_key->IsFullyValid()) return;
+    auto script_dest{GetScriptForDestination(WitnessV0KeyHash{*pub_key})};
+    if (fuzzed_data_provider.ConsumeBool()) {
+        script_dest = GetScriptForDestination(CTxDestination{PKHash(*pub_key)});
+    }
+    if (legacy_data.LoadWatchOnly(script_dest)) watch_only = true;
+
+    size_t added_script{0};
+    bool good_data{true};
+    LIMITED_WHILE(good_data && fuzzed_data_provider.ConsumeBool(), 30) {
+        CallOneOf(
+            fuzzed_data_provider,
+            [&] {
+                CKey key;
+                if (!keys.empty()) {
+                    key = PickValue(fuzzed_data_provider, keys);
+                } else {
+                    key = ConsumePrivateKey(fuzzed_data_provider, /*compressed=*/fuzzed_data_provider.ConsumeBool());
+                }
+                if (!key.IsValid()) return;
+                auto pub_key{key.GetPubKey()};
+                CScript script;
+                CallOneOf(
+                    fuzzed_data_provider,
+                    [&] {
+                        script = GetScriptForDestination(CTxDestination{PKHash(pub_key)});
+                    },
+                    [&] {
+                        script = GetScriptForDestination(WitnessV0KeyHash(pub_key));
+                    },
+                    [&] {
+                        std::optional<CScript> script_opt{ConsumeDeserializable<CScript>(fuzzed_data_provider)};
+                        if (!script_opt) {
+                            good_data = false;
+                            return;
+                        }
+                        script = script_opt.value();
+                    }
+                );
+                if (fuzzed_data_provider.ConsumeBool()) script = GetScriptForDestination(ScriptHash(script));
+                if (!legacy_data.HaveCScript(CScriptID(script)) && legacy_data.AddCScript(script)) added_script++;
+            },
+            [&] {
+                CKey key;
+                if (!keys.empty()) {
+                    key = PickValue(fuzzed_data_provider, keys);
+                } else {
+                    key = ConsumePrivateKey(fuzzed_data_provider, /*compressed=*/fuzzed_data_provider.ConsumeBool());
+                }
+                if (!key.IsValid()) return;
+                const auto num_keys{fuzzed_data_provider.ConsumeIntegralInRange<size_t>(1, MAX_PUBKEYS_PER_MULTISIG)};
+                std::vector<CPubKey> pubkeys;
+                pubkeys.emplace_back(key.GetPubKey());
+                for (size_t i = 1; i < num_keys; i++) {
+                    if (fuzzed_data_provider.ConsumeBool()) {
+                        pubkeys.emplace_back(key.GetPubKey());
+                    } else {
+                        CKey private_key{ConsumePrivateKey(fuzzed_data_provider, /*compressed=*/fuzzed_data_provider.ConsumeBool())};
+                        if (!private_key.IsValid()) return;
+                        pubkeys.emplace_back(private_key.GetPubKey());
+                    }
+                }
+                if (pubkeys.size() < num_keys) return;
+                CScript multisig_script{GetScriptForMultisig(num_keys, pubkeys)};
+                if (!legacy_data.HaveCScript(CScriptID(multisig_script)) && legacy_data.AddCScript(multisig_script)) {
+                    added_script++;
+                }
+            }
+        );
+    }
+
+    auto result{legacy_data.MigrateToDescriptor()};
+    assert(result);
+    size_t added_chains{static_cast<size_t>(add_hd_chain) + static_cast<size_t>(add_inactive_hd_chain)};
+    if ((add_hd_chain && version >= CHDChain::VERSION_HD_CHAIN_SPLIT) || (!add_hd_chain && add_inactive_hd_chain)) {
+        added_chains *= 2;
+    }
+    size_t added_size{keys.size() + added_chains};
+    if (added_script > 0) {
+        assert(result->desc_spkms.size() >= added_size);
+    } else {
+        assert(result->desc_spkms.size() == added_size);
+    }
+    if (watch_only) assert(!result->watch_descs.empty());
+    if (!result->solvable_descs.empty()) assert(added_script > 0);
+}
+
 } // namespace
 } // namespace wallet
diff --git a/src/wallet/test/fuzz/spend.cpp b/src/wallet/test/fuzz/spend.cpp
index 552364a667d0..e9a6bea71ef0 100644
--- a/src/wallet/test/fuzz/spend.cpp
+++ b/src/wallet/test/fuzz/spend.cpp
@@ -2,20 +2,21 @@
 // Distributed under the MIT software license, see the accompanying
 // file COPYING or http://www.opensource.org/licenses/mit-license.php.
 
+#include <addresstype.h>
 #include <test/fuzz/FuzzedDataProvider.h>
 #include <test/fuzz/fuzz.h>
 #include <test/fuzz/util.h>
 #include <test/fuzz/util/wallet.h>
 #include <test/util/random.h>
 #include <test/util/setup_common.h>
+#include <test/util/time.h>
 #include <util/time.h>
+#include <validation.h>
 #include <wallet/coincontrol.h>
 #include <wallet/context.h>
 #include <wallet/spend.h>
 #include <wallet/test/util.h>
 #include <wallet/wallet.h>
-#include <validation.h>
-#include <addresstype.h>
 
 using util::ToString;
 
@@ -33,7 +34,7 @@ FUZZ_TARGET(wallet_create_transaction, .init = initialize_setup)
 {
     SeedRandomStateForTest(SeedRand::ZEROS);
     FuzzedDataProvider fuzzed_data_provider{buffer.data(), buffer.size()};
-    SetMockTime(ConsumeTime(fuzzed_data_provider));
+    NodeClockContext clock_ctx{ConsumeTime(fuzzed_data_provider)};
     const auto& node = g_setup->m_node;
     Chainstate& chainstate{node.chainman->ActiveChainstate()};
     ArgsManager& args = *node.args;
diff --git a/src/wallet/transaction.h b/src/wallet/transaction.h
index f979d83b18b7..29baf6695a09 100644
--- a/src/wallet/transaction.h
+++ b/src/wallet/transaction.h
@@ -294,9 +294,9 @@ class CWalletTx
             mapValueCopy["timesmart"] = strprintf("%u", nTimeSmart);
         }
 
-        std::vector<uint8_t> dummy_vector1; //!< Used to be vMerkleBranch
-        std::vector<uint8_t> dummy_vector2; //!< Used to be vtxPrev
-        bool dummy_bool = false; //!< Used to be fFromMe, and fSpent
+        std::vector<uint8_t> dummy_vector1; // Used to be vMerkleBranch
+        std::vector<uint8_t> dummy_vector2; // Used to be vtxPrev
+        bool dummy_bool = false; // Used to be fFromMe, and fSpent
         uint32_t dummy_int = 0; // Used to be fTimeReceivedIsTxTime
         uint256 serializedHash = TxStateSerializedBlockHash(m_state);
         int serializedIndex = TxStateSerializedIndex(m_state);
@@ -308,9 +308,9 @@ class CWalletTx
     {
         Init();
 
-        std::vector<uint256> dummy_vector1; //!< Used to be vMerkleBranch
-        std::vector<CMerkleTx> dummy_vector2; //!< Used to be vtxPrev
-        bool dummy_bool; //! Used to be fFromMe, and fSpent
+        std::vector<uint256> dummy_vector1; // Used to be vMerkleBranch
+        std::vector<CMerkleTx> dummy_vector2; // Used to be vtxPrev
+        bool dummy_bool; // Used to be fFromMe, and fSpent
         uint32_t dummy_int; // Used to be fTimeReceivedIsTxTime
         uint256 serialized_block_hash;
         int serializedIndex;
diff --git a/src/wallet/wallet.cpp b/src/wallet/wallet.cpp
index 1e7ad3fc6b82..777efe4172c9 100644
--- a/src/wallet/wallet.cpp
+++ b/src/wallet/wallet.cpp
@@ -579,16 +579,26 @@ void CWallet::UpgradeDescriptorCache()
  * derivation parameters (should take at least 100ms) and encrypt the master key. */
 static bool EncryptMasterKey(const SecureString& wallet_passphrase, const CKeyingMaterial& plain_master_key, CMasterKey& master_key)
 {
-    constexpr MillisecondsDouble target{100};
-    auto start{SteadyClock::now()};
+    constexpr MillisecondsDouble target_time{100};
     CCrypter crypter;
 
-    crypter.SetKeyFromPassphrase(wallet_passphrase, master_key.vchSalt, master_key.nDeriveIterations, master_key.nDerivationMethod);
-    master_key.nDeriveIterations = static_cast<unsigned int>(master_key.nDeriveIterations * target / (SteadyClock::now() - start));
+    // Get the weighted average of iterations we can do in 100ms over 2 runs.
+    for (int i = 0; i < 2; i++){
+        auto start_time{NodeClock::now()};
+        crypter.SetKeyFromPassphrase(wallet_passphrase, master_key.vchSalt, master_key.nDeriveIterations, master_key.nDerivationMethod);
+        auto elapsed_time{NodeClock::now() - start_time};
 
-    start = SteadyClock::now();
-    crypter.SetKeyFromPassphrase(wallet_passphrase, master_key.vchSalt, master_key.nDeriveIterations, master_key.nDerivationMethod);
-    master_key.nDeriveIterations = (master_key.nDeriveIterations + static_cast<unsigned int>(master_key.nDeriveIterations * target / (SteadyClock::now() - start))) / 2;
+        if (elapsed_time <= 0s) {
+            // We are probably in a test with a mocked clock.
+            master_key.nDeriveIterations = CMasterKey::DEFAULT_DERIVE_ITERATIONS;
+            break;
+        }
+
+        // target_iterations : elapsed_iterations :: target_time : elapsed_time
+        unsigned int target_iterations = master_key.nDeriveIterations * target_time / elapsed_time;
+        // Get the weighted average with previous runs.
+        master_key.nDeriveIterations = (i * master_key.nDeriveIterations + target_iterations) / (i + 1);
+    }
 
     if (master_key.nDeriveIterations < CMasterKey::DEFAULT_DERIVE_ITERATIONS) {
         master_key.nDeriveIterations = CMasterKey::DEFAULT_DERIVE_ITERATIONS;
@@ -1106,7 +1116,11 @@ CWalletTx* CWallet::AddToWallet(CTransactionRef tx, const TxState& state, const
     }
 
     //// debug print
-    WalletLogPrintf("AddToWallet %s  %s%s %s\n", hash.ToString(), (fInsertedNew ? "new" : ""), (fUpdated ? "update" : ""), TxStateString(state));
+    std::string status{"no-change"};
+    if (fInsertedNew || fUpdated) {
+        status = fInsertedNew ? (fUpdated ? "new, update" : "new") : "update";
+    }
+    WalletLogPrintf("AddToWallet %s %s %s", hash.ToString(), status, TxStateString(state));
 
     // Write to disk
     if (fInsertedNew || fUpdated)
@@ -2357,15 +2371,6 @@ DBErrors CWallet::PopulateWalletFromDB(bilingual_str& error, std::vector<bilingu
     Assert(m_spk_managers.empty());
     Assert(m_wallet_flags == 0);
     DBErrors nLoadWalletRet = WalletBatch(GetDatabase()).LoadWallet(this);
-    if (nLoadWalletRet == DBErrors::NEED_REWRITE)
-    {
-        if (GetDatabase().Rewrite())
-        {
-            for (const auto& spk_man_pair : m_spk_managers) {
-                spk_man_pair.second->RewriteDB();
-            }
-        }
-    }
 
     if (m_spk_managers.empty()) {
         assert(m_external_spk_managers.empty());
@@ -2394,9 +2399,6 @@ DBErrors CWallet::PopulateWalletFromDB(bilingual_str& error, std::vector<bilingu
     case DBErrors::EXTERNAL_SIGNER_SUPPORT_REQUIRED:
         error = strprintf(_("Error loading %s: External signer wallet being loaded without external signer support compiled"), wallet_file);
         break;
-    case DBErrors::NEED_REWRITE:
-        error = strprintf(_("Wallet needed to be rewritten: restart %s to complete"), CLIENT_NAME);
-        break;
     case DBErrors::UNKNOWN_DESCRIPTOR:
         error = strprintf(_("Unrecognized descriptor found. Loading wallet %s\n\n"
                             "The wallet might have been created on a newer version.\n"
@@ -3552,7 +3554,9 @@ bool CWallet::HaveCryptedKeys() const
 void CWallet::ConnectScriptPubKeyManNotifiers()
 {
     for (const auto& spk_man : GetActiveScriptPubKeyMans()) {
-        spk_man->NotifyCanGetAddressesChanged.connect(NotifyCanGetAddressesChanged);
+        spk_man->NotifyCanGetAddressesChanged.connect([this] {
+            NotifyCanGetAddressesChanged();
+        });
         spk_man->NotifyFirstKeyTimeChanged.connect([this](const ScriptPubKeyMan*, int64_t time) {
             MaybeUpdateBirthTime(time);
         });
@@ -4018,14 +4022,16 @@ util::Result<void> CWallet::ApplyMigrationData(WalletBatch& local_wallet_batch,
                 // Mark as to remove from the migrated wallet only if it does not also belong to it
                 if (!is_mine) {
                     txids_to_delete.push_back(hash);
+                    continue;
                 }
-                continue;
             }
         }
         if (!is_mine) {
             // Both not ours and not in the watchonly wallet
             return util::Error{strprintf(_("Error: Transaction %s in wallet cannot be identified to belong to migrated wallets"), wtx->GetHash().GetHex())};
         }
+        // Rewrite the transaction so that anything that may have changed about it in memory also persists to disk
+        local_wallet_batch.WriteTx(*wtx);
     }
 
     // Do the removes
diff --git a/src/wallet/wallet.h b/src/wallet/wallet.h
index fd4b368d7819..45b9b8abb121 100644
--- a/src/wallet/wallet.h
+++ b/src/wallet/wallet.h
@@ -7,6 +7,7 @@
 #define BITCOIN_WALLET_WALLET_H
 
 #include <addresstype.h>
+#include <btcsignals.h>
 #include <consensus/amount.h>
 #include <interfaces/chain.h>
 #include <interfaces/handler.h>
@@ -51,8 +52,6 @@
 #include <utility>
 #include <vector>
 
-#include <boost/signals2/signal.hpp>
-
 class CKey;
 class CKeyID;
 class CPubKey;
@@ -283,7 +282,7 @@ inline std::string PurposeToString(AddressPurpose p)
     case AddressPurpose::RECEIVE: return "receive";
     case AddressPurpose::SEND: return "send";
     case AddressPurpose::REFUND: return "refund";
-    } // no default case so the compiler will warn when a new enum as added
+    } // no default case, so the compiler can warn about missing cases
     assert(false);
 }
 
@@ -824,13 +823,13 @@ class CWallet final : public WalletStorage, public interfaces::Chain::Notificati
     void Close();
 
     /** Wallet is about to be unloaded */
-    boost::signals2::signal<void ()> NotifyUnload;
+    btcsignals::signal<void ()> NotifyUnload;
 
     /**
      * Address book entry changed.
      * @note called without lock cs_wallet held.
      */
-    boost::signals2::signal<void(const CTxDestination& address,
+    btcsignals::signal<void(const CTxDestination& address,
                                  const std::string& label, bool isMine,
                                  AddressPurpose purpose, ChangeType status)>
         NotifyAddressBookChanged;
@@ -839,19 +838,19 @@ class CWallet final : public WalletStorage, public interfaces::Chain::Notificati
      * Wallet transaction added, removed or updated.
      * @note called with lock cs_wallet held.
      */
-    boost::signals2::signal<void(const Txid& hashTx, ChangeType status)> NotifyTransactionChanged;
+    btcsignals::signal<void(const Txid& hashTx, ChangeType status)> NotifyTransactionChanged;
 
     /** Show progress e.g. for rescan */
-    boost::signals2::signal<void (const std::string &title, int nProgress)> ShowProgress;
+    btcsignals::signal<void (const std::string &title, int nProgress)> ShowProgress;
 
     /** Keypool has new keys */
-    boost::signals2::signal<void ()> NotifyCanGetAddressesChanged;
+    btcsignals::signal<void ()> NotifyCanGetAddressesChanged;
 
     /**
      * Wallet status (encrypted, locked) changed.
      * Note: Called without locks held.
      */
-    boost::signals2::signal<void (CWallet* wallet)> NotifyStatusChanged;
+    btcsignals::signal<void (CWallet* wallet)> NotifyStatusChanged;
 
     /** Inquire whether this wallet broadcasts transactions. */
     bool GetBroadcastTransactions() const { return fBroadcastTransactions; }
diff --git a/src/wallet/walletdb.cpp b/src/wallet/walletdb.cpp
index 4cb8c11ee95e..c8b7ae53cd5e 100644
--- a/src/wallet/walletdb.cpp
+++ b/src/wallet/walletdb.cpp
@@ -117,12 +117,9 @@ bool WalletBatch::WriteKey(const CPubKey& vchPubKey, const CPrivKey& vchPrivKey,
     }
 
     // hash pubkey/privkey to accelerate wallet load
-    std::vector<unsigned char> vchKey;
-    vchKey.reserve(vchPubKey.size() + vchPrivKey.size());
-    vchKey.insert(vchKey.end(), vchPubKey.begin(), vchPubKey.end());
-    vchKey.insert(vchKey.end(), vchPrivKey.begin(), vchPrivKey.end());
+    const auto keypair_hash = Hash(vchPubKey, vchPrivKey);
 
-    return WriteIC(std::make_pair(DBKeys::KEY, vchPubKey), std::make_pair(vchPrivKey, Hash(vchKey)), false);
+    return WriteIC(std::make_pair(DBKeys::KEY, vchPubKey), std::make_pair(vchPrivKey, keypair_hash), false);
 }
 
 bool WalletBatch::WriteCryptedKey(const CPubKey& vchPubKey,
@@ -220,12 +217,9 @@ bool WalletBatch::EraseActiveScriptPubKeyMan(uint8_t type, bool internal)
 bool WalletBatch::WriteDescriptorKey(const uint256& desc_id, const CPubKey& pubkey, const CPrivKey& privkey)
 {
     // hash pubkey/privkey to accelerate wallet load
-    std::vector<unsigned char> key;
-    key.reserve(pubkey.size() + privkey.size());
-    key.insert(key.end(), pubkey.begin(), pubkey.end());
-    key.insert(key.end(), privkey.begin(), privkey.end());
+    const auto keypair_hash = Hash(pubkey, privkey);
 
-    return WriteIC(std::make_pair(DBKeys::WALLETDESCRIPTORKEY, std::make_pair(desc_id, pubkey)), std::make_pair(privkey, Hash(key)), false);
+    return WriteIC(std::make_pair(DBKeys::WALLETDESCRIPTORKEY, std::make_pair(desc_id, pubkey)), std::make_pair(privkey, keypair_hash), false);
 }
 
 bool WalletBatch::WriteCryptedDescriptorKey(const uint256& desc_id, const CPubKey& pubkey, const std::vector<unsigned char>& secret)
@@ -328,12 +322,9 @@ bool LoadKey(CWallet* pwallet, DataStream& ssKey, DataStream& ssValue, std::stri
         if (!hash.IsNull())
         {
             // hash pubkey/privkey to accelerate wallet load
-            std::vector<unsigned char> vchKey;
-            vchKey.reserve(vchPubKey.size() + pkey.size());
-            vchKey.insert(vchKey.end(), vchPubKey.begin(), vchPubKey.end());
-            vchKey.insert(vchKey.end(), pkey.begin(), pkey.end());
+            const auto keypair_hash = Hash(vchPubKey, pkey);
 
-            if (Hash(vchKey) != hash)
+            if (keypair_hash != hash)
             {
                 strErr = "Error reading wallet database: CPubKey/CPrivKey corrupt";
                 return false;
@@ -593,12 +584,6 @@ static DBErrors LoadLegacyWalletRecords(CWallet* pwallet, DatabaseBatch& batch,
     });
     result = std::max(result, script_res.m_result);
 
-    // Check whether rewrite is needed
-    if (ckey_res.m_records > 0) {
-        // Rewrite encrypted wallets of versions 0.4.0 and 0.5.0rc:
-        if (last_client == 40000 || last_client == 50000) result = std::max(result, DBErrors::NEED_REWRITE);
-    }
-
     // Load keymeta
     std::map<uint160, CHDChain> hd_chains;
     LoadResult keymeta_res = LoadRecords(pwallet, batch, DBKeys::KEYMETA,
@@ -875,12 +860,9 @@ static DBErrors LoadDescriptorWalletRecords(CWallet* pwallet, DatabaseBatch& bat
             value >> hash;
 
             // hash pubkey/privkey to accelerate wallet load
-            std::vector<unsigned char> to_hash;
-            to_hash.reserve(pubkey.size() + pkey.size());
-            to_hash.insert(to_hash.end(), pubkey.begin(), pubkey.end());
-            to_hash.insert(to_hash.end(), pkey.begin(), pkey.end());
+            const auto keypair_hash = Hash(pubkey, pkey);
 
-            if (Hash(to_hash) != hash)
+            if (keypair_hash != hash)
             {
                 strErr = "Error reading wallet database: descriptor unencrypted key CPubKey/CPrivKey corrupt";
                 return DBErrors::CORRUPT;
diff --git a/src/wallet/walletdb.h b/src/wallet/walletdb.h
index 65ff8c0b60fa..455fc7455713 100644
--- a/src/wallet/walletdb.h
+++ b/src/wallet/walletdb.h
@@ -44,7 +44,6 @@ enum class DBErrors : int
 {
     LOAD_OK = 0,
     NEED_RESCAN = 1,
-    NEED_REWRITE = 2,
     EXTERNAL_SIGNER_SUPPORT_REQUIRED = 3,
     NONCRITICAL_ERROR = 4,
     TOO_NEW = 5,
diff --git a/src/zmq/zmqpublishnotifier.cpp b/src/zmq/zmqpublishnotifier.cpp
index 56cdea05e3a4..61b65a1317af 100644
--- a/src/zmq/zmqpublishnotifier.cpp
+++ b/src/zmq/zmqpublishnotifier.cpp
@@ -24,7 +24,6 @@
 #include <cstring>
 #include <map>
 #include <optional>
-#include <span>
 #include <string>
 #include <utility>
 #include <vector>
diff --git a/src/zmq/zmqrpc.cpp b/src/zmq/zmqrpc.cpp
index 9c8154a63a4d..7c3dc29afab3 100644
--- a/src/zmq/zmqrpc.cpp
+++ b/src/zmq/zmqrpc.cpp
@@ -20,9 +20,9 @@ class JSONRPCRequest;
 
 namespace {
 
-static RPCHelpMan getzmqnotifications()
+static RPCMethod getzmqnotifications()
 {
-    return RPCHelpMan{
+    return RPCMethod{
         "getzmqnotifications",
         "Returns information about the active ZeroMQ notifications.\n",
                 {},
@@ -41,7 +41,7 @@ static RPCHelpMan getzmqnotifications()
                     HelpExampleCli("getzmqnotifications", "")
             + HelpExampleRpc("getzmqnotifications", "")
                 },
-        [&](const RPCHelpMan& self, const JSONRPCRequest& request) -> UniValue
+        [](const RPCMethod& self, const JSONRPCRequest& request) -> UniValue
 {
     UniValue result(UniValue::VARR);
     if (g_zmq_notification_interface != nullptr) {
diff --git a/test/functional/data/invalid_txs.py b/test/functional/data/invalid_txs.py
index 3903bf9de4d0..1d3a9399a773 100644
--- a/test/functional/data/invalid_txs.py
+++ b/test/functional/data/invalid_txs.py
@@ -58,6 +58,7 @@
     OP_SUBSTR,
     OP_XOR,
 )
+from test_framework.util import assert_equal
 from test_framework.script_util import (
     MIN_PADDING,
     MIN_STANDARD_TX_NONWITNESS_SIZE,
@@ -122,8 +123,8 @@ def get_tx(self):
         tx = CTransaction()
         tx.vin.append(self.valid_txin)
         tx.vout.append(CTxOut(0, CScript([OP_RETURN] + ([OP_0] * (MIN_PADDING - 2)))))
-        assert len(tx.serialize_without_witness()) == 64
-        assert MIN_STANDARD_TX_NONWITNESS_SIZE - 1 == 64
+        assert_equal(len(tx.serialize_without_witness()), 64)
+        assert_equal(MIN_STANDARD_TX_NONWITNESS_SIZE - 1, 64)
         return tx
 
 # reject a transaction that contains a witness
diff --git a/test/functional/feature_assumeutxo.py b/test/functional/feature_assumeutxo.py
index 7420dfe02a01..886d104eec74 100755
--- a/test/functional/feature_assumeutxo.py
+++ b/test/functional/feature_assumeutxo.py
@@ -10,7 +10,6 @@
 `CRegTestParams::m_assumeutxo_data` in `src/kernel/chainparams.cpp`.
 """
 import contextlib
-from shutil import rmtree
 
 from dataclasses import dataclass
 from test_framework.blocktools import (
@@ -38,6 +37,7 @@
     assert_equal,
     assert_not_equal,
     assert_raises_rpc_error,
+    dumb_sync_blocks,
     ensure_for,
     sha256sum_file,
     try_rpc,
@@ -191,7 +191,8 @@ def expected_error(log_msg="", error_msg=""):
         expected_error(log_msg=error_details, error_msg=expected_error_msg)
 
         # resurrect node again
-        rmtree(chainstate_snapshot_path)
+        (chainstate_snapshot_path / "base_blockhash").unlink()
+        chainstate_snapshot_path.rmdir()
         self.start_node(0)
 
     def test_invalid_mempool_state(self, dump_output_path):
@@ -303,7 +304,7 @@ def test_sync_from_assumeutxo_node(self, snapshot):
         # Start test fresh by cleaning up node directories
         for node in (snapshot_node, ibd_node):
             self.stop_node(node.index)
-            rmtree(node.chain_path)
+            self.cleanup_folder(node.chain_path)
             self.start_node(node.index, extra_args=self.extra_args[node.index])
 
         # Sync-up headers chain on snapshot_node to load snapshot
@@ -412,7 +413,7 @@ def run_test(self):
 
         # Generate a series of blocks that `n0` will have in the snapshot,
         # but that n1 and n2 don't yet see.
-        assert n0.getblockcount() == START_HEIGHT
+        assert_equal(n0.getblockcount(), START_HEIGHT)
         blocks = {START_HEIGHT: Block(n0.getbestblockhash(), 1, START_HEIGHT + 1)}
         for i in range(100):
             block_tx = 1
@@ -541,6 +542,30 @@ def check_dump_output(output):
         assert_equal(utxo_info['height'], SNAPSHOT_BASE_HEIGHT)
         assert_equal(utxo_info['bestblock'], snapshot_hash)
 
+        self.log.info("Check that getblockchaininfo returns information about the background validation process")
+        expected_keys = [
+            "snapshotheight",
+            "blocks",
+            "bestblockhash",
+            "mediantime",
+            "chainwork",
+            "verificationprogress"
+        ]
+        res = n1.getblockchaininfo()
+        assert "backgroundvalidation" in res.keys()
+        bv_res = res["backgroundvalidation"]
+        assert_equal(sorted(expected_keys), sorted(bv_res.keys()))
+        assert_equal(bv_res["snapshotheight"], SNAPSHOT_BASE_HEIGHT)
+        assert_equal(bv_res["blocks"], START_HEIGHT)
+        assert_equal(bv_res["bestblockhash"], n1.getblockhash(START_HEIGHT))
+        block = n1.getblockheader(bv_res["bestblockhash"])
+        assert_equal(bv_res["mediantime"], block["mediantime"])
+        assert_equal(bv_res["chainwork"], block["chainwork"])
+        background_tx_count = n1.getchaintxstats(blockhash=bv_res["bestblockhash"])["txcount"]
+        snapshot_tx_count = n1.getchaintxstats(blockhash=snapshot_hash)["txcount"]
+        expected_verification_progress = background_tx_count / snapshot_tx_count
+        assert_approx(bv_res["verificationprogress"], expected_verification_progress, vspan=0.01)
+
         # find coinbase output at snapshot height on node0 and scan for it on node1,
         # where the block is not available, but the snapshot was loaded successfully
         coinbase_tx = n0.getblock(snapshot_hash, verbosity=2)['tx'][0]
@@ -631,30 +656,17 @@ def check_tx_counts(final: bool) -> None:
 
         PAUSE_HEIGHT = FINAL_HEIGHT - 40
 
-        self.log.info("Restarting node to stop at height %d", PAUSE_HEIGHT)
-        self.restart_node(1, extra_args=[
-            f"-stopatheight={PAUSE_HEIGHT}", *self.extra_args[1]])
-
-        # Upon restart during snapshot tip sync, the node must remain in 'limited' mode.
+        self.log.info(f"Sync node up to height {PAUSE_HEIGHT}")
+        # During snapshot tip sync, the node must remain in 'limited' mode.
         self.assert_only_network_limited_service(n1)
-
-        # Finally connect the nodes and let them sync.
-        #
-        # Set `wait_for_connect=False` to avoid a race between performing connection
-        # assertions and the -stopatheight tripping.
-        self.connect_nodes(0, 1, wait_for_connect=False)
-
-        n1.wait_until_stopped(timeout=5)
+        dumb_sync_blocks(src=n0, dst=n1, height=PAUSE_HEIGHT)
 
         self.log.info("Checking that blocks are segmented on disk")
         assert self.has_blockfile(n1, "00000"), "normal blockfile missing"
         assert self.has_blockfile(n1, "00001"), "assumed blockfile missing"
         assert not self.has_blockfile(n1, "00002"), "too many blockfiles"
 
-        self.log.info("Restarted node before snapshot validation completed, reloading...")
-        self.restart_node(1, extra_args=self.extra_args[1])
-
-        # Upon restart, the node must remain in 'limited' mode
+        # The node must remain in 'limited' mode
         self.assert_only_network_limited_service(n1)
 
         # Send snapshot block to n1 out of order. This makes the test less
diff --git a/test/functional/feature_bind_port_discover.py b/test/functional/feature_bind_port_discover.py
index 338dbd02b3ab..613b111b33f6 100755
--- a/test/functional/feature_bind_port_discover.py
+++ b/test/functional/feature_bind_port_discover.py
@@ -10,34 +10,67 @@
 from test_framework.util import (
     assert_equal,
     assert_not_equal,
+    p2p_port,
+    tor_port,
 )
 
-# We need to bind to a routable address for this test to exercise the relevant code
-# and also must have another routable address on another interface which must not
-# be named "lo" or "lo0".
-# To set these routable addresses on the machine, use:
+# We need to bind to routable addresses for this test. Both addresses must be on an
+# interface that is UP and not a loopback interface (IFF_LOOPBACK). To set these
+# routable addresses on the machine, use:
 # Linux:
-# ifconfig lo:0 1.1.1.1/32 up && ifconfig lo:1 2.2.2.2/32 up  # to set up
-# ifconfig lo:0 down && ifconfig lo:1 down  # to remove it, after the test
+# First find your interfaces: ip addr show
+# Then use your actual interface names (replace INTERFACE_NAME with yours):
+# ip addr add 1.1.1.1/32 dev INTERFACE_NAME && ip addr add 2.2.2.2/32 dev INTERFACE_NAME  # to set up
+# ip addr del 1.1.1.1/32 dev INTERFACE_NAME && ip addr del 2.2.2.2/32 dev INTERFACE_NAME  # to remove it
+#
+# macOS:
+# ifconfig en0 alias 1.1.1.1 && ifconfig en0 alias 2.2.2.2  # to set up
+# ifconfig en0 1.1.1.1 -alias && ifconfig en0 2.2.2.2 -alias  # to remove it, after the test
+#
 # FreeBSD:
 # ifconfig em0 1.1.1.1/32 alias && ifconfig wlan0 2.2.2.2/32 alias  # to set up
 # ifconfig em0 1.1.1.1 -alias && ifconfig wlan0 2.2.2.2 -alias  # to remove it, after the test
 ADDR1 = '1.1.1.1'
 ADDR2 = '2.2.2.2'
 
-BIND_PORT = 31001
-
 class BindPortDiscoverTest(BitcoinTestFramework):
     def set_test_params(self):
         # Avoid any -bind= on the command line. Force the framework to avoid adding -bind=127.0.0.1.
-        self.setup_clean_chain = True
         self.bind_to_localhost_only = False
+        # Get dynamic ports for each node from the test framework
+        self.bind_ports = [
+            p2p_port(0),
+            p2p_port(2), # node0 will use their port + 1 for onion listen, which is the same as p2p_port(1), so avoid collision
+            p2p_port(3),
+            p2p_port(4),
+        ]
         self.extra_args = [
-            ['-discover', f'-port={BIND_PORT}'], # bind on any
-            ['-discover', f'-bind={ADDR1}:{BIND_PORT}'],
+            ['-discover', f'-port={self.bind_ports[0]}', '-listen=1'], # Without any -bind
+            ['-discover', f'-bind=0.0.0.0:{self.bind_ports[1]}'], # Explicit -bind=0.0.0.0
+            # Explicit -whitebind=0.0.0.0, add onion bind to avoid port conflict
+            ['-discover', f'-whitebind=0.0.0.0:{self.bind_ports[2]}', f'-bind=127.0.0.1:{tor_port(3)}=onion'],
+            ['-discover', f'-bind={ADDR1}:{self.bind_ports[3]}'], # Explicit -bind=routable_addr
         ]
         self.num_nodes = len(self.extra_args)
 
+    def setup_network(self):
+        """
+        Override to avoid connecting nodes together. This test intentionally does not connect nodes
+        because each node is bound to a different address or interface, and connections are not needed.
+        """
+        self.setup_nodes()
+
+    def setup_nodes(self):
+        """
+        Override to set has_explicit_bind=True for nodes with explicit bind arguments.
+        """
+        self.add_nodes(self.num_nodes, self.extra_args)
+        # TestNode.start() will add -bind= to extra_args if has_explicit_bind is
+        # False. We do not want any -bind= thus set has_explicit_bind to True.
+        for node in self.nodes:
+            node.has_explicit_bind = True
+        self.start_nodes()
+
     def add_options(self, parser):
         parser.add_argument(
             "--ihave1111and2222", action='store_true', dest="ihave1111and2222",
@@ -52,28 +85,35 @@ def skip_test_if_missing_module(self):
 
     def run_test(self):
         self.log.info(
-                "Test that if -bind= is not passed then all addresses are "
+                "Test that if -bind= is not passed or -bind=0.0.0.0 is used then all addresses are "
                 "added to localaddresses")
-        found_addr1 = False
-        found_addr2 = False
-        for local in self.nodes[0].getnetworkinfo()['localaddresses']:
-            if local['address'] == ADDR1:
-                found_addr1 = True
-                assert_equal(local['port'], BIND_PORT)
-            if local['address'] == ADDR2:
-                found_addr2 = True
-                assert_equal(local['port'], BIND_PORT)
-        assert found_addr1
-        assert found_addr2
+        for i in [0, 1, 2]:
+            found_addr1 = False
+            found_addr2 = False
+            localaddresses = self.nodes[i].getnetworkinfo()['localaddresses']
+            for local in localaddresses:
+                if local['address'] == ADDR1:
+                    found_addr1 = True
+                    assert_equal(local['port'], self.bind_ports[i])
+                if local['address'] == ADDR2:
+                    found_addr2 = True
+                    assert_equal(local['port'], self.bind_ports[i])
+            if not found_addr1:
+                self.log.error(f"Address {ADDR1} not found in node{i}'s local addresses: {localaddresses}")
+                assert False
+            if not found_addr2:
+                self.log.error(f"Address {ADDR2} not found in node{i}'s local addresses: {localaddresses}")
+                assert False
 
         self.log.info(
-                "Test that if -bind= is passed then only that address is "
+                "Test that if -bind=routable_addr is passed then only that address is "
                 "added to localaddresses")
         found_addr1 = False
-        for local in self.nodes[1].getnetworkinfo()['localaddresses']:
+        i = 3
+        for local in self.nodes[i].getnetworkinfo()['localaddresses']:
             if local['address'] == ADDR1:
                 found_addr1 = True
-                assert_equal(local['port'], BIND_PORT)
+                assert_equal(local['port'], self.bind_ports[i])
             assert_not_equal(local['address'], ADDR2)
         assert found_addr1
 
diff --git a/test/functional/feature_blocksdir.py b/test/functional/feature_blocksdir.py
index 379c2bec166b..629ba8f9efb7 100755
--- a/test/functional/feature_blocksdir.py
+++ b/test/functional/feature_blocksdir.py
@@ -5,7 +5,6 @@
 """Test the blocksdir option.
 """
 
-import shutil
 from pathlib import Path
 
 from test_framework.test_framework import BitcoinTestFramework, initialize_datadir
@@ -20,7 +19,7 @@ def run_test(self):
         self.stop_node(0)
         assert self.nodes[0].blocks_path.is_dir()
         assert not (self.nodes[0].datadir_path / "blocks").is_dir()
-        shutil.rmtree(self.nodes[0].datadir_path)
+        self.cleanup_folder(self.nodes[0].datadir_path)
         initialize_datadir(self.options.tmpdir, 0, self.chain)
         self.log.info("Starting with nonexistent blocksdir ...")
         blocksdir_path = Path(self.options.tmpdir) / 'blocksdir'
diff --git a/test/functional/feature_coinstatsindex_compatibility.py b/test/functional/feature_coinstatsindex_compatibility.py
index 5031494fd8a0..855dc74d82e2 100755
--- a/test/functional/feature_coinstatsindex_compatibility.py
+++ b/test/functional/feature_coinstatsindex_compatibility.py
@@ -49,7 +49,7 @@ def _test_coin_stats_index_compatibility(self):
 
         self.log.info("Test that gettxoutsetinfo() output is consistent for the new index running on a datadir with the old version")
         self.stop_nodes()
-        shutil.rmtree(node.chain_path / "indexes" / "coinstatsindex")
+        self.cleanup_folder(node.chain_path / "indexes" / "coinstatsindex")
         shutil.copytree(legacy_node.chain_path / "indexes" / "coinstats", node.chain_path / "indexes" / "coinstats")
         old_version_path = node.chain_path / "indexes" / "coinstats"
         msg = f'[warning] Old version of coinstatsindex found at {old_version_path}. This folder can be safely deleted unless you plan to downgrade your node to version 29 or lower.'
diff --git a/test/functional/feature_dbcrash.py b/test/functional/feature_dbcrash.py
index 7a60af40f49b..cc94be781d15 100755
--- a/test/functional/feature_dbcrash.py
+++ b/test/functional/feature_dbcrash.py
@@ -80,7 +80,7 @@ def restart_node(self, node_index, expected_tip):
         after a timeout. Returns the utxo hash of the given node."""
 
         time_start = time.time()
-        while time.time() - time_start < 120:
+        while time.time() - time_start < 120 * self.options.timeout_factor:
             try:
                 # Any of these RPC calls could throw due to node crash
                 self.start_node(node_index)
diff --git a/test/functional/feature_init.py b/test/functional/feature_init.py
index 05a939c2b398..259e07b18695 100755
--- a/test/functional/feature_init.py
+++ b/test/functional/feature_init.py
@@ -241,7 +241,7 @@ def start_expecting_error(err_fragment, args):
             start_expecting_error(err_fragment, startup_args)
 
             for dir in dirs:
-                shutil.rmtree(node.chain_path / dir)
+                self.cleanup_folder(node.chain_path / dir)
                 shutil.move(node.chain_path / f"{dir}_bak", node.chain_path / dir)
 
     def init_pid_test(self):
diff --git a/test/functional/feature_logging.py b/test/functional/feature_logging.py
index b04cd48c7e6d..07420733e008 100755
--- a/test/functional/feature_logging.py
+++ b/test/functional/feature_logging.py
@@ -7,6 +7,7 @@
 import os
 
 from test_framework.test_framework import BitcoinTestFramework
+from test_framework.p2p import P2PInterface
 from test_framework.test_node import ErrorMatch
 
 
@@ -115,5 +116,12 @@ def run_test(self):
             assert logging['rpc']
             assert logging['net']
 
+        self.log.info("Test -logips formatting in net logs")
+        self.restart_node(0, ['-debug=net', '-logips=1'])
+        with self.nodes[0].assert_debug_log(["peer=0, peeraddr="]):
+            p2p = self.nodes[0].add_p2p_connection(P2PInterface())
+            p2p.wait_for_verack()
+            self.nodes[0].disconnect_p2ps()
+
 if __name__ == '__main__':
     LoggingTest(__file__).main()
diff --git a/test/functional/feature_posix_fs_permissions.py b/test/functional/feature_posix_fs_permissions.py
index e1884694b572..15087a9c9e69 100755
--- a/test/functional/feature_posix_fs_permissions.py
+++ b/test/functional/feature_posix_fs_permissions.py
@@ -9,6 +9,7 @@
 import stat
 
 from test_framework.test_framework import BitcoinTestFramework
+from test_framework.util import assert_equal
 
 
 class PosixFsPermissionsTest(BitcoinTestFramework):
@@ -22,12 +23,12 @@ def skip_test_if_missing_module(self):
     def check_directory_permissions(self, dir):
         mode = os.lstat(dir).st_mode
         self.log.info(f"{stat.filemode(mode)} {dir}")
-        assert mode == (stat.S_IFDIR | stat.S_IRUSR | stat.S_IWUSR | stat.S_IXUSR)
+        assert_equal(mode, (stat.S_IFDIR | stat.S_IRUSR | stat.S_IWUSR | stat.S_IXUSR))
 
     def check_file_permissions(self, file):
         mode = os.lstat(file).st_mode
         self.log.info(f"{stat.filemode(mode)} {file}")
-        assert mode == (stat.S_IFREG | stat.S_IRUSR | stat.S_IWUSR)
+        assert_equal(mode, (stat.S_IFREG | stat.S_IRUSR | stat.S_IWUSR))
 
     def run_test(self):
         self.stop_node(0)
diff --git a/test/functional/feature_pruning.py b/test/functional/feature_pruning.py
index ddc3fc59bed0..c935ea9577ee 100755
--- a/test/functional/feature_pruning.py
+++ b/test/functional/feature_pruning.py
@@ -195,7 +195,7 @@ def reorg_test(self):
             self.nodes[1].invalidateblock(curhash)
             curhash = self.nodes[1].getblockhash(self.forkheight - 1)
 
-        assert self.nodes[1].getblockcount() == self.forkheight - 1
+        assert_equal(self.nodes[1].getblockcount(), self.forkheight - 1)
         self.log.info(f"New best height: {self.nodes[1].getblockcount()}")
 
         # Disconnect node1 and generate the new chain
diff --git a/test/functional/feature_reindex_init.py b/test/functional/feature_reindex_init.py
index d2ef6c5e2208..ef21e8a7ed48 100755
--- a/test/functional/feature_reindex_init.py
+++ b/test/functional/feature_reindex_init.py
@@ -7,7 +7,6 @@
 from test_framework.test_framework import BitcoinTestFramework
 from test_framework.util import assert_equal
 import os
-import shutil
 
 
 class ReindexInitTest(BitcoinTestFramework):
@@ -19,7 +18,7 @@ def run_test(self):
         self.stop_nodes()
 
         self.log.info("Removing the block index leads to init error")
-        shutil.rmtree(node.blocks_path / "index")
+        self.cleanup_folder(node.blocks_path / "index")
         node.assert_start_raises_init_error(
             expected_msg=f"Error initializing block database.{os.linesep}"
             "Please restart with -reindex or -reindex-chainstate to recover.",
diff --git a/test/functional/feature_reindex_readonly.py b/test/functional/feature_reindex_readonly.py
index 858a67566f98..889d0c2a0e05 100755
--- a/test/functional/feature_reindex_readonly.py
+++ b/test/functional/feature_reindex_readonly.py
@@ -10,6 +10,7 @@
 import stat
 import subprocess
 from test_framework.test_framework import BitcoinTestFramework
+from test_framework.util import assert_equal
 
 
 class BlockstoreReindexTest(BitcoinTestFramework):
@@ -77,7 +78,7 @@ def reindex_readonly(self):
             self.log.debug("Attempt to restart and reindex the node with the unwritable block file")
             with self.nodes[0].assert_debug_log(["Reindexing finished"], timeout=60):
                 self.start_node(0, extra_args=['-reindex', '-fastprune'])
-            assert block_count == self.nodes[0].getblockcount()
+            assert_equal(block_count, self.nodes[0].getblockcount())
             undo_immutable()
 
         filename.chmod(0o777)
diff --git a/test/functional/feature_segwit.py b/test/functional/feature_segwit.py
index dc5dde9ca512..35c9459c675e 100755
--- a/test/functional/feature_segwit.py
+++ b/test/functional/feature_segwit.py
@@ -29,11 +29,7 @@
     OP_TRUE,
 )
 from test_framework.script_util import (
-    key_to_p2pk_script,
-    key_to_p2wpkh_script,
     keys_to_multisig_script,
-    script_to_p2sh_script,
-    script_to_p2wsh_script,
 )
 from test_framework.test_framework import BitcoinTestFramework
 from test_framework.util import (
@@ -67,9 +63,6 @@ def find_spendable_utxo(node, min_value):
     raise AssertionError(f"Unspent output equal or higher than {min_value} not found")
 
 
-txs_mined = {}  # txindex from txid to blockhash
-
-
 class SegWitTest(BitcoinTestFramework):
     def set_test_params(self):
         self.setup_clean_chain = True
@@ -298,64 +291,6 @@ def run_test(self):
         # Mine a block to clear the gbt cache again.
         self.generate(self.nodes[0], 1)
 
-    def mine_and_test_listunspent(self, script_list, ismine):
-        utxo = find_spendable_utxo(self.nodes[0], 50)
-        tx = CTransaction()
-        tx.vin.append(CTxIn(COutPoint(int('0x' + utxo['txid'], 0), utxo['vout'])))
-        for i in script_list:
-            tx.vout.append(CTxOut(10000000, i))
-        signresults = self.nodes[0].signrawtransactionwithwallet(tx.serialize_without_witness().hex())['hex']
-        txid = self.nodes[0].sendrawtransaction(hexstring=signresults, maxfeerate=0)
-        txs_mined[txid] = self.generate(self.nodes[0], 1)[0]
-        watchcount = 0
-        spendcount = 0
-        for i in self.nodes[0].listunspent():
-            if i['txid'] == txid:
-                watchcount += 1
-                if i['spendable']:
-                    spendcount += 1
-        if ismine == 2:
-            assert_equal(spendcount, len(script_list))
-        elif ismine == 1:
-            assert_equal(watchcount, len(script_list))
-            assert_equal(spendcount, 0)
-        else:
-            assert_equal(watchcount, 0)
-        return txid
-
-    def p2sh_address_to_script(self, v):
-        bare = CScript(bytes.fromhex(v['hex']))
-        p2sh = CScript(bytes.fromhex(v['scriptPubKey']))
-        p2wsh = script_to_p2wsh_script(bare)
-        p2sh_p2wsh = script_to_p2sh_script(p2wsh)
-        return [bare, p2sh, p2wsh, p2sh_p2wsh]
-
-    def p2pkh_address_to_script(self, v):
-        pubkey = bytes.fromhex(v['pubkey'])
-        p2wpkh = key_to_p2wpkh_script(pubkey)
-        p2sh_p2wpkh = script_to_p2sh_script(p2wpkh)
-        p2pk = key_to_p2pk_script(pubkey)
-        p2pkh = CScript(bytes.fromhex(v['scriptPubKey']))
-        p2sh_p2pk = script_to_p2sh_script(p2pk)
-        p2sh_p2pkh = script_to_p2sh_script(p2pkh)
-        p2wsh_p2pk = script_to_p2wsh_script(p2pk)
-        p2wsh_p2pkh = script_to_p2wsh_script(p2pkh)
-        p2sh_p2wsh_p2pk = script_to_p2sh_script(p2wsh_p2pk)
-        p2sh_p2wsh_p2pkh = script_to_p2sh_script(p2wsh_p2pkh)
-        return [p2wpkh, p2sh_p2wpkh, p2pk, p2pkh, p2sh_p2pk, p2sh_p2pkh, p2wsh_p2pk, p2wsh_p2pkh, p2sh_p2wsh_p2pk, p2sh_p2wsh_p2pkh]
-
-    def create_and_mine_tx_from_txids(self, txids, success=True):
-        tx = CTransaction()
-        for i in txids:
-            txraw = self.nodes[0].getrawtransaction(i, 0, txs_mined[i])
-            txtmp = tx_from_hex(txraw)
-            for j in range(len(txtmp.vout)):
-                tx.vin.append(CTxIn(COutPoint(int('0x' + i, 0), j)))
-        tx.vout.append(CTxOut(0, CScript()))
-        signresults = self.nodes[0].signrawtransactionwithwallet(tx.serialize_without_witness().hex())['hex']
-        self.nodes[0].sendrawtransaction(hexstring=signresults, maxfeerate=0)
-        self.generate(self.nodes[0], 1)
-
 
 if __name__ == '__main__':
     SegWitTest(__file__).main()
diff --git a/test/functional/feature_taproot.py b/test/functional/feature_taproot.py
index 8891e0f9994b..b2d1d0f57b0a 100755
--- a/test/functional/feature_taproot.py
+++ b/test/functional/feature_taproot.py
@@ -850,7 +850,7 @@ def spenders_taproot_active():
             for witlen in [20, 31, 32, 33]:
                 def mutate(spk):
                     prog = spk[2:]
-                    assert len(prog) == 32
+                    assert_equal(len(prog), 32)
                     if witlen < 32:
                         prog = prog[0:witlen]
                     elif witlen > 32:
@@ -1532,7 +1532,7 @@ def test_spenders(self, node, spenders, input_counts):
         self.log.info("- Running %i spending tests" % done)
         random.shuffle(normal_utxos)
         random.shuffle(mismatching_utxos)
-        assert done == len(normal_utxos) + len(mismatching_utxos)
+        assert_equal(done, len(normal_utxos) + len(mismatching_utxos))
 
         left = done
         while left:
@@ -1645,9 +1645,9 @@ def test_spenders(self, node, spenders, input_counts):
             if (len(spenders) - left) // 200 > (len(spenders) - left - len(input_utxos)) // 200:
                 self.log.info("  - %i tests done" % (len(spenders) - left))
 
-        assert left == 0
-        assert len(normal_utxos) == 0
-        assert len(mismatching_utxos) == 0
+        assert_equal(left, 0)
+        assert_equal(len(normal_utxos), 0)
+        assert_equal(len(mismatching_utxos), 0)
         self.log.info("  - Done")
 
     def gen_test_vectors(self):
@@ -1662,7 +1662,7 @@ def gen_test_vectors(self):
         coinbase.vin = [CTxIn(COutPoint(0, 0xffffffff), CScript([OP_1, OP_1]), SEQUENCE_FINAL)]
         coinbase.vout = [CTxOut(5000000000, CScript([OP_1]))]
         coinbase.nLockTime = 0
-        assert coinbase.txid_hex == "f60c73405d499a956d3162e3483c395526ef78286458a4cb17b125aa92e49b20"
+        assert_equal(coinbase.txid_hex, "f60c73405d499a956d3162e3483c395526ef78286458a4cb17b125aa92e49b20")
         # Mine it
         block = create_block(hashprev=int(self.nodes[0].getbestblockhash(), 16), coinbase=coinbase)
         block.solve()
diff --git a/test/functional/feature_torcontrol.py b/test/functional/feature_torcontrol.py
new file mode 100755
index 000000000000..2148fc103520
--- /dev/null
+++ b/test/functional/feature_torcontrol.py
@@ -0,0 +1,233 @@
+#!/usr/bin/env python3
+# Copyright (c) The Bitcoin Core developers
+# Distributed under the MIT software license, see the accompanying
+# file COPYING or http://www.opensource.org/licenses/mit-license.php.
+"""Test torcontrol functionality with a mock Tor control server."""
+import socket
+import threading
+from test_framework.test_framework import BitcoinTestFramework
+from test_framework.util import (
+    assert_equal,
+    ensure_for,
+    p2p_port,
+)
+
+
+class MockTorControlServer:
+    def __init__(self, port, manual_mode=False):
+        self.port = port
+        self.sock = None
+        self.conn = None
+        self.running = False
+        self.thread = None
+        self.received_commands = []
+        self.manual_mode = manual_mode
+        self.conn_ready = threading.Event()
+
+    def start(self):
+        self.sock = socket.socket(socket.AF_INET, socket.SOCK_STREAM)
+        self.sock.setsockopt(socket.SOL_SOCKET, socket.SO_REUSEADDR, 1)
+        self.sock.settimeout(1.0)
+        self.sock.bind(('127.0.0.1', self.port))
+        self.sock.listen(1)
+        self.running = True
+        self.thread = threading.Thread(target=self._serve)
+        self.thread.daemon = True
+        self.thread.start()
+
+    def stop(self):
+        self.running = False
+        if self.conn:
+            self.conn.close()
+        if self.sock:
+            self.sock.close()
+        if self.thread:
+            self.thread.join(timeout=5)
+
+    def _serve(self):
+        while self.running:
+            try:
+                self.conn, _ = self.sock.accept()
+                self.conn.settimeout(1.0)
+                self.conn_ready.set()
+                self._handle_connection(self.conn)
+            except socket.timeout:
+                continue
+            except OSError:
+                break
+
+    def _handle_connection(self, conn):
+        try:
+            buf = b""
+            while self.running:
+                try:
+                    data = conn.recv(1024)
+                    if not data:
+                        break
+                    buf += data
+                    while b"\r\n" in buf:
+                        line, buf = buf.split(b"\r\n", 1)
+                        command = line.decode('utf-8').strip()
+                        if command:
+                            self.received_commands.append(command)
+                            if not self.manual_mode:
+                                response = self._get_response(command)
+                                conn.sendall(response.encode('utf-8'))
+                except socket.timeout:
+                    continue
+        finally:
+            conn.close()
+
+    def send_raw(self, data):
+        if self.conn:
+            self.conn.sendall(data.encode('utf-8'))
+
+    def _get_response(self, command):
+        if command == "PROTOCOLINFO 1":
+            return (
+                "250-PROTOCOLINFO 1\r\n"
+                "250-AUTH METHODS=NULL\r\n"
+                "250-VERSION Tor=\"0.1.2.3\"\r\n"
+                "250 OK\r\n"
+            )
+        elif command == "AUTHENTICATE":
+            return "250 OK\r\n"
+        elif command.startswith("ADD_ONION"):
+            return (
+                "250-ServiceID=testserviceid1234567890123456789012345678901234567890123456\r\n"
+                "250 OK\r\n"
+            )
+        elif command.startswith("GETINFO"):
+            return "250-net/listeners/socks=\"127.0.0.1:9050\"\r\n250 OK\r\n"
+        else:
+            return "510 Unrecognized command\r\n"
+
+
+class TorControlTest(BitcoinTestFramework):
+    def set_test_params(self):
+        self.num_nodes = 1
+
+    def next_port(self):
+        self._port_counter = getattr(self, '_port_counter', 0) + 1
+        return p2p_port(self.num_nodes + self._port_counter)
+
+    def restart_with_mock(self, mock_tor):
+        mock_tor.start()
+        self.restart_node(0, extra_args=[
+            f"-torcontrol=127.0.0.1:{mock_tor.port}",
+            "-listenonion=1",
+            "-debug=tor",
+        ])
+
+    def test_basic(self):
+        self.log.info("Test Tor control basic functionality")
+
+        mock_tor = MockTorControlServer(self.next_port())
+        self.restart_with_mock(mock_tor)
+
+        # Waiting for Tor control commands
+        self.wait_until(lambda: len(mock_tor.received_commands) >= 4, timeout=10)
+
+        # Verify expected protocol sequence
+        assert_equal(mock_tor.received_commands[0], "PROTOCOLINFO 1")
+        assert_equal(mock_tor.received_commands[1], "AUTHENTICATE")
+        assert_equal(mock_tor.received_commands[2], "GETINFO net/listeners/socks")
+        assert mock_tor.received_commands[3].startswith("ADD_ONION ")
+        assert "PoWDefensesEnabled=1" in mock_tor.received_commands[3]
+
+        # Clean up
+        mock_tor.stop()
+
+    def test_partial_data(self):
+        self.log.info("Test that partial Tor control responses are buffered until complete")
+
+        mock_tor = MockTorControlServer(self.next_port(), manual_mode=True)
+        self.restart_with_mock(mock_tor)
+
+        # Wait for connection and PROTOCOLINFO command
+        mock_tor.conn_ready.wait(timeout=10)
+        self.wait_until(lambda: len(mock_tor.received_commands) >= 1, timeout=10)
+        assert_equal(mock_tor.received_commands[0], "PROTOCOLINFO 1")
+
+        # Send partial response (no \r\n on last line)
+        mock_tor.send_raw(
+            "250-PROTOCOLINFO 1\r\n"
+            "250-AUTH METHODS=NULL\r\n"
+            "250 OK"
+        )
+
+        # Verify AUTHENTICATE is not sent
+        ensure_for(duration=2, f=lambda: len(mock_tor.received_commands) == 1)
+
+        # Complete the response
+        mock_tor.send_raw("\r\n")
+
+        # Should now process the complete response and send AUTHENTICATE
+        self.wait_until(lambda: len(mock_tor.received_commands) >= 2, timeout=5)
+        assert_equal(mock_tor.received_commands[1], "AUTHENTICATE")
+
+        # Clean up
+        mock_tor.stop()
+
+    def test_pow_fallback(self):
+        self.log.info("Test that ADD_ONION retries without PoW on 512 error")
+
+        class NoPowServer(MockTorControlServer):
+            def _get_response(self, command):
+                if command.startswith("ADD_ONION"):
+                    if "PoWDefensesEnabled=1" in command:
+                        return "512 Unrecognized option\r\n"
+                    else:
+                        return (
+                            "250-ServiceID=testserviceid1234567890123456789012345678901234567890123456\r\n"
+                            "250 OK\r\n"
+                        )
+                return super()._get_response(command)
+
+        mock_tor = NoPowServer(self.next_port())
+        self.restart_with_mock(mock_tor)
+
+        # Expect: PROTOCOLINFO, AUTHENTICATE, GETINFO, ADD_ONION (with PoW), ADD_ONION (without PoW)
+        self.wait_until(lambda: len(mock_tor.received_commands) >= 5, timeout=10)
+
+        # First ADD_ONION should have PoW enabled
+        assert mock_tor.received_commands[3].startswith("ADD_ONION ")
+        assert "PoWDefensesEnabled=1" in mock_tor.received_commands[3]
+
+        # Retry should be ADD_ONION without PoW
+        assert mock_tor.received_commands[4].startswith("ADD_ONION ")
+        assert "PoWDefensesEnabled=1" not in mock_tor.received_commands[4]
+
+        # Clean up
+        mock_tor.stop()
+
+    def test_oversized_line(self):
+        self.log.info("Test that Tor control disconnects on oversized response lines")
+
+        mock_tor = MockTorControlServer(self.next_port(), manual_mode=True)
+        self.restart_with_mock(mock_tor)
+
+        # Wait for connection and PROTOCOLINFO command.
+        mock_tor.conn_ready.wait(timeout=10)
+        self.wait_until(lambda: len(mock_tor.received_commands) >= 1, timeout=10)
+        assert_equal(mock_tor.received_commands[0], "PROTOCOLINFO 1")
+
+        # Send a single line longer than MAX_LINE_LENGTH. The node should disconnect.
+        MAX_LINE_LENGTH = 100000
+        mock_tor.send_raw("250-" + ("A" * (MAX_LINE_LENGTH + 1)) + "\r\n")
+        ensure_for(duration=2, f=lambda: self.nodes[0].process.poll() is None)
+
+        # Connection should be dropped and retried, causing another PROTOCOLINFO.
+        self.wait_until(lambda: len(mock_tor.received_commands) >= 2, timeout=10)
+        assert_equal(mock_tor.received_commands[1], "PROTOCOLINFO 1")
+
+        mock_tor.stop()
+
+    def run_test(self):
+        self.test_basic()
+        self.test_partial_data()
+        self.test_pow_fallback()
+        self.test_oversized_line()
+
+if __name__ == '__main__':
+    TorControlTest(__file__).main()
diff --git a/test/functional/interface_bitcoin_cli.py b/test/functional/interface_bitcoin_cli.py
index f626ee517616..953eea3d63ca 100755
--- a/test/functional/interface_bitcoin_cli.py
+++ b/test/functional/interface_bitcoin_cli.py
@@ -6,6 +6,7 @@
 
 from decimal import Decimal
 import re
+import subprocess
 
 from test_framework.blocktools import COINBASE_MATURITY
 from test_framework.netutil import test_ipv6_local
@@ -138,11 +139,11 @@ def run_test(self):
 
         self.log.info("Test -stdinrpcpass option")
         assert_equal(BLOCKS, self.nodes[0].cli(f'-rpcuser={user}', '-stdinrpcpass', input=password).getblockcount())
-        assert_raises_process_error(1, 'Incorrect rpcuser or rpcpassword', self.nodes[0].cli(f'-rpcuser={user}', '-stdinrpcpass', input='foo').echo)
+        assert_raises_process_error(1, 'Incorrect rpcuser or rpcpassword were specified', self.nodes[0].cli(f'-rpcuser={user}', '-stdinrpcpass', input='foo').echo)
 
         self.log.info("Test -stdin and -stdinrpcpass")
         assert_equal(['foo', 'bar'], self.nodes[0].cli(f'-rpcuser={user}', '-stdin', '-stdinrpcpass', input=f'{password}\nfoo\nbar').echo())
-        assert_raises_process_error(1, 'Incorrect rpcuser or rpcpassword', self.nodes[0].cli(f'-rpcuser={user}', '-stdin', '-stdinrpcpass', input='foo').echo)
+        assert_raises_process_error(1, 'Incorrect rpcuser or rpcpassword were specified', self.nodes[0].cli(f'-rpcuser={user}', '-stdin', '-stdinrpcpass', input='foo').echo)
 
         self.log.info("Test connecting to a non-existing server")
         assert_raises_process_error(1, "Could not connect to the server", self.nodes[0].cli('-rpcport=1').echo)
@@ -195,7 +196,14 @@ def run_test(self):
         self.nodes[0].replace_in_config([("#" + conf_rpcport, conf_rpcport)])
 
         self.log.info("Test connecting with non-existing RPC cookie file")
-        assert_raises_process_error(1, "Could not locate RPC credentials", self.nodes[0].cli('-rpccookiefile=does-not-exist', '-rpcpassword=').echo)
+        assert_raises_process_error(1, "Failed to read cookie file and no rpcpassword was specified.", self.nodes[0].cli('-rpccookiefile=does-not-exist', '-rpcpassword=').echo)
+
+        self.log.info("Test connecting with neither cookie file, nor password")
+        assert_raises_process_error(1, "Cookie file was disabled via -norpccookiefile and no rpcpassword was specified.", self.nodes[0].cli("-norpccookiefile").echo)
+        assert_raises_process_error(1, "Cookie file was disabled via -norpccookiefile and no rpcpassword was specified.", self.nodes[0].cli("-norpccookiefile", "-rpcpassword=").echo)
+
+        self.log.info("Test connecting with invalid cookie file")
+        assert_raises_process_error(1, "Cookie file credentials were invalid and no rpcpassword was specified.", self.nodes[0].cli(f"-rpccookiefile={self.nodes[0].datadir_path / 'bitcoin.conf'}").echo)
 
         self.log.info("Test connecting without RPC cookie file and with password arg")
         assert_equal(BLOCKS, self.nodes[0].cli('-norpccookiefile', f'-rpcuser={user}', f'-rpcpassword={password}').getblockcount())
@@ -434,6 +442,16 @@ def run_test(self):
         self.log.info("Test that only one of -addrinfo, -generate, -getinfo, -netinfo may be specified at a time")
         assert_raises_process_error(1, "Only one of -getinfo, -netinfo may be specified", self.nodes[0].cli('-getinfo', '-netinfo').send_cli)
 
+        if not self.is_ipc_compiled():
+            # This tests behavior when ENABLE_IPC is off. When it is on,
+            # behavior is checked by the interface_ipc_cli.py test.
+            self.log.info("Test bitcoin-cli -ipcconnect triggers error if not built with IPC support")
+            args = [self.binary_paths.bitcoincli, "-ipcconnect=unix", "-getinfo"]
+            result = subprocess.run(args, stdout=subprocess.PIPE, stderr=subprocess.STDOUT, text=True)
+            assert_equal(result.stdout, "error: bitcoin-cli was not built with IPC support\n")
+            assert_equal(result.stderr, None)
+            assert_equal(result.returncode, 1)
+
 
 if __name__ == '__main__':
     TestBitcoinCli(__file__).main()
diff --git a/test/functional/interface_http.py b/test/functional/interface_http.py
index 60e2b8cae92a..ff6d70a03a67 100755
--- a/test/functional/interface_http.py
+++ b/test/functional/interface_http.py
@@ -1,8 +1,8 @@
 #!/usr/bin/env python3
-# Copyright (c) 2014-present The Bitcoin Core developers
+# Copyright (c) The Bitcoin 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."""
+"""Test the HTTP server basics."""
 
 from test_framework.test_framework import BitcoinTestFramework
 from test_framework.util import assert_equal, str_to_b64str
@@ -11,6 +11,87 @@
 import time
 import urllib.parse
 
+# Configuration option for some test nodes
+RPCSERVERTIMEOUT = 2
+# Set in httpserver.cpp and passed to libevent evhttp_set_max_headers_size()
+MAX_HEADERS_SIZE = 8192
+# Set in serialize.h and passed to libevent evhttp_set_max_body_size()
+MAX_SIZE = 0x02000000
+
+
+class BitcoinHTTPConnection:
+    def __init__(self, node):
+        self.url = urllib.parse.urlparse(node.url)
+        self.authpair = f'{self.url.username}:{self.url.password}'
+        self.headers = {"Authorization": f"Basic {str_to_b64str(self.authpair)}"}
+        self.reset_conn()
+
+    def reset_conn(self):
+        self.conn = http.client.HTTPConnection(self.url.hostname, self.url.port)
+        self.conn.connect()
+
+    def sock_closed(self):
+        if self.conn.sock is None:
+            return True
+        try:
+            self.conn.request('GET', '/')
+            self.conn.getresponse().read()
+            return False
+        #       macos/linux           windows
+        except (ConnectionResetError, ConnectionAbortedError):
+            return True
+
+    def close_sock(self):
+        self.conn.close()
+
+    def set_timeout(self, seconds):
+        self.conn.sock.settimeout(seconds)
+
+    def add_header(self, key, value):
+        self.headers.update({key: value})
+
+    def _request(self, method, path, data, connection_header, **kwargs):
+        headers = self.headers.copy()
+        if connection_header is not None:
+            headers["Connection"] = connection_header
+        self.conn.request(method, path, data, headers, **kwargs)
+        return self.conn.getresponse()
+
+    def post(self, path, data, connection_header=None, **kwargs):
+        return self._request('POST', path, data, connection_header, **kwargs)
+
+    def get(self, path, connection_header=None):
+        return self._request('GET', path, '', connection_header)
+
+    def post_raw(self, path, data):
+        req = f"POST {path} HTTP/1.1\r\n"
+        req += f'Authorization: Basic {str_to_b64str(self.authpair)}\r\n'
+        req += f'Content-Length: {len(data)}\r\n\r\n'
+        req += data
+        self.conn.sock.sendall(req.encode("utf-8"))
+
+    def recv_raw(self):
+        '''
+        Blocking socket will wait until data is received and return up to 1024 bytes
+        '''
+        return self.conn.sock.recv(1024)
+
+    def expect_timeout(self, seconds):
+        # Wait for response, but expect a timeout disconnection
+        start = time.time()
+        response1 = self.recv_raw()
+        stop = time.time()
+        # Server disconnected with EOF
+        assert_equal(response1, b"")
+        # Server disconnected within an acceptable range of time:
+        # not immediately, and not too far over the configured duration.
+        # This allows for some jitter in the test between client and server.
+        duration = stop - start
+        assert duration <= seconds + 2, f"Server disconnected too slow: {duration} > {seconds}"
+        assert duration >= seconds - 1, f"Server disconnected too fast: {duration} < {seconds}"
+        # The connection is definitely closed.
+        assert self.sock_closed()
+
 class HTTPBasicsTest (BitcoinTestFramework):
     def set_test_params(self):
         self.num_nodes = 3
@@ -20,123 +101,148 @@ def setup_network(self):
         self.setup_nodes()
 
     def run_test(self):
-
-        #################################################
-        # lowlevel check for http persistent connection #
-        #################################################
-        url = urllib.parse.urlparse(self.nodes[0].url)
-        authpair = f'{url.username}:{url.password}'
-        headers = {"Authorization": f"Basic {str_to_b64str(authpair)}"}
-
-        conn = http.client.HTTPConnection(url.hostname, url.port)
-        conn.connect()
-        conn.request('POST', '/', '{"method": "getbestblockhash"}', headers)
-        out1 = conn.getresponse().read()
-        assert b'"error":null' in out1
-        assert conn.sock is not None  #according to http/1.1 connection must still be open!
-
-        #send 2nd request without closing connection
-        conn.request('POST', '/', '{"method": "getchaintips"}', headers)
-        out1 = conn.getresponse().read()
-        assert b'"error":null' in out1  #must also response with a correct json-rpc message
-        assert conn.sock is not None  #according to http/1.1 connection must still be open!
-        conn.close()
-
-        #same should be if we add keep-alive because this should be the std. behaviour
-        headers = {"Authorization": f"Basic {str_to_b64str(authpair)}", "Connection": "keep-alive"}
-
-        conn = http.client.HTTPConnection(url.hostname, url.port)
-        conn.connect()
-        conn.request('POST', '/', '{"method": "getbestblockhash"}', headers)
-        out1 = conn.getresponse().read()
-        assert b'"error":null' in out1
-        assert conn.sock is not None  #according to http/1.1 connection must still be open!
-
-        #send 2nd request without closing connection
-        conn.request('POST', '/', '{"method": "getchaintips"}', headers)
-        out1 = conn.getresponse().read()
-        assert b'"error":null' in out1  #must also response with a correct json-rpc message
-        assert conn.sock is not None  #according to http/1.1 connection must still be open!
-        conn.close()
-
-        #now do the same with "Connection: close"
-        headers = {"Authorization": f"Basic {str_to_b64str(authpair)}", "Connection":"close"}
-
-        conn = http.client.HTTPConnection(url.hostname, url.port)
-        conn.connect()
-        conn.request('POST', '/', '{"method": "getbestblockhash"}', headers)
-        out1 = conn.getresponse().read()
-        assert b'"error":null' in out1
-        assert conn.sock is None  #now the connection must be closed after the response
-
-        #node1 (2nd node) is running with disabled keep-alive option
-        urlNode1 = urllib.parse.urlparse(self.nodes[1].url)
-        authpair = f'{urlNode1.username}:{urlNode1.password}'
-        headers = {"Authorization": f"Basic {str_to_b64str(authpair)}"}
-
-        conn = http.client.HTTPConnection(urlNode1.hostname, urlNode1.port)
-        conn.connect()
-        conn.request('POST', '/', '{"method": "getbestblockhash"}', headers)
-        out1 = conn.getresponse().read()
-        assert b'"error":null' in out1
-
-        #node2 (third node) is running with standard keep-alive parameters which means keep-alive is on
-        urlNode2 = urllib.parse.urlparse(self.nodes[2].url)
-        authpair = f'{urlNode2.username}:{urlNode2.password}'
-        headers = {"Authorization": f"Basic {str_to_b64str(authpair)}"}
-
-        conn = http.client.HTTPConnection(urlNode2.hostname, urlNode2.port)
-        conn.connect()
-        conn.request('POST', '/', '{"method": "getbestblockhash"}', headers)
-        out1 = conn.getresponse().read()
-        assert b'"error":null' in out1
-        assert conn.sock is not None  #connection must be closed because bitcoind should use keep-alive by default
-
-        # Check excessive request size
-        conn = http.client.HTTPConnection(urlNode2.hostname, urlNode2.port)
-        conn.connect()
-        conn.request('GET', f'/{"x"*1000}', '', headers)
-        out1 = conn.getresponse()
-        assert_equal(out1.status, http.client.NOT_FOUND)
-
-        conn = http.client.HTTPConnection(urlNode2.hostname, urlNode2.port)
-        conn.connect()
-        conn.request('GET', f'/{"x"*10000}', '', headers)
-        out1 = conn.getresponse()
-        assert_equal(out1.status, http.client.BAD_REQUEST)
-
-
+        self.check_default_connection()
+        self.check_keepalive_connection()
+        self.check_close_connection()
+        self.check_excessive_request_size()
+        self.check_pipelining()
+        self.check_chunked_transfer()
+        self.check_idle_timeout()
+        self.check_server_busy_idle_timeout()
+
+
+    def check_default_connection(self):
+        self.log.info("Checking default HTTP/1.1 connection persistence")
+        conn = BitcoinHTTPConnection(self.nodes[0])
+        # Make request without explicit "Connection" header
+        response1 = conn.post('/', '{"method": "getbestblockhash"}').read()
+        assert b'"error":null' in response1
+        # Connection still open after request
+        assert not conn.sock_closed()
+        # Make second request without explicit "Connection" header
+        response2 = conn.post('/', '{"method": "getchaintips"}').read()
+        assert b'"error":null' in response2
+        # Connection still open after second request
+        assert not conn.sock_closed()
+        # Close
+        conn.close_sock()
+        assert conn.sock_closed()
+
+
+    def check_keepalive_connection(self):
+        self.log.info("Checking keep-alive connection persistence")
+        conn = BitcoinHTTPConnection(self.nodes[0])
+        # Make request with explicit "Connection: keep-alive" header
+        response1 = conn.post('/', '{"method": "getbestblockhash"}', connection_header='keep-alive').read()
+        assert b'"error":null' in response1
+        # Connection still open after request
+        assert not conn.sock_closed()
+        # Make second request with explicit "Connection" header
+        response2 = conn.post('/', '{"method": "getchaintips"}', connection_header='keep-alive').read()
+        assert b'"error":null' in response2
+        # Connection still open after second request
+        assert not conn.sock_closed()
+        # Close
+        conn.close_sock()
+        assert conn.sock_closed()
+
+
+    def check_close_connection(self):
+        self.log.info("Checking close connection after response")
+        conn = BitcoinHTTPConnection(self.nodes[0])
+        # Make request with explicit "Connection: close" header
+        response1 = conn.post('/', '{"method": "getbestblockhash"}', connection_header='close').read()
+        assert b'"error":null' in response1
+        # Connection closed after response
+        assert conn.sock_closed()
+
+
+    def check_excessive_request_size(self):
+        self.log.info("Checking excessive request size")
+
+        # Large URI plus up to 1000 bytes of default headers
+        # added by python's http.client still below total limit.
+        conn = BitcoinHTTPConnection(self.nodes[0])
+        response1 = conn.get(f'/{"x" * (MAX_HEADERS_SIZE - 1000)}')
+        assert_equal(response1.status, http.client.NOT_FOUND)
+
+        # Excessive URI size plus default headers breaks the limit.
+        conn = BitcoinHTTPConnection(self.nodes[1])
+        response2 = conn.get(f'/{"x" * MAX_HEADERS_SIZE}')
+        assert_equal(response2.status, http.client.BAD_REQUEST)
+
+        # Compute how many short header lines need to be added to http.client
+        # default headers to make / break the total limit in a single request.
+        header_line_length = len("header_0000: foo\r\n")
+        headers_below_limit = (MAX_HEADERS_SIZE - 1000) // header_line_length
+        headers_above_limit = MAX_HEADERS_SIZE // header_line_length
+
+        # This is a libevent mystery:
+        # libevent does not reject the request until it is more than
+        # 1,000 bytes above the configured limit.
+        headers_above_limit += 1000 // header_line_length
+
+        # Many small header lines is ok
+        conn = BitcoinHTTPConnection(self.nodes[2])
+        for i in range(headers_below_limit):
+            conn.add_header(f"header_{i:04}", "foo")
+        response3 = conn.get('/x')
+        assert_equal(response3.status, http.client.NOT_FOUND)
+
+        # Too many small header lines exceeds total headers size allowed
+        conn = BitcoinHTTPConnection(self.nodes[2])
+        for i in range(headers_above_limit):
+            conn.add_header(f"header_{i:04}", "foo")
+        response3 = conn.get('/x')
+        assert_equal(response3.status, http.client.BAD_REQUEST)
+
+        # Compute how much data we can add to a request message body
+        # to make / break the limit.
+        base_request_body_size = len('{"jsonrpc": "2.0", "id": "0", "method": "submitblock", "params": [""]}}')
+        bytes_below_limit = MAX_SIZE - base_request_body_size
+        bytes_above_limit = MAX_SIZE - base_request_body_size + 2
+
+        # Large request body size is ok
+        conn = BitcoinHTTPConnection(self.nodes[0])
+        response4 = conn.post('/', f'{{"jsonrpc": "2.0", "id": "0", "method": "submitblock", "params": ["{"0" * bytes_below_limit}"]}}')
+        assert_equal(response4.status, http.client.OK)
+
+        conn = BitcoinHTTPConnection(self.nodes[1])
+        try:
+            # Excessive body size is invalid
+            response5 = conn.post('/', f'{{"jsonrpc": "2.0", "id": "0", "method": "submitblock", "params": ["{"0" * bytes_above_limit}"]}}')
+
+            # The server will send a 400 response and disconnect but
+            # due to a race condition, the python client may or may not
+            # receive the response before detecting the broken socket.
+            response5.read()
+            assert_equal(response5.status, http.client.BAD_REQUEST)
+            assert conn.sock_closed()
+            self.log.debug("Server sent response before terminating connection")
+        except (BrokenPipeError, ConnectionResetError, ConnectionAbortedError):
+            self.log.debug("Server terminated connection immediately")
+
+
+    def check_pipelining(self):
+        """
+        Requests are responded to in the order in which they were received
+        See https://www.rfc-editor.org/rfc/rfc7230#section-6.3.2
+        """
         self.log.info("Check pipelining")
-        # Requests are responded to in order they were received
-        # See https://www.rfc-editor.org/rfc/rfc7230#section-6.3.2
         tip_height = self.nodes[2].getblockcount()
+        conn = BitcoinHTTPConnection(self.nodes[2])
+        conn.set_timeout(5)
+
+        # Send two requests in a row.
+        # The first request will block the second indefinitely
+        conn.post_raw('/', f'{{"method": "waitforblockheight", "params": [{tip_height + 1}]}}')
+        conn.post_raw('/', '{"method": "getblockcount"}')
 
-        req = "POST / HTTP/1.1\r\n"
-        req += f'Authorization: Basic {str_to_b64str(authpair)}\r\n'
-
-        # First request will take a long time to process
-        body1 = f'{{"method": "waitforblockheight", "params": [{tip_height + 1}]}}'
-        req1 = req
-        req1 += f'Content-Length: {len(body1)}\r\n\r\n'
-        req1 += body1
-
-        # Second request will process very fast
-        body2 = '{"method": "getblockcount"}'
-        req2 = req
-        req2 += f'Content-Length: {len(body2)}\r\n\r\n'
-        req2 += body2
-        # Get the underlying socket from HTTP connection so we can send something unusual
-        conn = http.client.HTTPConnection(urlNode2.hostname, urlNode2.port)
-        conn.connect()
-        sock = conn.sock
-        sock.settimeout(5)
-        # Send two requests in a row. The first will block the second indefinitely
-        sock.sendall(req1.encode("utf-8"))
-        sock.sendall(req2.encode("utf-8"))
         try:
-            # The server should not respond to the fast, second request
-            # until the (very) slow first request has been handled:
-            res = sock.recv(1024)
+            # The server should not respond to the second request until the first
+            # request has been handled. Since the server will not respond at all
+            # to the first request until we generate a block we expect a socket timeout.
+            conn.recv_raw()
             assert False
         except TimeoutError:
             pass
@@ -147,7 +253,7 @@ def run_test(self):
         # Wait for two responses to be received
         res = b""
         while res.count(b"result") != 2:
-            res += sock.recv(1024)
+            res += conn.recv_raw()
 
         # waitforblockheight was responded to first, and then getblockcount
         # which includes the block added after the request was made
@@ -156,8 +262,10 @@ def run_test(self):
         assert chunks[2].startswith(bytes(f'{tip_height + 1}', 'utf8'))
 
 
+    def check_chunked_transfer(self):
         self.log.info("Check HTTP request encoded with chunked transfer")
-        headers_chunked = headers.copy()
+        conn = BitcoinHTTPConnection(self.nodes[2])
+        headers_chunked = conn.headers.copy()
         headers_chunked.update({"Transfer-encoding": "chunked"})
         body_chunked = [
             b'{"method": "submitblock", "params": ["',
@@ -167,18 +275,49 @@ def run_test(self):
             b'3' * 1000000,
             b'"]}'
         ]
-        conn = http.client.HTTPConnection(urlNode2.hostname, urlNode2.port)
-        conn.connect()
-        conn.request(
+        conn.conn.request(
             method='POST',
             url='/',
             body=iter(body_chunked),
             headers=headers_chunked,
             encode_chunked=True)
-        out1 = conn.getresponse().read()
-        assert_equal(out1, b'{"result":"high-hash","error":null}\n')
-
+        response1 = conn.recv_raw()
+        assert b'{"result":"high-hash","error":null}\n' in response1
 
+        self.log.info("Check excessive size HTTP request encoded with chunked transfer")
+        conn = BitcoinHTTPConnection(self.nodes[0])
+        headers_chunked = conn.headers.copy()
+        headers_chunked.update({"Transfer-encoding": "chunked"})
+        body_chunked = [
+            b'{"method": "submitblock", "params": ["',
+            b'0' * 10000000,
+            b'1' * 10000000,
+            b'2' * 10000000,
+            b'3' * 10000000,
+            b'"]}'
+        ]
+        try:
+            conn.conn.request(
+                method='POST',
+                url='/',
+                body=iter(body_chunked),
+                headers=headers_chunked,
+                encode_chunked=True)
+
+            # The server will send a 400 response and disconnect but
+            # due to a race condition, the python client may or may not
+            # receive the response before detecting the broken socket.
+            response2 = conn.conn.getresponse()
+            response2.read()
+            assert_equal(response2.status, http.client.BAD_REQUEST)
+            assert conn.sock_closed()
+            self.log.debug("Server sent response before terminating connection")
+        except (BrokenPipeError, ConnectionResetError, ConnectionAbortedError):
+            # ...or just immediately disconnect
+            self.log.debug("Server terminated connection immediately")
+
+
+    def check_idle_timeout(self):
         self.log.info("Check -rpcservertimeout")
         # The test framework typically reuses a single persistent HTTP connection
         # for all RPCs to a TestNode. Because we are setting -rpcservertimeout
@@ -188,54 +327,49 @@ def run_test(self):
         # called for the remainder of this test.
         self.nodes[2].reuse_http_connections = False
 
-        self.restart_node(2, extra_args=["-rpcservertimeout=2"])
         # This is the amount of time the server will wait for a client to
         # send a complete request. Test it by sending an incomplete but
-        # so-far otherwise well-formed HTTP request, and never finishing it.
+        # so-far otherwise well-formed HTTP request, and never finishing it
+        self.restart_node(2, extra_args=[f"-rpcservertimeout={RPCSERVERTIMEOUT}"])
 
         # Copied from http_incomplete_test_() in regress_http.c in libevent.
         # A complete request would have an additional "\r\n" at the end.
-        http_request = "GET /test1 HTTP/1.1\r\nHost: somehost\r\n"
-
-        # Get the underlying socket from HTTP connection so we can send something unusual
-        conn = http.client.HTTPConnection(urlNode2.hostname, urlNode2.port)
-        conn.connect()
-        sock = conn.sock
-        sock.sendall(http_request.encode("utf-8"))
-        # Wait for response, but expect a timeout disconnection after 1 second
-        start = time.time()
-        res = sock.recv(1024)
-        stop = time.time()
-        # Server disconnected with EOF
-        assert_equal(res, b"")
-        # Server disconnected within an acceptable range of time:
-        # not immediately, and not too far over the configured duration.
-        # This allows for some jitter in the test between client and server.
-        duration = stop - start
-        assert duration <= 4, f"Server disconnected too slow: {duration} > 4"
-        assert duration >= 1, f"Server disconnected too fast: {duration} < 1"
+        bad_http_request = "GET /test1 HTTP/1.1\r\nHost: somehost\r\n"
+        conn = BitcoinHTTPConnection(self.nodes[2])
+        conn.conn.sock.sendall(bad_http_request.encode("utf-8"))
+
+        conn.expect_timeout(RPCSERVERTIMEOUT)
+
+        # Sanity check -- complete requests don't timeout waiting for completion
+        good_http_request = "GET /test2 HTTP/1.1\r\nHost: somehost\r\n\r\n"
+        conn.reset_conn()
+        conn.conn.sock.sendall(good_http_request.encode("utf-8"))
+        response2 = conn.recv_raw()
+        assert response2.startswith(b"HTTP/1.1 404 Not Found")
+
+        # Still open
+        assert not conn.sock_closed()
+
+
+    def check_server_busy_idle_timeout(self):
+        self.log.info("Check that -rpcservertimeout won't close on a delayed response")
+        tip_height = self.nodes[2].getblockcount()
+        conn = BitcoinHTTPConnection(self.nodes[2])
+        conn.post_raw('/', f'{{"method": "waitforblockheight", "params": [{tip_height + 1}]}}')
+
+        # Wait until after the timeout, then generate a block with a second HTTP connection
+        time.sleep(RPCSERVERTIMEOUT + 1)
+        generated_block = self.generate(self.nodes[2], 1, sync_fun=self.no_op)[0]
+
+        # The first connection gets the response it is patiently waiting for
+        response1 = conn.recv_raw().decode()
+        assert generated_block in response1
+        # The connection is still open
+        assert not conn.sock_closed()
+
+        # Now it will actually close due to idle timeout
+        conn.expect_timeout(RPCSERVERTIMEOUT)
 
-        # The connection is definitely closed.
-        got_expected_error = False
-        try:
-            conn.request('GET', '/')
-            conn.getresponse()
-        #       macos/linux           windows
-        except (ConnectionResetError, ConnectionAbortedError):
-            got_expected_error = True
-        assert got_expected_error
-
-        # Sanity check
-        http_request = "GET /test2 HTTP/1.1\r\nHost: somehost\r\n\r\n"
-        conn = http.client.HTTPConnection(urlNode2.hostname, urlNode2.port)
-        conn.connect()
-        sock = conn.sock
-        sock.sendall(http_request.encode("utf-8"))
-        res = sock.recv(1024)
-        assert res.startswith(b"HTTP/1.1 404 Not Found")
-        # still open
-        conn.request('GET', '/')
-        conn.getresponse()
 
 if __name__ == '__main__':
     HTTPBasicsTest(__file__).main()
diff --git a/test/functional/interface_ipc.py b/test/functional/interface_ipc.py
index 16ec03079b0a..2c11f88305c9 100755
--- a/test/functional/interface_ipc.py
+++ b/test/functional/interface_ipc.py
@@ -11,6 +11,7 @@
 from test_framework.ipc_util import (
     load_capnp_modules,
     make_capnp_init_ctx,
+    make_mining_ctx,
 )
 
 # Test may be skipped and not have capnp installed
@@ -55,9 +56,7 @@ def run_mining_test(self):
         block_hash_size = 32
 
         async def async_routine():
-            ctx, init = await make_capnp_init_ctx(self)
-            self.log.debug("Create Mining proxy object")
-            mining = init.makeMining(ctx).result
+            ctx, mining = await make_mining_ctx(self)
             self.log.debug("Test simple inspectors")
             assert (await mining.isTestChain(ctx)).result
             assert not (await mining.isInitialBlockDownload(ctx)).result
@@ -95,10 +94,7 @@ def run_unclean_disconnect_test(self):
         disconnected_log_check = ExitStack()
 
         async def async_routine():
-            ctx, init = await make_capnp_init_ctx(self)
-            self.log.debug("Create Mining proxy object")
-            mining = init.makeMining(ctx).result
-
+            ctx, mining = await make_mining_ctx(self)
             self.log.debug("Create a template")
             opts = self.capnp_modules['mining'].BlockCreateOptions()
             template = (await mining.createNewBlock(ctx, opts)).result
@@ -131,10 +127,7 @@ def run_thread_busy_test(self):
         timeout = self.rpc_timeout * 1000.0
 
         async def async_routine():
-            ctx, init = await make_capnp_init_ctx(self)
-            self.log.debug("Create Mining proxy object")
-            mining = init.makeMining(ctx).result
-
+            ctx, mining = await make_mining_ctx(self)
             self.log.debug("Create a template")
             opts = self.capnp_modules['mining'].BlockCreateOptions()
             template = (await mining.createNewBlock(ctx, opts)).result
diff --git a/test/functional/interface_ipc_cli.py b/test/functional/interface_ipc_cli.py
new file mode 100755
index 000000000000..9ad704d3f01c
--- /dev/null
+++ b/test/functional/interface_ipc_cli.py
@@ -0,0 +1,68 @@
+#!/usr/bin/env python3
+# Copyright (c) 2025 The Bitcoin Core developers
+# Distributed under the MIT software license, see the accompanying
+# file COPYING or http://www.opensource.org/licenses/mit-license.php.
+"""Test IPC with bitcoin-cli"""
+
+from test_framework.test_framework import BitcoinTestFramework
+from test_framework.util import (
+    assert_equal,
+    rpc_port
+)
+
+import subprocess
+
+class TestBitcoinIpcCli(BitcoinTestFramework):
+    def set_test_params(self):
+        self.setup_clean_chain = True
+        self.num_nodes = 1
+
+    def skip_test_if_missing_module(self):
+        self.skip_if_no_ipc()
+
+    def setup_nodes(self):
+        self.extra_init = [{"ipcbind": True}]
+        super().setup_nodes()
+
+    def test_cli(self, args, error=None):
+        # Intentionally set wrong RPC password so only IPC not HTTP connections work
+        args = [self.binary_paths.bitcoincli, f"-datadir={self.nodes[0].datadir_path}", "-rpcpassword=wrong"] + args + ["echo", "foo"]
+        result = subprocess.run(args, stdout=subprocess.PIPE, stderr=subprocess.STDOUT, text=True)
+        if error is None:
+            assert_equal(result.stdout, '[\n  "foo"\n]\n')
+        else:
+            assert result.stdout.startswith(error), f"Output didn't start with the expected error {error!r}:\n{result.stdout}"
+        assert_equal(result.stderr, None)
+        assert_equal(result.returncode, 0 if error is None else 1)
+
+    def run_test(self):
+        node = self.nodes[0]
+        if node.ipc_tmp_dir:
+            self.log.info("Skipping a few checks because temporary directory path is too long")
+
+        http_auth_error = "error: Authorization failed: Incorrect rpcuser or rpcpassword were specified."
+        http_connect_error = f"error: timeout on transient error: Could not connect to the server 127.0.0.1:{rpc_port(node.index)}\n\nMake sure the bitcoind server is running and that you are connecting to the correct RPC port.\nUse \"bitcoin-cli -help\" for more info.\n"
+        ipc_connect_error = "error: timeout on transient error: Connection refused\n\nProbably bitcoin-node is not running or not listening on a unix socket. Can be started with:\n\n    bitcoin-node -chain=regtest -ipcbind=unix\n"
+        ipc_http_conflict = "error: -rpcconnect and -ipcconnect options cannot both be enabled\n"
+
+        for started in (True, False):
+            auto_error = None if started else http_connect_error
+            http_error = http_auth_error if started else http_connect_error
+            ipc_error = None if started else ipc_connect_error
+
+            if not node.ipc_tmp_dir:
+                self.test_cli([], auto_error)
+                self.test_cli(["-rpcconnect=127.0.0.1"], http_error)
+                self.test_cli(["-ipcconnect=auto"], auto_error)
+                self.test_cli(["-ipcconnect=auto", "-rpcconnect=127.0.0.1"], http_error)
+                self.test_cli(["-ipcconnect=unix"], ipc_error)
+
+            self.test_cli([f"-ipcconnect=unix:{node.ipc_socket_path}"], ipc_error)
+            self.test_cli(["-noipcconnect"], http_error)
+            self.test_cli(["-ipcconnect=unix", "-rpcconnect=127.0.0.1"], ipc_http_conflict)
+
+            self.stop_node(0)
+
+
+if __name__ == '__main__':
+    TestBitcoinIpcCli(__file__).main()
diff --git a/test/functional/interface_ipc_mining.py b/test/functional/interface_ipc_mining.py
index bcb7f5f5d86c..31ccec63fa86 100755
--- a/test/functional/interface_ipc_mining.py
+++ b/test/functional/interface_ipc_mining.py
@@ -7,7 +7,6 @@
 import time
 from contextlib import AsyncExitStack
 from io import BytesIO
-import platform
 from test_framework.blocktools import NULL_OUTPOINT
 from test_framework.messages import (
     MAX_BLOCK_WEIGHT,
@@ -37,11 +36,12 @@
     destroying,
     mining_create_block_template,
     load_capnp_modules,
-    make_capnp_init_ctx,
     mining_get_block,
     mining_get_coinbase_tx,
     mining_wait_next_template,
     wait_and_do,
+    make_mining_ctx,
+    assert_capnp_failed
 )
 
 # Test may be skipped and not have capnp installed
@@ -106,21 +106,14 @@ async def build_coinbase_test(self, template, ctx, miniwallet):
         coinbase_tx.nLockTime = coinbase_res.lockTime
         return coinbase_tx
 
-    async def make_mining_ctx(self):
-        """Create IPC context and Mining proxy object."""
-        ctx, init = await make_capnp_init_ctx(self)
-        self.log.debug("Create Mining proxy object")
-        mining = init.makeMining(ctx).result
-        return ctx, mining
-
     def run_mining_interface_test(self):
         """Test Mining interface methods."""
         self.log.info("Running Mining interface test")
         block_hash_size = 32
-        timeout = 1000.0 # 1000 milliseconds
+        timeout = 1000.0 * self.options.timeout_factor # 1000 milliseconds
 
         async def async_routine():
-            ctx, mining = await self.make_mining_ctx()
+            ctx, mining = await make_mining_ctx(self)
             blockref = await mining.getTip(ctx)
             current_block_height = self.nodes[0].getchaintips()[0]["height"]
             assert_equal(blockref.result.height, current_block_height)
@@ -139,7 +132,7 @@ async def async_routine():
 
             self.log.debug("interrupt() should abort waitTipChanged()")
             async def wait_for_tip():
-                long_timeout = 60000.0  # 1 minute
+                long_timeout = max(timeout, 60000.0)  # at least 1 minute
                 result = (await mining.waitTipChanged(ctx, newblockref.hash, long_timeout)).result
                 # Unlike a timeout, interrupt() returns an empty BlockRef.
                 assert_equal(len(result.hash), 0)
@@ -159,7 +152,7 @@ def run_early_startup_test(self):
         async def async_routine():
             while True:
                 try:
-                    ctx, mining = await self.make_mining_ctx()
+                    ctx, mining = await make_mining_ctx(self)
                     break
                 except (ConnectionRefusedError, FileNotFoundError):
                     # Poll quickly to connect as soon as socket becomes
@@ -179,10 +172,10 @@ def run_block_template_test(self):
         """Test BlockTemplate interface methods."""
         self.log.info("Running BlockTemplate interface test")
         block_header_size = 80
-        timeout = 1000.0 # 1000 milliseconds
+        timeout = 1000.0 * self.options.timeout_factor
 
         async def async_routine():
-            ctx, mining = await self.make_mining_ctx()
+            ctx, mining = await make_mining_ctx(self)
 
             async with AsyncExitStack() as stack:
                 self.log.debug("createNewBlock() should wait if tip is still updating")
@@ -199,6 +192,25 @@ async def async_routine():
                 # spurious failures.
                 assert_greater_than_or_equal(time.time() - start, 0.9)
 
+                self.log.debug("createNewBlock() should wake up promptly after tip advances")
+                success = False
+                duration = 0.0
+                async def wait_fn():
+                    nonlocal success, duration
+                    start = time.time()
+                    res = await mining.createNewBlock(ctx, self.default_block_create_options)
+                    duration = time.time() - start
+                    success = res._has("result")
+                def do_fn():
+                    block_hex = self.nodes[1].getblock(node1_block_hash, False)
+                    self.nodes[0].submitblock(block_hex)
+                await wait_and_do(wait_fn(), do_fn)
+                assert_equal(success, True)
+                if self.options.timeout_factor <= 1:
+                    assert duration < 3.0, f"createNewBlock took {duration:.2f}s, did not wake up promptly after tip advances"
+                else:
+                    self.log.debug("Skipping strict wake-up duration check because timeout_factor > 1")
+
                 self.log.debug("interrupt() should abort createNewBlock() during cooldown")
                 async def create_block():
                     result = await mining.createNewBlock(ctx, self.default_block_create_options)
@@ -273,7 +285,7 @@ async def create_block():
                 self.log.debug("interruptWait should abort the current wait")
                 async def wait_for_block():
                     new_waitoptions = self.capnp_modules['mining'].BlockWaitOptions()
-                    new_waitoptions.timeout = timeout * 60 # 1 minute wait
+                    new_waitoptions.timeout = max(timeout, 60000.0) # at least 1 minute
                     new_waitoptions.feeThreshold = 1
                     template7 = await mining_wait_next_template(template6, stack, ctx, new_waitoptions)
                     assert template7 is None
@@ -290,7 +302,7 @@ def run_ipc_option_override_test(self):
         self.restart_node(0, extra_args=[f"-blockreservedweight={MAX_BLOCK_WEIGHT}"])
 
         async def async_routine():
-            ctx, mining = await self.make_mining_ctx()
+            ctx, mining = await make_mining_ctx(self)
             self.miniwallet.send_self_transfer(fee_rate=10, from_node=self.nodes[0])
 
             async with AsyncExitStack() as stack:
@@ -313,15 +325,7 @@ async def async_routine():
                 await mining.createNewBlock(ctx, opts)
                 raise AssertionError("createNewBlock unexpectedly succeeded")
             except capnp.lib.capnp.KjException as e:
-                if e.description == "remote exception: unknown non-KJ exception of type: kj::Exception":
-                    # macOS + REDUCE_EXPORTS bug: Cap'n Proto fails to recognize
-                    # its own exception type and returns a generic error instead.
-                    # https://github.com/bitcoin/bitcoin/pull/34422#discussion_r2863852691
-                    # Assert this only occurs on Darwin until fixed.
-                    assert_equal(platform.system(), "Darwin")
-                else:
-                    assert_equal(e.description, "remote exception: std::exception: block_reserved_weight (0) must be at least 2000 weight units")
-                assert_equal(e.type, "FAILED")
+                assert_capnp_failed(e, "remote exception: std::exception: block_reserved_weight (0) must be at least 2000 weight units")
 
         asyncio.run(capnp.run(async_routine()))
 
@@ -330,7 +334,7 @@ def run_coinbase_and_submission_test(self):
         self.log.info("Running coinbase construction and submission test")
 
         async def async_routine():
-            ctx, mining = await self.make_mining_ctx()
+            ctx, mining = await make_mining_ctx(self)
 
             current_block_height = self.nodes[0].getchaintips()[0]["height"]
             check_opts = self.capnp_modules['mining'].BlockCheckOptions()
@@ -345,6 +349,13 @@ async def async_routine():
                 block.hashMerkleRoot = block.calc_merkle_root()
                 original_version = block.nVersion
 
+                self.log.debug("Submit solution that can't be deserialized")
+                try:
+                    await template.submitSolution(ctx, 0, 0, 0, b"")
+                    raise AssertionError("submitSolution unexpectedly succeeded")
+                except capnp.lib.capnp.KjException as e:
+                    assert_capnp_failed(e, "remote exception: std::exception: SpanReader::read(): end of data:")
+
                 self.log.debug("Submit a block with a bad version")
                 block.nVersion = 0
                 block.solve()
diff --git a/test/functional/interface_zmq.py b/test/functional/interface_zmq.py
index 79882a436fa0..f8a6bfc69bca 100755
--- a/test/functional/interface_zmq.py
+++ b/test/functional/interface_zmq.py
@@ -75,9 +75,9 @@ def receive_sequence(self):
         label = chr(body[32])
         mempool_sequence = None if len(body) != 32+1+8 else struct.unpack("<Q", body[32+1:])[0]
         if mempool_sequence is not None:
-            assert label == "A" or label == "R"
+            assert label in ("A", "R")
         else:
-            assert label == "D" or label == "C"
+            assert label in ("D", "C")
         return (hash, label, mempool_sequence)
 
 
@@ -480,7 +480,7 @@ def test_mempool_sync(self):
         while zmq_mem_seq is None:
             (hash_str, label, zmq_mem_seq) = seq.receive_sequence()
 
-        assert label == "A" or label == "R"
+        assert label in ("A", "R")
         assert hash_str is not None
 
         # 2) We need to "seed" our view of the mempool
diff --git a/test/functional/mempool_cluster.py b/test/functional/mempool_cluster.py
index 7325028412a2..0dfa6b09ef3f 100755
--- a/test/functional/mempool_cluster.py
+++ b/test/functional/mempool_cluster.py
@@ -72,7 +72,7 @@ def add_chain_cluster(self, node, cluster_count, target_vsize=None):
             all_txids.append(next_tx["txid"])
             utxo_to_spend = next_tx["new_utxo"]
 
-        assert node.getmempoolcluster(parent_tx['txid'])['txcount'] == cluster_count
+        assert_equal(node.getmempoolcluster(parent_tx['txid'])['txcount'], cluster_count)
         return all_results
 
     def check_feerate_diagram(self, node):
@@ -81,7 +81,8 @@ def check_feerate_diagram(self, node):
         last_val = {"weight": 0, "fee": 0}
         for x in feeratediagram:
             # The weight is always positive, except for the first iteration
-            assert x['weight'] > 0 or x['fee'] == 0
+            assert (x['weight'] > 0
+                   or x['fee'] == 0)
             # Monotonically decreasing fee per weight
             assert_greater_than_or_equal(last_val['fee'] * x['weight'], x['fee'] * last_val['weight'])
             last_val = x
diff --git a/test/functional/mempool_limit.py b/test/functional/mempool_limit.py
index 597d02f9e0cb..4770e155de88 100755
--- a/test/functional/mempool_limit.py
+++ b/test/functional/mempool_limit.py
@@ -179,7 +179,7 @@ def test_mid_package_replacement(self):
         # Package should be submitted, temporarily exceeding maxmempool, and then evicted.
         res = node.submitpackage(package_hex)
         assert_equal(res["package_msg"], "transaction failed")
-        assert len([tx_res for _, tx_res in res["tx-results"].items() if "error" in tx_res and tx_res["error"] == "bad-txns-inputs-missingorspent"])
+        assert "bad-txns-inputs-missingorspent" in [tx_res["error"] for _, tx_res in res["tx-results"].items() if "error" in tx_res]
 
         # Maximum size must never be exceeded.
         assert_greater_than(node.getmempoolinfo()["maxmempool"], node.getmempoolinfo()["bytes"])
diff --git a/test/functional/mempool_sigoplimit.py b/test/functional/mempool_sigoplimit.py
index 932e045a8162..823d70549ee1 100755
--- a/test/functional/mempool_sigoplimit.py
+++ b/test/functional/mempool_sigoplimit.py
@@ -208,7 +208,8 @@ def test_legacy_sigops_stdness(self):
         nonstd_tx = CTransaction()
         nonstd_tx.vin = [CTxIn(op, CScript([b"", packed_redeem_script])) for op in outpoints]
         nonstd_tx.vout = [CTxOut(0, CScript([OP_RETURN, b""]))]
-        assert_raises_rpc_error(-26, "bad-txns-nonstandard-inputs", self.nodes[0].sendrawtransaction, nonstd_tx.serialize().hex())
+        assert_raises_rpc_error(-26, "bad-txns-nonstandard-inputs, non-witness sigops exceed bip54 limit",
+                                        self.nodes[0].sendrawtransaction, nonstd_tx.serialize().hex())
 
         # Spending one less accounts for 2490 legacy sigops and is standard.
         std_tx = deepcopy(nonstd_tx)
diff --git a/test/functional/mempool_truc.py b/test/functional/mempool_truc.py
index 2586308e4d37..e3abe039344c 100755
--- a/test/functional/mempool_truc.py
+++ b/test/functional/mempool_truc.py
@@ -294,7 +294,8 @@ def test_truc_ancestors_package(self):
         tx_v3_child = self.wallet.create_self_transfer(utxo_to_spend=tx_v3_parent["new_utxo"], version=3)
         tx_v3_grandchild = self.wallet.create_self_transfer(utxo_to_spend=tx_v3_child["new_utxo"], version=3)
         result = node.testmempoolaccept([tx_v3_parent["hex"], tx_v3_child["hex"], tx_v3_grandchild["hex"]])
-        assert all([txresult["package-error"] == f"TRUC-violation, tx {tx_v3_grandchild['txid']} (wtxid={tx_v3_grandchild['wtxid']}) would have too many ancestors" for txresult in result])
+        for txresult in result:
+            assert_equal(txresult["package-error"], f"TRUC-violation, tx {tx_v3_grandchild['txid']} (wtxid={tx_v3_grandchild['wtxid']}) would have too many ancestors")
 
     @cleanup(extra_args=None)
     def test_truc_ancestors_package_and_mempool(self):
@@ -440,11 +441,13 @@ def test_truc_in_testmempoolaccept(self):
 
         test_accept_v3_from_v2 = node.testmempoolaccept([tx_v2["hex"], tx_v3_from_v2["hex"]])
         expected_error_v3_from_v2 = f"TRUC-violation, version=3 tx {tx_v3_from_v2['txid']} (wtxid={tx_v3_from_v2['wtxid']}) cannot spend from non-version=3 tx {tx_v2['txid']} (wtxid={tx_v2['wtxid']})"
-        assert all([result["package-error"] == expected_error_v3_from_v2 for result in test_accept_v3_from_v2])
+        for result in test_accept_v3_from_v2:
+            assert_equal(result["package-error"], expected_error_v3_from_v2)
 
         test_accept_v2_from_v3 = node.testmempoolaccept([tx_v3["hex"], tx_v2_from_v3["hex"]])
         expected_error_v2_from_v3 = f"TRUC-violation, non-version=3 tx {tx_v2_from_v3['txid']} (wtxid={tx_v2_from_v3['wtxid']}) cannot spend from version=3 tx {tx_v3['txid']} (wtxid={tx_v3['wtxid']})"
-        assert all([result["package-error"] == expected_error_v2_from_v3 for result in test_accept_v2_from_v3])
+        for result in test_accept_v2_from_v3:
+            assert_equal(result["package-error"], expected_error_v2_from_v3)
 
         test_accept_pairs = node.testmempoolaccept([tx_v2["hex"], tx_v3["hex"], tx_v2_from_v2["hex"], tx_v3_from_v3["hex"]])
         assert all([result["allowed"] for result in test_accept_pairs])
@@ -456,7 +459,8 @@ def test_truc_in_testmempoolaccept(self):
         tx_v3_child_2 = self.wallet.create_self_transfer(utxo_to_spend=tx_v3_parent["new_utxos"][1], version=3)
         test_accept_2children = node.testmempoolaccept([tx_v3_parent["hex"], tx_v3_child_1["hex"], tx_v3_child_2["hex"]])
         expected_error_2children = f"TRUC-violation, tx {tx_v3_parent['txid']} (wtxid={tx_v3_parent['wtxid']}) would exceed descendant count limit"
-        assert all([result["package-error"] == expected_error_2children for result in test_accept_2children])
+        for result in test_accept_2children:
+            assert_equal(result["package-error"], expected_error_2children)
 
         # Extra TRUC transaction does not get incorrectly marked as extra descendant
         test_accept_1child_with_exra = node.testmempoolaccept([tx_v3_parent["hex"], tx_v3_child_1["hex"], tx_v3_independent["hex"]])
@@ -465,11 +469,13 @@ def test_truc_in_testmempoolaccept(self):
         # Extra TRUC transaction does not make us ignore the extra descendant
         test_accept_2children_with_exra = node.testmempoolaccept([tx_v3_parent["hex"], tx_v3_child_1["hex"], tx_v3_child_2["hex"], tx_v3_independent["hex"]])
         expected_error_extra = f"TRUC-violation, tx {tx_v3_parent['txid']} (wtxid={tx_v3_parent['wtxid']}) would exceed descendant count limit"
-        assert all([result["package-error"] == expected_error_extra for result in test_accept_2children_with_exra])
+        for result in test_accept_2children_with_exra:
+            assert_equal(result["package-error"], expected_error_extra)
         # Same result if the parent is already in mempool
         node.sendrawtransaction(tx_v3_parent["hex"])
         test_accept_2children_with_in_mempool_parent = node.testmempoolaccept([tx_v3_child_1["hex"], tx_v3_child_2["hex"]])
-        assert all([result["package-error"] == expected_error_extra for result in test_accept_2children_with_in_mempool_parent])
+        for result in test_accept_2children_with_in_mempool_parent:
+            assert_equal(result["package-error"], expected_error_extra)
 
     @cleanup(extra_args=None)
     def test_reorg_2child_rbf(self):
diff --git a/test/functional/mempool_updatefromblock.py b/test/functional/mempool_updatefromblock.py
index 11571f6f430d..a5b2b6ced9ac 100755
--- a/test/functional/mempool_updatefromblock.py
+++ b/test/functional/mempool_updatefromblock.py
@@ -19,9 +19,6 @@
 
 MAX_DISCONNECTED_TX_POOL_BYTES = 20_000_000
 
-CUSTOM_ANCESTOR_COUNT = 100
-CUSTOM_DESCENDANT_COUNT = CUSTOM_ANCESTOR_COUNT
-
 class MempoolUpdateFromBlockTest(BitcoinTestFramework):
     def set_test_params(self):
         self.num_nodes = 1
diff --git a/test/functional/mining_basic.py b/test/functional/mining_basic.py
index 750dd42c53ef..53ddb0edc420 100755
--- a/test/functional/mining_basic.py
+++ b/test/functional/mining_basic.py
@@ -122,7 +122,8 @@ def test_fees_and_sigops(self):
         tx_d = self.wallet.send_self_transfer(from_node=node,
                                               fee_rate=Decimal("0.00100"))
 
-        block_template_txs = node.getblocktemplate(NORMAL_GBT_REQUEST_PARAMS)['transactions']
+        block_template = node.getblocktemplate(NORMAL_GBT_REQUEST_PARAMS)
+        block_template_txs = block_template['transactions']
 
         block_template_fees = [tx['fee'] for tx in block_template_txs]
         assert_equal(block_template_fees, [
@@ -131,6 +132,10 @@ def test_fees_and_sigops(self):
             tx_b["fee"] * COIN,
             tx_c["fee"] * COIN
         ])
+        # verify that coinbasevalue field is set to claim full block reward (subsidy + fees)
+        expected_block_reward = create_coinbase(
+            height=int(block_template["height"]), fees=sum(block_template_fees)).vout[0].nValue
+        assert_equal(block_template["coinbasevalue"], expected_block_reward)
 
         block_template_sigops = [tx['sigops'] for tx in block_template_txs]
         assert_equal(block_template_sigops, [0, 4, 4, 4])
@@ -436,6 +441,9 @@ def run_test(self):
         self.log.info("getblocktemplate: segwit rule must be set")
         assert_raises_rpc_error(-8, "getblocktemplate must be called with the segwit rule set", node.getblocktemplate, {})
 
+        self.log.info("getblocktemplate: result should set the right rules")
+        assert_equal(['csv', '!segwit', 'taproot'], self.nodes[0].getblocktemplate(NORMAL_GBT_REQUEST_PARAMS)['rules'])
+
         self.log.info("submitblock: Test block decode failure")
         assert_raises_rpc_error(-22, "Block decode failed", node.submitblock, block.serialize()[:-15].hex())
 
diff --git a/test/functional/mining_getblocktemplate_longpoll.py b/test/functional/mining_getblocktemplate_longpoll.py
index 421116965ce1..e36396b352ac 100755
--- a/test/functional/mining_getblocktemplate_longpoll.py
+++ b/test/functional/mining_getblocktemplate_longpoll.py
@@ -8,7 +8,7 @@
 import threading
 
 from test_framework.test_framework import BitcoinTestFramework
-from test_framework.util import get_rpc_proxy
+from test_framework.util import assert_equal, get_rpc_proxy
 from test_framework.wallet import MiniWallet
 
 
@@ -37,7 +37,7 @@ def run_test(self):
         template = self.nodes[0].getblocktemplate({'rules': ['segwit']})
         longpollid = template['longpollid']
         template2 = self.nodes[0].getblocktemplate({'rules': ['segwit']})
-        assert template2['longpollid'] == longpollid
+        assert_equal(template2['longpollid'], longpollid)
 
         self.log.info("Test that longpoll waits if we do nothing")
         thr = LongpollThread(self.nodes[0])
diff --git a/test/functional/p2p_addr_relay.py b/test/functional/p2p_addr_relay.py
index f89ac7013abb..65b21c0d5059 100755
--- a/test/functional/p2p_addr_relay.py
+++ b/test/functional/p2p_addr_relay.py
@@ -11,9 +11,12 @@
 
 from test_framework.messages import (
     CAddress,
+    CBlockHeader,
     msg_addr,
     msg_getaddr,
+    msg_headers,
     msg_verack,
+    from_hex,
 )
 from test_framework.p2p import (
     P2PInterface,
@@ -178,6 +181,9 @@ def relay_tests(self):
 
         self.log.info('Check relay of addresses received from outbound peers')
         inbound_peer = self.nodes[0].add_p2p_connection(AddrReceiver(test_addr_contents=True, send_getaddr=False))
+        # Send an empty ADDR message to initialize address relay on this connection.
+        inbound_peer.send_and_ping(msg_addr())
+
         full_outbound_peer = self.nodes[0].add_outbound_p2p_connection(AddrReceiver(), p2p_idx=0, connection_type="outbound-full-relay")
         msg = self.setup_addr_msg(2)
         self.send_addr_msg(full_outbound_peer, msg, [inbound_peer])
@@ -188,9 +194,6 @@ def relay_tests(self):
         # of the outbound peer which is often sent before the GETADDR response.
         assert_equal(inbound_peer.num_ipv4_received, 0)
 
-        # Send an empty ADDR message to initialize address relay on this connection.
-        inbound_peer.send_and_ping(msg_addr())
-
         self.log.info('Check that subsequent addr messages sent from an outbound peer are relayed')
         msg2 = self.setup_addr_msg(2)
         self.send_addr_msg(full_outbound_peer, msg2, [inbound_peer])
@@ -248,8 +251,9 @@ def inbound_blackhole_tests(self):
         blackhole_peer.send_and_ping(msg_addr())
 
         # Confirm node has now received addr-related messages from blackhole peer
-        assert_greater_than(self.sum_addr_messages(peerinfo[1]['bytesrecv_per_msg']), 0)
-        assert_equal(self.nodes[0].getpeerinfo()[2]['addr_relay_enabled'], True)
+        peerinfo = self.nodes[0].getpeerinfo()
+        assert_greater_than(self.sum_addr_messages(peerinfo[2]['bytesrecv_per_msg']), 0)
+        assert_equal(peerinfo[2]['addr_relay_enabled'], True)
 
         msg = self.setup_addr_msg(2)
         self.send_addr_msg(addr_source, msg, [receiver_peer, blackhole_peer])
@@ -272,14 +276,20 @@ def getaddr_tests(self):
         full_outbound_peer.sync_with_ping()
         assert full_outbound_peer.getaddr_received()
 
+        # to avoid the node evicting the outbound peer, protect it by announcing the most recent header to it
+        tip_header = from_hex(CBlockHeader(), self.nodes[0].getblockheader(self.nodes[0].getbestblockhash(), False))
+        full_outbound_peer.send_and_ping(msg_headers([tip_header]))
+
         self.log.info('Check that we do not send a getaddr message to a block-relay-only or inbound peer')
         block_relay_peer = self.nodes[0].add_outbound_p2p_connection(AddrReceiver(), p2p_idx=1, connection_type="block-relay-only")
         block_relay_peer.sync_with_ping()
         assert_equal(block_relay_peer.getaddr_received(), False)
+        block_relay_peer.send_and_ping(msg_headers([tip_header]))
 
         inbound_peer = self.nodes[0].add_p2p_connection(AddrReceiver(send_getaddr=False))
         inbound_peer.sync_with_ping()
         assert_equal(inbound_peer.getaddr_received(), False)
+        assert_equal(inbound_peer.addr_received(), False)
 
         self.log.info('Check that we answer getaddr messages only from inbound peers')
         # Add some addresses to addrman
@@ -392,8 +402,7 @@ def rate_limit_tests(self):
     def get_nodes_that_received_addr(self, peer, receiver_peer, addr_receivers,
                                      time_interval_1, time_interval_2):
 
-        # Clean addr response related to the initial getaddr. There is no way to avoid initial
-        # getaddr because the peer won't self-announce then.
+        # Clean addr response related to the initial getaddr.
         for addr_receiver in addr_receivers:
             addr_receiver.num_ipv4_received = 0
 
diff --git a/test/functional/p2p_addr_selfannouncement.py b/test/functional/p2p_addr_selfannouncement.py
index 8ab75aaa0684..631ecb4c00e2 100755
--- a/test/functional/p2p_addr_selfannouncement.py
+++ b/test/functional/p2p_addr_selfannouncement.py
@@ -78,14 +78,16 @@ def run_test(self):
         self.self_announcement_test(outbound=True, addrv2=False)
         self.self_announcement_test(outbound=True, addrv2=True)
 
-    def inbound_connection_open_assertions(self, addr_receiver):
+    @staticmethod
+    def inbound_connection_open_assertions(addr_receiver):
         # In response to a GETADDR, we expect a message with the self-announcement
         # and an addr message containing the GETADDR response.
         assert_equal(addr_receiver.self_announcements_received, 1)
         assert_equal(addr_receiver.addr_messages_received, 2)
         assert_greater_than(addr_receiver.addresses_received, 1)
 
-    def outbound_connection_open_assertions(self, addr_receiver):
+    @staticmethod
+    def outbound_connection_open_assertions(addr_receiver):
         # We expect only the self-announcement.
         assert_equal(addr_receiver.self_announcements_received, 1)
         assert_equal(addr_receiver.addr_messages_received, 1)
diff --git a/test/functional/p2p_addrfetch.py b/test/functional/p2p_addrfetch.py
index 49c131f10500..fd781f0a65f3 100755
--- a/test/functional/p2p_addrfetch.py
+++ b/test/functional/p2p_addrfetch.py
@@ -50,8 +50,8 @@ def run_test(self):
         self.log.info("Check that we send getaddr but don't try to sync headers with the addr-fetch peer")
         peer.sync_with_ping()
         with p2p_lock:
-            assert peer.message_count['getaddr'] == 1
-            assert peer.message_count['getheaders'] == 0
+            assert_equal(peer.message_count['getaddr'], 1)
+            assert_equal(peer.message_count['getheaders'], 0)
 
         self.log.info("Check that answering the getaddr with a single address does not lead to disconnect")
         # This prevents disconnecting on self-announcements
diff --git a/test/functional/p2p_blockfilters.py b/test/functional/p2p_blockfilters.py
index 32a3db7bfc59..375a794b08aa 100755
--- a/test/functional/p2p_blockfilters.py
+++ b/test/functional/p2p_blockfilters.py
@@ -71,11 +71,11 @@ def run_test(self):
 
         # Check that nodes have signalled NODE_COMPACT_FILTERS correctly.
         assert_not_equal(peer_0.nServices & NODE_COMPACT_FILTERS, 0)
-        assert peer_1.nServices & NODE_COMPACT_FILTERS == 0
+        assert_equal(peer_1.nServices & NODE_COMPACT_FILTERS, 0)
 
         # Check that the localservices is as expected.
         assert_not_equal(int(self.nodes[0].getnetworkinfo()['localservices'], 16) & NODE_COMPACT_FILTERS, 0)
-        assert int(self.nodes[1].getnetworkinfo()['localservices'], 16) & NODE_COMPACT_FILTERS == 0
+        assert_equal(int(self.nodes[1].getnetworkinfo()['localservices'], 16) & NODE_COMPACT_FILTERS, 0)
 
         self.log.info("get cfcheckpt on chain to be re-orged out.")
         request = msg_getcfcheckpt(
diff --git a/test/functional/p2p_compactblocks.py b/test/functional/p2p_compactblocks.py
index 48776e7d683f..ebc8396468f4 100755
--- a/test/functional/p2p_compactblocks.py
+++ b/test/functional/p2p_compactblocks.py
@@ -551,8 +551,7 @@ def test_incorrect_blocktxn_response(self, test_node):
 
         # We should receive a getdata request
         test_node.wait_for_getdata([block.hash_int], timeout=10)
-        assert test_node.last_message["getdata"].inv[0].type == MSG_BLOCK or \
-               test_node.last_message["getdata"].inv[0].type == MSG_BLOCK | MSG_WITNESS_FLAG
+        assert test_node.last_message["getdata"].inv[0].type in (MSG_BLOCK, MSG_BLOCK | MSG_WITNESS_FLAG)
 
         # Deliver the block
         test_node.send_and_ping(msg_block(block))
@@ -586,8 +585,7 @@ def test_multiple_blocktxn_response(self, test_node):
 
         # We should receive a getdata request
         test_node.wait_for_getdata([block.hash_int], timeout=10)
-        assert test_node.last_message["getdata"].inv[0].type == MSG_BLOCK or \
-               test_node.last_message["getdata"].inv[0].type == MSG_BLOCK | MSG_WITNESS_FLAG
+        assert test_node.last_message["getdata"].inv[0].type in (MSG_BLOCK, MSG_BLOCK | MSG_WITNESS_FLAG)
 
         # Send the same blocktxn and assert the sender gets disconnected.
         with node.assert_debug_log(['previous compact block reconstruction attempt failed']):
diff --git a/test/functional/p2p_disconnect_ban.py b/test/functional/p2p_disconnect_ban.py
index e7168b725468..f50d88d26dd1 100755
--- a/test/functional/p2p_disconnect_ban.py
+++ b/test/functional/p2p_disconnect_ban.py
@@ -132,18 +132,18 @@ def run_test(self):
         address1 = self.nodes[0].getpeerinfo()[0]['addr']
         self.nodes[0].disconnectnode(address=address1)
         self.wait_until(lambda: len(self.nodes[1].getpeerinfo()) == 1, timeout=10)
-        assert not [node for node in self.nodes[0].getpeerinfo() if node['addr'] == address1]
+        assert address1 not in [node['addr'] for node in self.nodes[0].getpeerinfo()]
 
         self.log.info("disconnectnode: successfully reconnect node")
         self.connect_nodes(0, 1)  # reconnect the node
         assert_equal(len(self.nodes[0].getpeerinfo()), 2)
-        assert [node for node in self.nodes[0].getpeerinfo() if node['addr'] == address1]
+        assert address1 in [node['addr'] for node in self.nodes[0].getpeerinfo()]
 
         self.log.info("disconnectnode: successfully disconnect node by node id")
         id1 = self.nodes[0].getpeerinfo()[0]['id']
         self.nodes[0].disconnectnode(nodeid=id1)
         self.wait_until(lambda: len(self.nodes[1].getpeerinfo()) == 1, timeout=10)
-        assert not [node for node in self.nodes[0].getpeerinfo() if node['id'] == id1]
+        assert id1 not in [node['id'] for node in self.nodes[0].getpeerinfo()]
 
 if __name__ == '__main__':
     DisconnectBanTest(__file__).main()
diff --git a/test/functional/p2p_handshake.py b/test/functional/p2p_handshake.py
index 774ab42980d0..b46c89caa06f 100755
--- a/test/functional/p2p_handshake.py
+++ b/test/functional/p2p_handshake.py
@@ -9,7 +9,7 @@
 import time
 
 from test_framework.test_framework import BitcoinTestFramework
-from test_framework.util import assert_not_equal
+from test_framework.util import assert_equal, assert_not_equal
 from test_framework.messages import (
     NODE_NETWORK,
     NODE_NETWORK_LIMITED,
@@ -63,7 +63,7 @@ def test_desirable_service_flags(self, node, service_flag_tests, desirable_servi
                 with node.assert_debug_log([expected_debug_log]):
                     self.add_outbound_connection(node, conn_type, services, wait_for_disconnect=True)
             else:
-                assert (services & desirable_service_flags) == desirable_service_flags
+                assert_equal((services & desirable_service_flags), desirable_service_flags)
                 self.add_outbound_connection(node, conn_type, services, wait_for_disconnect=False)
 
     def generate_at_mocktime(self, time):
diff --git a/test/functional/p2p_headers_sync_with_minchainwork.py b/test/functional/p2p_headers_sync_with_minchainwork.py
index e90dccd4d2d3..1dc38faadb2b 100755
--- a/test/functional/p2p_headers_sync_with_minchainwork.py
+++ b/test/functional/p2p_headers_sync_with_minchainwork.py
@@ -68,7 +68,7 @@ def test_chains_sync_when_long_enough(self):
 
         def check_node3_chaintips(num_tips, tip_hash, height):
             node3_chaintips = self.nodes[3].getchaintips()
-            assert len(node3_chaintips) == num_tips
+            assert_equal(len(node3_chaintips), num_tips)
             assert {
                 'height': height,
                 'hash': tip_hash,
@@ -80,7 +80,7 @@ def check_node3_chaintips(num_tips, tip_hash, height):
 
         for node in self.nodes[1:3]:
             chaintips = node.getchaintips()
-            assert len(chaintips) == 1
+            assert_equal(len(chaintips), 1)
             assert {
                 'height': 0,
                 'hash': '0f9188f13cb7b2c71f2a335e3a4fc328bf5beb436012afca590b1a11466e2206',
@@ -103,7 +103,7 @@ def check_node3_chaintips(num_tips, tip_hash, height):
             'status': 'active',
         } in self.nodes[2].getchaintips()
 
-        assert len(self.nodes[2].getchaintips()) == 1
+        assert_equal(len(self.nodes[2].getchaintips()), 1)
 
         self.log.info("Check that node3 accepted these headers as well")
         check_node3_chaintips(2, self.nodes[0].getbestblockhash(), NODE1_BLOCKS_REQUIRED)
diff --git a/test/functional/p2p_invalid_messages.py b/test/functional/p2p_invalid_messages.py
index ec0859f51b09..8521d673c92a 100755
--- a/test/functional/p2p_invalid_messages.py
+++ b/test/functional/p2p_invalid_messages.py
@@ -331,7 +331,7 @@ def test_resource_exhaustion(self):
         conn = self.nodes[0].add_p2p_connection(P2PDataStore(), supports_v2_p2p=False)
         conn2 = self.nodes[0].add_p2p_connection(P2PDataStore(), supports_v2_p2p=False)
         msg_at_size = msg_unrecognized(str_data="b" * VALID_DATA_LIMIT)
-        assert len(msg_at_size.serialize()) == MAX_PROTOCOL_MESSAGE_LENGTH
+        assert_equal(len(msg_at_size.serialize()), MAX_PROTOCOL_MESSAGE_LENGTH)
 
         self.log.info("(a) Send 80 messages, each of maximum valid data size (4MB)")
         for _ in range(80):
diff --git a/test/functional/p2p_node_network_limited.py b/test/functional/p2p_node_network_limited.py
index 8140823f58a0..8e1062cde2e7 100755
--- a/test/functional/p2p_node_network_limited.py
+++ b/test/functional/p2p_node_network_limited.py
@@ -28,15 +28,9 @@
 NODE_NETWORK_LIMITED_MIN_BLOCKS = 288
 
 class P2PIgnoreInv(P2PInterface):
-    firstAddrnServices = 0
     def on_inv(self, message):
         # The node will send us invs for other blocks. Ignore them.
         pass
-    def on_addr(self, message):
-        self.firstAddrnServices = message.addrs[0].nServices
-    def wait_for_addr(self, timeout=5):
-        test_function = lambda: self.last_message.get("addr")
-        self.wait_until(test_function, timeout=timeout)
     def send_getdata_for_block(self, blockhash):
         getdata_request = msg_getdata()
         getdata_request.inv.append(CInv(MSG_BLOCK, int(blockhash, 16)))
diff --git a/test/functional/p2p_private_broadcast.py b/test/functional/p2p_private_broadcast.py
index 77bf0e952e92..1b4c393cfba0 100755
--- a/test/functional/p2p_private_broadcast.py
+++ b/test/functional/p2p_private_broadcast.py
@@ -499,7 +499,7 @@ def set_tx_returner_and_other():
         self.log.info("Checking abortprivatebroadcast removes a pending private-broadcast transaction")
         tx_abort = wallet.create_self_transfer()
         tx_originator.sendrawtransaction(hexstring=tx_abort["hex"], maxfeerate=0.1)
-        assert any(t["wtxid"] == tx_abort["wtxid"] for t in tx_originator.getprivatebroadcastinfo()["transactions"])
+        assert tx_abort["wtxid"] in [t["wtxid"] for t in tx_originator.getprivatebroadcastinfo()["transactions"]]
         abort_res = tx_originator.abortprivatebroadcast(tx_abort["txid"])
         assert_equal(len(abort_res["removed_transactions"]), 1)
         assert_equal(abort_res["removed_transactions"][0]["txid"], tx_abort["txid"])
diff --git a/test/functional/p2p_segwit.py b/test/functional/p2p_segwit.py
index 17f8085b44f0..29e9fc3274e9 100755
--- a/test/functional/p2p_segwit.py
+++ b/test/functional/p2p_segwit.py
@@ -374,14 +374,14 @@ def test_block_relay(self):
         self.test_node.send_without_ping(msg_headers())
 
         self.test_node.announce_block_and_wait_for_getdata(block1, use_header=False)
-        assert self.test_node.last_message["getdata"].inv[0].type == blocktype
+        assert_equal(self.test_node.last_message["getdata"].inv[0].type, blocktype)
         test_witness_block(self.nodes[0], self.test_node, block1, True)
 
         block2 = self.build_next_block()
         block2.solve()
 
         self.test_node.announce_block_and_wait_for_getdata(block2, use_header=True)
-        assert self.test_node.last_message["getdata"].inv[0].type == blocktype
+        assert_equal(self.test_node.last_message["getdata"].inv[0].type, blocktype)
         test_witness_block(self.nodes[0], self.test_node, block2, True)
 
         # Check that we can getdata for witness blocks or regular blocks,
@@ -410,8 +410,8 @@ def test_block_relay(self):
             block = self.build_next_block()
             self.update_witness_block_with_transactions(block, [])
             # This gives us a witness commitment.
-            assert len(block.vtx[0].wit.vtxinwit) == 1
-            assert len(block.vtx[0].wit.vtxinwit[0].scriptWitness.stack) == 1
+            assert_equal(len(block.vtx[0].wit.vtxinwit), 1)
+            assert_equal(len(block.vtx[0].wit.vtxinwit[0].scriptWitness.stack), 1)
             test_witness_block(self.nodes[0], self.test_node, block, accepted=True)
             # Now try to retrieve it...
             rpc_block = self.nodes[0].getblock(block.hash_hex, False)
@@ -529,7 +529,7 @@ def test_witness_tx_relay_before_segwit_activation(self):
         # Verify that if a peer doesn't set nServices to include NODE_WITNESS,
         # the getdata is just for the non-witness portion.
         self.old_node.announce_tx_and_wait_for_getdata(tx)
-        assert self.old_node.last_message["getdata"].inv[0].type == MSG_TX
+        assert_equal(self.old_node.last_message["getdata"].inv[0].type, MSG_TX)
 
         # Since we haven't delivered the tx yet, inv'ing the same tx from
         # a witness transaction ought not result in a getdata.
@@ -790,7 +790,7 @@ def test_witness_commitments(self):
         block_3.vtx[0].vout[0].nValue -= 1
         block_3.vtx[0].vout[-1].nValue += 1
         block_3.hashMerkleRoot = block_3.calc_merkle_root()
-        assert len(block_3.vtx[0].vout) == 4  # 3 OP_returns
+        assert_equal(len(block_3.vtx[0].vout), 4)  # 3 OP_returns
         block_3.solve()
         test_witness_block(self.nodes[0], self.test_node, block_3, accepted=True)
 
@@ -831,7 +831,7 @@ def test_block_malleability(self):
         assert block.get_weight() < MAX_BLOCK_WEIGHT
         assert_equal(None, self.nodes[0].submitblock(block.serialize().hex()))
 
-        assert self.nodes[0].getbestblockhash() == block.hash_hex
+        assert_equal(self.nodes[0].getbestblockhash(), block.hash_hex)
 
         # Build a relayable-but-invalid block
         relayable_block = self.build_next_block()
@@ -943,7 +943,7 @@ def test_witness_block_size(self):
         block.vtx[0].vout.pop()
         add_witness_commitment(block)
         block.solve()
-        assert block.get_weight() == MAX_BLOCK_WEIGHT
+        assert_equal(block.get_weight(), MAX_BLOCK_WEIGHT)
 
         test_witness_block(self.nodes[0], self.test_node, block, accepted=True)
 
@@ -1101,7 +1101,7 @@ def test_max_witness_script_length(self):
 
         # This script is 19 max pushes (9937 bytes), then 64 more opcode-bytes.
         long_witness_script = CScript([b'a' * MAX_SCRIPT_ELEMENT_SIZE] * 19 + [OP_DROP] * 63 + [OP_TRUE])
-        assert len(long_witness_script) == MAX_WITNESS_SCRIPT_LENGTH + 1
+        assert_equal(len(long_witness_script), MAX_WITNESS_SCRIPT_LENGTH + 1)
         long_script_pubkey = script_to_p2wsh_script(long_witness_script)
 
         block = self.build_next_block()
@@ -1123,7 +1123,7 @@ def test_max_witness_script_length(self):
 
         # Try again with one less byte in the witness script
         witness_script = CScript([b'a' * MAX_SCRIPT_ELEMENT_SIZE] * 19 + [OP_DROP] * 62 + [OP_TRUE])
-        assert len(witness_script) == MAX_WITNESS_SCRIPT_LENGTH
+        assert_equal(len(witness_script), MAX_WITNESS_SCRIPT_LENGTH)
         script_pubkey = script_to_p2wsh_script(witness_script)
 
         tx.vout[0] = CTxOut(tx.vout[0].nValue, script_pubkey)
@@ -1358,7 +1358,7 @@ def test_segwit_versions(self):
             temp_utxo.append(UTXO(tx.txid_int, 0, tx.vout[0].nValue))
 
         self.generate(self.nodes[0], 1)  # Mine all the transactions
-        assert len(self.nodes[0].getrawmempool()) == 0
+        assert_equal(len(self.nodes[0].getrawmempool()), 0)
 
         # Finally, verify that version 0 -> version 2 transactions
         # are standard
diff --git a/test/functional/p2p_tx_download.py b/test/functional/p2p_tx_download.py
index f1a42f5a7dac..a46b6a6b8334 100755
--- a/test/functional/p2p_tx_download.py
+++ b/test/functional/p2p_tx_download.py
@@ -123,7 +123,7 @@ def test_inv_block(self):
         #   peer, plus
         # * the first time it is re-requested from the outbound peer, plus
         # * 2 seconds to avoid races
-        assert self.nodes[1].getpeerinfo()[0]['inbound'] == False
+        assert_equal(self.nodes[1].getpeerinfo()[0]['inbound'], False)
         timeout = 2 + NONPREF_PEER_TX_DELAY + GETDATA_TX_INTERVAL
         self.log.info("Tx should be received at node 1 after {} seconds".format(timeout))
         self.nodes[0].bumpmocktime(timeout)
diff --git a/test/functional/rpc_blockchain.py b/test/functional/rpc_blockchain.py
index cecd0c03facd..9ea8e732b510 100755
--- a/test/functional/rpc_blockchain.py
+++ b/test/functional/rpc_blockchain.py
@@ -170,6 +170,9 @@ def _test_getblockchaininfo(self):
         assert res['pruned']
         assert not res['automatic_pruning']
 
+        # check background validation is not present when we are not using assumeutxo
+        assert "backgroundvalidation" not in res.keys()
+
         self.restart_node(0, ['-stopatheight=207'])
         res = self.nodes[0].getblockchaininfo()
         # should have exact keys
@@ -241,19 +244,6 @@ def check_signalling_deploymentinfo_result(self, gdi_result, height, blockhash,
                 },
                 'active': False
             },
-            'taproot': {
-                'type': 'bip9',
-                'bip9': {
-                    'start_time': -1,
-                    'timeout': 9223372036854775807,
-                    'min_activation_height': 0,
-                    'status': 'active',
-                    'status_next': 'active',
-                    'since': 0,
-                },
-                'height': 0,
-                'active': True
-            }
           }
         })
 
diff --git a/test/functional/rpc_createmultisig.py b/test/functional/rpc_createmultisig.py
index 74b9debf8869..199e9c44fe9f 100755
--- a/test/functional/rpc_createmultisig.py
+++ b/test/functional/rpc_createmultisig.py
@@ -103,7 +103,7 @@ def do_multisig(self, nkeys, nsigs, output_type):
         mredeem = msig["redeemScript"]
         assert_equal(desc, msig['descriptor'])
         if output_type == 'bech32':
-            assert madd[0:4] == "bcrt"  # actually a bech32 address
+            assert_equal(madd[0:4], "bcrt")  # actually a bech32 address
 
         spk = address_to_scriptpubkey(madd)
         value = decimal.Decimal("0.00004000")
diff --git a/test/functional/rpc_decodescript.py b/test/functional/rpc_decodescript.py
index d23b9edfd244..2ab73444252e 100755
--- a/test/functional/rpc_decodescript.py
+++ b/test/functional/rpc_decodescript.py
@@ -278,10 +278,10 @@ def decodescript_miniscript(self):
         # Sourced from https://github.com/bitcoin/bitcoin/pull/27037#issuecomment-1416151907.
         # Miniscript-compatible offered HTLC
         res = self.nodes[0].decodescript("82012088a914ffffffffffffffffffffffffffffffffffffffff88210250929b74c1a04954b78b4b6035e97a5e078a5a0f28ec96d547bfee9ace803ac0ad51b2")
-        assert res["segwit"]["desc"] == "wsh(and_v(and_v(v:hash160(ffffffffffffffffffffffffffffffffffffffff),v:pk(0250929b74c1a04954b78b4b6035e97a5e078a5a0f28ec96d547bfee9ace803ac0)),older(1)))#gm8xz4fl"
+        assert_equal(res["segwit"]["desc"], "wsh(and_v(and_v(v:hash160(ffffffffffffffffffffffffffffffffffffffff),v:pk(0250929b74c1a04954b78b4b6035e97a5e078a5a0f28ec96d547bfee9ace803ac0)),older(1)))#gm8xz4fl")
         # Miniscript-incompatible offered HTLC
         res = self.nodes[0].decodescript("82012088a914ffffffffffffffffffffffffffffffffffffffff882102ffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffacb2")
-        assert res["segwit"]["desc"] == "addr(bcrt1q73qyfypp47hvgnkjqnav0j3k2lq3v76wg22dk8tmwuz5sfgv66xsvxg6uu)#9p3q328s"
+        assert_equal(res["segwit"]["desc"], "addr(bcrt1q73qyfypp47hvgnkjqnav0j3k2lq3v76wg22dk8tmwuz5sfgv66xsvxg6uu)#9p3q328s")
         # Miniscript-compatible multisig bigger than 520 byte P2SH limit.
         res = self.nodes[0].decodescript("5b21020e0338c96a8870479f2396c373cc7696ba124e8635d41b0ea581112b678172612102675333a4e4b8fb51d9d4e22fa5a8eaced3fdac8a8cbf9be8c030f75712e6af992102896807d54bc55c24981f24a453c60ad3e8993d693732288068a23df3d9f50d4821029e51a5ef5db3137051de8323b001749932f2ff0d34c82e96a2c2461de96ae56c2102a4e1a9638d46923272c266631d94d36bdb03a64ee0e14c7518e49d2f29bc401021031c41fdbcebe17bec8d49816e00ca1b5ac34766b91c9f2ac37d39c63e5e008afb2103079e252e85abffd3c401a69b087e590a9b86f33f574f08129ccbd3521ecf516b2103111cf405b627e22135b3b3733a4a34aa5723fb0f58379a16d32861bf576b0ec2210318f331b3e5d38156da6633b31929c5b220349859cc9ca3d33fb4e68aa08401742103230dae6b4ac93480aeab26d000841298e3b8f6157028e47b0897c1e025165de121035abff4281ff00660f99ab27bb53e6b33689c2cd8dcd364bc3c90ca5aea0d71a62103bd45cddfacf2083b14310ae4a84e25de61e451637346325222747b157446614c2103cc297026b06c71cbfa52089149157b5ff23de027ac5ab781800a578192d175462103d3bde5d63bdb3a6379b461be64dad45eabff42f758543a9645afd42f6d4248282103ed1e8d5109c9ed66f7941bc53cc71137baa76d50d274bda8d5e8ffbd6e61fe9a5fae736402c00fb269522103aab896d53a8e7d6433137bbba940f9c521e085dd07e60994579b64a6d992cf79210291b7d0b1b692f8f524516ed950872e5da10fb1b808b5a526dedc6fed1cf29807210386aa9372fbab374593466bc5451dc59954e90787f08060964d95c87ef34ca5bb53ae68")
         assert_equal(res["segwit"]["desc"], "wsh(or_d(multi(11,020e0338c96a8870479f2396c373cc7696ba124e8635d41b0ea581112b67817261,02675333a4e4b8fb51d9d4e22fa5a8eaced3fdac8a8cbf9be8c030f75712e6af99,02896807d54bc55c24981f24a453c60ad3e8993d693732288068a23df3d9f50d48,029e51a5ef5db3137051de8323b001749932f2ff0d34c82e96a2c2461de96ae56c,02a4e1a9638d46923272c266631d94d36bdb03a64ee0e14c7518e49d2f29bc4010,031c41fdbcebe17bec8d49816e00ca1b5ac34766b91c9f2ac37d39c63e5e008afb,03079e252e85abffd3c401a69b087e590a9b86f33f574f08129ccbd3521ecf516b,03111cf405b627e22135b3b3733a4a34aa5723fb0f58379a16d32861bf576b0ec2,0318f331b3e5d38156da6633b31929c5b220349859cc9ca3d33fb4e68aa0840174,03230dae6b4ac93480aeab26d000841298e3b8f6157028e47b0897c1e025165de1,035abff4281ff00660f99ab27bb53e6b33689c2cd8dcd364bc3c90ca5aea0d71a6,03bd45cddfacf2083b14310ae4a84e25de61e451637346325222747b157446614c,03cc297026b06c71cbfa52089149157b5ff23de027ac5ab781800a578192d17546,03d3bde5d63bdb3a6379b461be64dad45eabff42f758543a9645afd42f6d424828,03ed1e8d5109c9ed66f7941bc53cc71137baa76d50d274bda8d5e8ffbd6e61fe9a),and_v(v:older(4032),multi(2,03aab896d53a8e7d6433137bbba940f9c521e085dd07e60994579b64a6d992cf79,0291b7d0b1b692f8f524516ed950872e5da10fb1b808b5a526dedc6fed1cf29807,0386aa9372fbab374593466bc5451dc59954e90787f08060964d95c87ef34ca5bb))))#7jwwklk4")
diff --git a/test/functional/rpc_getdescriptoractivity.py b/test/functional/rpc_getdescriptoractivity.py
index a1d5add13889..49db18ee9011 100755
--- a/test/functional/rpc_getdescriptoractivity.py
+++ b/test/functional/rpc_getdescriptoractivity.py
@@ -111,11 +111,11 @@ def test_multiple_addresses(self, node, wallet):
         [a1] = [a for a in result['activity'] if a['output_spk']['address'] == addr_1]
         [a2] = [a for a in result['activity'] if a['output_spk']['address'] == addr_2]
 
-        assert a1['blockhash'] == blockhash
-        assert a1['amount'] == 1.0
+        assert_equal(a1['blockhash'], blockhash)
+        assert_equal(a1['amount'], 1.0)
 
-        assert a2['blockhash'] == blockhash
-        assert a2['amount'] == 2.0
+        assert_equal(a2['blockhash'], blockhash)
+        assert_equal(a2['amount'], 2.0)
 
     def test_invalid_blockhash(self, node, wallet):
         self.log.info("Test that passing an invalid blockhash raises appropriate RPC error")
@@ -159,14 +159,14 @@ def test_confirmed_and_unconfirmed(self, node, wallet):
         assert_equal(len(activity), 2)
 
         [confirmed] = [a for a in activity if a.get('blockhash') == blockhash]
-        assert confirmed['txid'] == txid_1
-        assert confirmed['height'] == node.getblockchaininfo()['blocks']
+        assert_equal(confirmed['txid'], txid_1)
+        assert_equal(confirmed['height'], node.getblockchaininfo()['blocks'])
 
         [unconfirmed] = [a for a in activity if not a.get('blockhash')]
         assert 'blockhash' not in unconfirmed
         assert 'height' not in unconfirmed
 
-        assert any(a['txid'] == txid_2 for a in activity if not a.get('blockhash'))
+        assert txid_2 in [a['txid'] for a in activity if not a.get('blockhash')]
 
     def test_receive_then_spend(self, node, wallet):
         """Also important because this tests multiple blockhashes."""
@@ -185,15 +185,15 @@ def test_receive_then_spend(self, node, wallet):
 
         assert_equal(len(result['activity']), 4)
 
-        assert result['activity'][1]['type'] == 'receive'
-        assert result['activity'][1]['txid'] == sent1['txid']
-        assert result['activity'][1]['blockhash'] == blockhash_1
+        assert_equal(result['activity'][1]['type'], 'receive')
+        assert_equal(result['activity'][1]['txid'], sent1['txid'])
+        assert_equal(result['activity'][1]['blockhash'], blockhash_1)
 
-        assert result['activity'][2]['type'] == 'spend'
-        assert result['activity'][2]['spend_txid'] == sent2['txid']
-        assert result['activity'][2]['spend_vin'] == 0
-        assert result['activity'][2]['prevout_txid'] == sent1['txid']
-        assert result['activity'][2]['blockhash'] == blockhash_2
+        assert_equal(result['activity'][2]['type'], 'spend')
+        assert_equal(result['activity'][2]['spend_txid'], sent2['txid'])
+        assert_equal(result['activity'][2]['spend_vin'], 0)
+        assert_equal(result['activity'][2]['prevout_txid'], sent1['txid'])
+        assert_equal(result['activity'][2]['blockhash'], blockhash_2)
 
         # Test that reversing the blockorder yields the same result.
         assert_equal(result, node.getdescriptoractivity(
@@ -221,17 +221,17 @@ def test_no_address(self, node, wallet):
         a1 = result['activity'][0]
         a2 = result['activity'][1]
 
-        assert a1['type'] == "spend"
-        assert a1['blockhash'] == blockhash
+        assert_equal(a1['type'], "spend")
+        assert_equal(a1['blockhash'], blockhash)
         # sPK lacks address.
         assert_equal(list(a1['prevout_spk'].keys()), ['asm', 'desc', 'hex', 'type'])
-        assert a1['amount'] == no_addr_tx["fee"] + Decimal(no_addr_tx["tx"].vout[0].nValue) / COIN
+        assert_equal(a1['amount'], no_addr_tx["fee"] + Decimal(no_addr_tx["tx"].vout[0].nValue) / COIN)
 
-        assert a2['type'] == "receive"
-        assert a2['blockhash'] == blockhash
+        assert_equal(a2['type'], "receive")
+        assert_equal(a2['blockhash'], blockhash)
         # sPK lacks address.
         assert_equal(list(a2['output_spk'].keys()), ['asm', 'desc', 'hex', 'type'])
-        assert a2['amount'] == Decimal(no_addr_tx["tx"].vout[0].nValue) / COIN
+        assert_equal(a2['amount'], Decimal(no_addr_tx["tx"].vout[0].nValue) / COIN)
 
     def test_required_args(self, node):
         self.log.info("Test that required arguments must be passed")
diff --git a/test/functional/rpc_help.py b/test/functional/rpc_help.py
index f8265c321517..d76a6fa6af52 100755
--- a/test/functional/rpc_help.py
+++ b/test/functional/rpc_help.py
@@ -13,8 +13,8 @@
 
 
 def parse_string(s):
-    assert s[0] == '"'
-    assert s[-1] == '"'
+    assert_equal(s[0], '"')
+    assert_equal(s[-1], '"')
     return s[1:-1]
 
 def process_mapping(fname):
diff --git a/test/functional/rpc_net.py b/test/functional/rpc_net.py
index 30e0d536e42d..405d21fc1ad4 100755
--- a/test/functional/rpc_net.py
+++ b/test/functional/rpc_net.py
@@ -38,7 +38,7 @@ def assert_net_servicesnames(servicesflag, servicenames):
     servicesflag_generated = 0
     for servicename in servicenames:
         servicesflag_generated |= getattr(test_framework.messages, 'NODE_' + servicename)
-    assert servicesflag_generated == servicesflag
+    assert_equal(servicesflag_generated, servicesflag)
 
 
 def seed_addrman(node):
@@ -63,7 +63,7 @@ class NetTest(BitcoinTestFramework):
     def set_test_params(self):
         self.num_nodes = 2
         self.extra_args = [
-            ["-minrelaytxfee=0.00001000", "-deprecatedrpc=startingheight"],
+            ["-minrelaytxfee=0.00001000"],
             ["-minrelaytxfee=0.00000500"],
         ]
         # Specify a non-working proxy to make sure no actual connections to public IPs are attempted
@@ -174,7 +174,6 @@ def test_getpeerinfo(self):
                 "services": "0000000000000000",
                 "servicesnames": [],
                 "session_id": "" if not self.options.v2transport else no_version_peer.v2_state.peer['session_id'].hex(),
-                "startingheight": -1,
                 "subver": "",
                 "synced_blocks": -1,
                 "synced_headers": -1,
@@ -501,7 +500,7 @@ def check_getrawaddrman_entries(expected):
                 for bucket_position in getrawaddrman[table_name].keys():
                     entry = getrawaddrman[table_name][bucket_position]
                     expected_entry = list(filter(lambda e: e["address"] == entry["address"], table_info))[0]
-                    assert bucket_position == expected_entry["bucket_position"]
+                    assert_equal(bucket_position, expected_entry["bucket_position"])
                     check_addr_information(entry, expected_entry)
 
         # we expect 4 new and 4 tried table entries in the addrman which were added using seed_addrman()
diff --git a/test/functional/rpc_psbt.py b/test/functional/rpc_psbt.py
index cc443f6a7cf3..6b1bc414a9f1 100755
--- a/test/functional/rpc_psbt.py
+++ b/test/functional/rpc_psbt.py
@@ -96,7 +96,7 @@ def test_psbt_incomplete_after_invalid_modification(self):
 
         # Check that the walletprocesspsbt call succeeds but also recognizes that the transaction is not complete
         signed_psbt_incomplete = wallet.walletprocesspsbt(psbt=signed_psbt_obj.to_base64(), finalize=False)
-        assert signed_psbt_incomplete["complete"] is False
+        assert_equal(signed_psbt_incomplete["complete"], False)
 
     def test_utxo_conversion(self):
         self.log.info("Check that non-witness UTXOs are removed for segwit v1+ inputs")
@@ -490,7 +490,7 @@ def run_test(self):
         finalized_psbt = processed_finalized_psbt['psbt']
         finalized_psbt_hex = processed_finalized_psbt['hex']
         assert_not_equal(signed_psbt, finalized_psbt)
-        assert finalized_psbt_hex == finalized_hex
+        assert_equal(finalized_psbt_hex, finalized_hex)
 
         # Manually selected inputs can be locked:
         assert_equal(len(self.nodes[0].listlockunspent()), 0)
@@ -918,7 +918,10 @@ def test_psbt_input_keys(psbt_input, keys):
         assert "final_scriptwitness" in psbt2_decoded['inputs'][0] and "final_scriptSig" in psbt2_decoded['inputs'][0]
         joined = self.nodes[0].joinpsbts([psbt, psbt2])
         joined_decoded = self.nodes[0].decodepsbt(joined)
-        assert len(joined_decoded['inputs']) == 4 and len(joined_decoded['outputs']) == 2 and "final_scriptwitness" not in joined_decoded['inputs'][3] and "final_scriptSig" not in joined_decoded['inputs'][3]
+        assert_equal(len(joined_decoded['inputs']), 4)
+        assert_equal(len(joined_decoded['outputs']), 2)
+        assert "final_scriptwitness" not in joined_decoded['inputs'][3]
+        assert "final_scriptSig" not in joined_decoded['inputs'][3]
 
         # Check that joining shuffles the inputs and outputs
         # 10 attempts should be enough to get a shuffled join
@@ -937,20 +940,31 @@ def test_psbt_input_keys(psbt_input, keys):
         self.generate(self.nodes[0], 6)[0]
         psbt = self.nodes[1].createpsbt([utxo], {self.nodes[0].getnewaddress("", "p2sh-segwit"):Decimal('6.999')})
         analyzed = self.nodes[0].analyzepsbt(psbt)
-        assert not analyzed['inputs'][0]['has_utxo'] and not analyzed['inputs'][0]['is_final'] and analyzed['inputs'][0]['next'] == 'updater' and analyzed['next'] == 'updater'
+        assert_equal(analyzed['inputs'][0]['has_utxo'], False)
+        assert_equal(analyzed['inputs'][0]['is_final'], False)
+        assert_equal(analyzed['inputs'][0]['next'], 'updater')
+        assert_equal(analyzed['next'], 'updater')
 
         # After update with wallet, only needs signing
         updated = self.nodes[1].walletprocesspsbt(psbt, False, 'ALL', True)['psbt']
         analyzed = self.nodes[0].analyzepsbt(updated)
-        assert analyzed['inputs'][0]['has_utxo'] and not analyzed['inputs'][0]['is_final'] and analyzed['inputs'][0]['next'] == 'signer' and analyzed['next'] == 'signer' and analyzed['inputs'][0]['missing']['signatures'][0] == addrinfo['embedded']['witness_program']
+        assert_equal(analyzed['inputs'][0]['has_utxo'], True)
+        assert_equal(analyzed['inputs'][0]['is_final'], False)
+        assert_equal(analyzed['inputs'][0]['next'], 'signer')
+        assert_equal(analyzed['next'], 'signer')
+        assert_equal(analyzed['inputs'][0]['missing']['signatures'][0], addrinfo['embedded']['witness_program'])
 
         # Check fee and size things
-        assert analyzed['fee'] == Decimal('0.001') and analyzed['estimated_vsize'] == 134 and analyzed['estimated_feerate'] == Decimal('0.00746268')
+        assert_equal(analyzed['fee'], Decimal('0.001'))
+        assert_equal(analyzed['estimated_vsize'], 134)
+        assert_equal(analyzed['estimated_feerate'], Decimal('0.00746268'))
 
         # After signing and finalizing, needs extracting
         signed = self.nodes[1].walletprocesspsbt(updated)['psbt']
         analyzed = self.nodes[0].analyzepsbt(signed)
-        assert analyzed['inputs'][0]['has_utxo'] and analyzed['inputs'][0]['is_final'] and analyzed['next'] == 'extractor'
+        assert_equal(analyzed['inputs'][0]['has_utxo'], True)
+        assert_equal(analyzed['inputs'][0]['is_final'], True)
+        assert_equal(analyzed['next'], 'extractor')
 
         self.log.info("PSBT spending unspendable outputs should have error message and Creator as next")
         analysis = self.nodes[0].analyzepsbt('cHNidP8BAJoCAAAAAljoeiG1ba8MI76OcHBFbDNvfLqlyHV5JPVFiHuyq911AAAAAAD/////g40EJ9DsZQpoqka7CwmK6kQiwHGyyng1Kgd5WdB86h0BAAAAAP////8CcKrwCAAAAAAWAEHYXCtx0AYLCcmIauuBXlCZHdoSTQDh9QUAAAAAFv8/wADXYP/7//////8JxOh0LR2HAI8AAAAAAAEBIADC6wsAAAAAF2oUt/X69ELjeX2nTof+fZ10l+OyAokDAQcJAwEHEAABAACAAAEBIADC6wsAAAAAF2oUt/X69ELjeX2nTof+fZ10l+OyAokDAQcJAwEHENkMak8AAAAA')
@@ -984,7 +998,7 @@ def test_psbt_input_keys(psbt_input, keys):
         # Make a weird but signable script. sh(wsh(pkh())) descriptor accomplishes this
         desc = descsum_create("sh(wsh(pkh({})))".format(privkey))
         res = self.nodes[0].importdescriptors([{"desc": desc, "timestamp": "now"}])
-        assert res[0]["success"]
+        assert_equal(res[0]["success"], True)
         addr = self.nodes[0].deriveaddresses(desc)[0]
         addr_info = self.nodes[0].getaddressinfo(addr)
 
@@ -999,15 +1013,15 @@ def test_psbt_input_keys(psbt_input, keys):
         # But funding should work when the solving data is provided
         psbt = wallet.walletcreatefundedpsbt([ext_utxo], {self.nodes[0].getnewaddress(): 15}, 0, {"add_inputs": True, "solving_data": {"pubkeys": [addr_info['pubkey']], "scripts": [addr_info["embedded"]["scriptPubKey"], addr_info["embedded"]["embedded"]["scriptPubKey"]]}})
         signed = wallet.walletprocesspsbt(psbt['psbt'])
-        assert not signed['complete']
+        assert_equal(signed['complete'], False)
         signed = self.nodes[0].walletprocesspsbt(signed['psbt'])
-        assert signed['complete']
+        assert_equal(signed['complete'], True)
 
         psbt = wallet.walletcreatefundedpsbt([ext_utxo], {self.nodes[0].getnewaddress(): 15}, 0, {"add_inputs": True, "solving_data":{"descriptors": [desc]}})
         signed = wallet.walletprocesspsbt(psbt['psbt'])
-        assert not signed['complete']
+        assert_equal(signed['complete'], False)
         signed = self.nodes[0].walletprocesspsbt(signed['psbt'])
-        assert signed['complete']
+        assert_equal(signed['complete'], True)
         final = signed['hex']
 
         dec = self.nodes[0].decodepsbt(signed["psbt"])
@@ -1041,7 +1055,7 @@ def test_psbt_input_keys(psbt_input, keys):
         signed = wallet.walletprocesspsbt(psbt["psbt"])
         signed = self.nodes[0].walletprocesspsbt(signed["psbt"])
         final = signed["hex"]
-        assert self.nodes[0].testmempoolaccept([final])[0]["allowed"]
+        assert_equal(self.nodes[0].testmempoolaccept([final])[0]["allowed"], True)
         # Reducing the weight should have a lower fee
         psbt2 = wallet.walletcreatefundedpsbt(
             inputs=[{"txid": ext_utxo["txid"], "vout": ext_utxo["vout"], "weight": low_input_weight}],
@@ -1066,7 +1080,7 @@ def test_psbt_input_keys(psbt_input, keys):
 
         # Import the external utxo descriptor so that we can sign for it from the test wallet
         res = wallet.importdescriptors([{"desc": desc, "timestamp": "now"}])
-        assert res[0]["success"]
+        assert_equal(res[0]["success"], True)
         # The provided weight should override the calculated weight for a wallet input
         psbt3 = wallet.walletcreatefundedpsbt(
             inputs=[{"txid": ext_utxo["txid"], "vout": ext_utxo["vout"], "weight": high_input_weight}],
@@ -1083,7 +1097,7 @@ def test_psbt_input_keys(psbt_input, keys):
 
         desc = descsum_create("wsh(pkh({}))".format(pubkey.hex()))
         res = watchonly.importdescriptors([{"desc": desc, "timestamp": "now"}])
-        assert res[0]["success"]
+        assert_equal(res[0]["success"], True)
         addr = self.nodes[0].deriveaddresses(desc)[0]
         self.nodes[0].sendtoaddress(addr, 10)
         self.generate(self.nodes[0], 1)
@@ -1098,7 +1112,7 @@ def test_psbt_input_keys(psbt_input, keys):
 
         desc = descsum_create("tr({},pk({}))".format(H_POINT, pubkey.hex()))
         res = watchonly.importdescriptors([{"desc": desc, "timestamp": "now"}])
-        assert res[0]["success"]
+        assert_equal(res[0]["success"], True)
         addr = self.nodes[0].deriveaddresses(desc)[0]
         self.nodes[0].sendtoaddress(addr, 10)
         self.generate(self.nodes[0], 1)
diff --git a/test/functional/test_framework/address.py b/test/functional/test_framework/address.py
index 2af5cf51d169..d4aa26e58a34 100644
--- a/test/functional/test_framework/address.py
+++ b/test/functional/test_framework/address.py
@@ -8,7 +8,6 @@
 - bech32 segwit v0 P2WPKH and P2WSH addresses.
 - bech32m segwit v1 P2TR addresses."""
 
-import enum
 import unittest
 
 from .script import (
@@ -37,13 +36,6 @@
 # Coins sent to this address can be spent with a witness stack of just OP_TRUE
 ADDRESS_BCRT1_P2WSH_OP_TRUE = 'bcrt1qft5p2uhsdcdc3l2ua4ap5qqfg4pjaqlp250x7us7a8qqhrxrxfsqseac85'
 
-
-class AddressType(enum.Enum):
-    bech32 = 'bech32'
-    p2sh_segwit = 'p2sh-segwit'
-    legacy = 'legacy'  # P2PKH
-
-
 b58chars = '123456789ABCDEFGHJKLMNPQRSTUVWXYZabcdefghijkmnopqrstuvwxyz'
 
 
@@ -108,12 +100,12 @@ def base58_to_byte(s):
 
 
 def keyhash_to_p2pkh(hash, main=False):
-    assert len(hash) == 20
+    assert_equal(len(hash), 20)
     version = 0 if main else 111
     return byte_to_base58(hash, version)
 
 def scripthash_to_p2sh(hash, main=False):
-    assert len(hash) == 20
+    assert_equal(len(hash), 20)
     version = 5 if main else 196
     return byte_to_base58(hash, version)
 
@@ -152,7 +144,7 @@ def script_to_p2sh_p2wsh(script, main=False):
     return script_to_p2sh(p2shscript, main)
 
 def output_key_to_p2tr(key, main=False):
-    assert len(key) == 32
+    assert_equal(len(key), 32)
     return program_to_witness(1, key, main)
 
 def p2a(main=False):
@@ -193,9 +185,7 @@ def address_to_scriptpubkey(address):
         return keyhash_to_p2pkh_script(payload)
     elif version == 196:  # testnet script hash
         return scripthash_to_p2sh_script(payload)
-    # TODO: also support other address formats
-    else:
-        assert False
+    raise ValueError(f"Unsupported address type: {address}")
 
 
 class TestFrameworkScript(unittest.TestCase):
diff --git a/test/functional/test_framework/authproxy.py b/test/functional/test_framework/authproxy.py
index a3eb0b0578c0..078672c3c62a 100644
--- a/test/functional/test_framework/authproxy.py
+++ b/test/functional/test_framework/authproxy.py
@@ -144,7 +144,8 @@ def __call__(self, *args, **argsn):
             else:
                 return response['result']
         else:
-            assert response['jsonrpc'] == '2.0'
+            from .util import assert_equal
+            assert_equal(response['jsonrpc'], '2.0')
             if status != HTTPStatus.OK:
                 raise JSONRPCException({
                     'code': -342, 'message': 'non-200 HTTP status code'}, status)
diff --git a/test/functional/test_framework/blocktools.py b/test/functional/test_framework/blocktools.py
index e1453e3a99b8..cd2caa18ae4b 100644
--- a/test/functional/test_framework/blocktools.py
+++ b/test/functional/test_framework/blocktools.py
@@ -267,7 +267,7 @@ def send_to_witness(use_p2wsh, node, utxo, pubkey, encode_p2sh, amount, sign=Tru
     tx_to_witness = create_witness_tx(node, use_p2wsh, utxo, pubkey, encode_p2sh, amount)
     if (sign):
         signed = node.signrawtransactionwithwallet(tx_to_witness)
-        assert "errors" not in signed or len(["errors"]) == 0
+        assert "errors" not in signed
         return node.sendrawtransaction(signed["hex"])
     else:
         if (insert_redeem_script):
diff --git a/test/functional/test_framework/crypto/ellswift.py b/test/functional/test_framework/crypto/ellswift.py
index 2a2caa813ed4..e73da525e72f 100644
--- a/test/functional/test_framework/crypto/ellswift.py
+++ b/test/functional/test_framework/crypto/ellswift.py
@@ -13,6 +13,7 @@
 import unittest
 
 from test_framework.crypto.secp256k1 import FE, G, GE
+from test_framework.util import assert_equal
 
 # Precomputed constant square root of -3 (mod p).
 MINUS_3_SQRT = FE(-3).sqrt()
@@ -104,7 +105,7 @@ def test_xswiftec(self):
             (FE(42), FE(0)),  # t = 0
             (FE(5), FE(-132).sqrt()),  # u^3 + t^2 + 7 = 0
         ]
-        assert undefined_inputs[-1][0]**3 + undefined_inputs[-1][1]**2 + 7 == 0
+        assert_equal(undefined_inputs[-1][0]**3 + undefined_inputs[-1][1]**2 + 7, 0)
         for u, t in undefined_inputs:
             x = xswiftec(u, t)
             self.assertTrue(GE.is_valid_x(x))
@@ -154,7 +155,7 @@ def test_elligator_decode_testvectors(self):
             reader = csv.DictReader(csvfile)
             for row in reader:
                 encoding = bytes.fromhex(row['ellswift'])
-                assert len(encoding) == 64
+                assert_equal(len(encoding), 64)
                 expected_x = FE(int(row['x'], 16))
                 u = FE(int.from_bytes(encoding[:32], 'big'))
                 t = FE(int.from_bytes(encoding[32:], 'big'))
diff --git a/test/functional/test_framework/crypto/secp256k1.py b/test/functional/test_framework/crypto/secp256k1.py
index 479d046fa9b8..e89f20182de7 100644
--- a/test/functional/test_framework/crypto/secp256k1.py
+++ b/test/functional/test_framework/crypto/secp256k1.py
@@ -17,7 +17,7 @@
 
 import unittest
 from hashlib import sha256
-from test_framework.util import assert_not_equal
+from test_framework.util import assert_equal, assert_not_equal
 
 class FE:
     """Objects of this class represent elements of the field GF(2**256 - 2**32 - 977).
@@ -179,7 +179,7 @@ def __init__(self, x=None, y=None):
             # Initialize as point on the curve (and check that it is).
             fx = FE(x)
             fy = FE(y)
-            assert fy**2 == fx**3 + 7
+            assert_equal(fy**2, fx**3 + 7)
             self.infinity = False
             self.x = fx
             self.y = fy
@@ -194,7 +194,7 @@ def __add__(self, a):
         if self.x == a.x:
             if self.y != a.y:
                 # A point added to its own negation is infinity.
-                assert self.y + a.y == 0
+                assert_equal(self.y + a.y, 0)
                 return GE()
             else:
                 # For identical inputs, use the tangent (doubling formula).
@@ -292,7 +292,7 @@ def from_bytes(b):
     @staticmethod
     def from_bytes_xonly(b):
         """Convert a point given in xonly encoding to a group element."""
-        assert len(b) == 32
+        assert_equal(len(b), 32)
         x = FE.from_bytes(b)
         if x is None:
             return None
diff --git a/test/functional/test_framework/ipc_util.py b/test/functional/test_framework/ipc_util.py
index 11497463eb31..0e10b90e0230 100644
--- a/test/functional/test_framework/ipc_util.py
+++ b/test/functional/test_framework/ipc_util.py
@@ -13,6 +13,9 @@
 from typing import Optional
 
 from test_framework.messages import CBlock
+from test_framework.util import (
+    assert_equal
+)
 
 # Test may be skipped and not have capnp installed
 try:
@@ -148,3 +151,14 @@ async def mining_get_coinbase_tx(block_template, ctx) -> CoinbaseTxData:
         requiredOutputs=[bytes(output) for output in template_capnp.requiredOutputs],
         lockTime=int(template_capnp.lockTime),
     )
+
+async def make_mining_ctx(self):
+    """Create IPC context and Mining proxy object."""
+    ctx, init = await make_capnp_init_ctx(self)
+    self.log.debug("Create Mining proxy object")
+    mining = init.makeMining(ctx).result
+    return ctx, mining
+
+def assert_capnp_failed(e, description_prefix):
+    assert e.description.startswith(description_prefix), f"Expected description starting with '{description_prefix}', got '{e.description}'"
+    assert_equal(e.type, "FAILED")
diff --git a/test/functional/test_framework/key.py b/test/functional/test_framework/key.py
index 6caafe8bcdbe..796e6e353c16 100644
--- a/test/functional/test_framework/key.py
+++ b/test/functional/test_framework/key.py
@@ -14,7 +14,7 @@
 import unittest
 
 from test_framework.crypto import secp256k1
-from test_framework.util import assert_not_equal, random_bitflip
+from test_framework.util import assert_equal, assert_not_equal, random_bitflip
 
 # Point with no known discrete log.
 H_POINT = "50929b74c1a04954b78b4b6035e97a5e078a5a0f28ec96d547bfee9ace803ac0"
@@ -132,7 +132,7 @@ def __init__(self):
 
     def set(self, secret, compressed):
         """Construct a private key object with given 32-byte secret and compressed flag."""
-        assert len(secret) == 32
+        assert_equal(len(secret), 32)
         secret = int.from_bytes(secret, 'big')
         self.valid = (secret > 0 and secret < ORDER)
         if self.valid:
@@ -194,7 +194,7 @@ def compute_xonly_pubkey(key):
     This also returns whether the resulting public key was negated.
     """
 
-    assert len(key) == 32
+    assert_equal(len(key), 32)
     x = int.from_bytes(key, 'big')
     if x == 0 or x >= ORDER:
         return (None, None)
@@ -204,8 +204,8 @@ def compute_xonly_pubkey(key):
 def tweak_add_privkey(key, tweak):
     """Tweak a private key (after negating it if needed)."""
 
-    assert len(key) == 32
-    assert len(tweak) == 32
+    assert_equal(len(key), 32)
+    assert_equal(len(tweak), 32)
 
     x = int.from_bytes(key, 'big')
     if x == 0 or x >= ORDER:
@@ -223,8 +223,8 @@ def tweak_add_privkey(key, tweak):
 def tweak_add_pubkey(key, tweak):
     """Tweak a public key and return whether the result had to be negated."""
 
-    assert len(key) == 32
-    assert len(tweak) == 32
+    assert_equal(len(key), 32)
+    assert_equal(len(tweak), 32)
 
     P = secp256k1.GE.from_bytes_xonly(key)
     if P is None:
@@ -244,8 +244,8 @@ def verify_schnorr(key, sig, msg):
     - sig is a 64-byte Schnorr signature
     - msg is a variable-length message
     """
-    assert len(key) == 32
-    assert len(sig) == 64
+    assert_equal(len(key), 32)
+    assert_equal(len(sig), 64)
 
     P = secp256k1.GE.from_bytes_xonly(key)
     if P is None:
@@ -270,8 +270,8 @@ def sign_schnorr(key, msg, aux=None, flip_p=False, flip_r=False):
     if aux is None:
         aux = bytes(32)
 
-    assert len(key) == 32
-    assert len(aux) == 32
+    assert_equal(len(key), 32)
+    assert_equal(len(aux), 32)
 
     sec = int.from_bytes(key, 'big')
     if sec == 0 or sec >= ORDER:
diff --git a/test/functional/test_framework/messages.py b/test/functional/test_framework/messages.py
index f6dfc4618837..012049c257cb 100755
--- a/test/functional/test_framework/messages.py
+++ b/test/functional/test_framework/messages.py
@@ -284,7 +284,7 @@ def from_binary(cls, stream):
     obj = cls()
     obj.deserialize(stream)
     if was_bytes:
-        assert len(stream.read()) == 0
+        assert_equal(len(stream.read()), 0)
     return obj
 
 
@@ -343,7 +343,7 @@ def deserialize(self, f, *, with_time=True):
 
     def serialize(self, *, with_time=True):
         """Serialize in addrv1 format (pre-BIP155)"""
-        assert self.net == self.NET_IPV4
+        assert_equal(self.net, self.NET_IPV4)
         r = b""
         if with_time:
             # VERSION messages serialize CAddress objects without time
@@ -364,7 +364,7 @@ def deserialize_v2(self, f):
         assert self.net in self.ADDRV2_NET_NAME
 
         address_length = deser_compact_size(f)
-        assert address_length == self.ADDRV2_ADDRESS_LENGTH[self.net]
+        assert_equal(address_length, self.ADDRV2_ADDRESS_LENGTH[self.net])
 
         addr_bytes = f.read(address_length)
         if self.net == self.NET_IPV4:
diff --git a/test/functional/test_framework/p2p.py b/test/functional/test_framework/p2p.py
index 7a7cce6176c6..fae4eb94c21a 100755
--- a/test/functional/test_framework/p2p.py
+++ b/test/functional/test_framework/p2p.py
@@ -740,12 +740,10 @@ def __init__(self):
 
         NetworkThread.listeners = {}
         NetworkThread.protos = {}
-        if platform.system() == 'Windows':
-            asyncio.set_event_loop_policy(asyncio.WindowsSelectorEventLoopPolicy())
-        NetworkThread.network_event_loop = asyncio.new_event_loop()
 
     def run(self):
         """Start the network thread."""
+        NetworkThread.network_event_loop = asyncio.SelectorEventLoop() if platform.system() == "Windows" else asyncio.new_event_loop()
         self.network_event_loop.run_forever()
 
     def close(self, *, timeout):
diff --git a/test/functional/test_framework/psbt.py b/test/functional/test_framework/psbt.py
index 8c552e420ebb..0a57be315dab 100644
--- a/test/functional/test_framework/psbt.py
+++ b/test/functional/test_framework/psbt.py
@@ -5,6 +5,7 @@
 
 import base64
 
+from .util import assert_equal
 from .messages import (
     CTransaction,
     deser_string,
@@ -110,7 +111,7 @@ def __init__(self, *, g=None, i=None, o=None):
         self.tx = None
 
     def deserialize(self, f):
-        assert f.read(5) == b"psbt\xff"
+        assert_equal(f.read(5), b"psbt\xff")
         self.g = from_binary(PSBTMap, f)
         assert PSBT_GLOBAL_UNSIGNED_TX in self.g.map
         self.tx = from_binary(CTransaction, self.g.map[PSBT_GLOBAL_UNSIGNED_TX])
@@ -124,8 +125,8 @@ def serialize(self):
         assert isinstance(self.o, list) and all(isinstance(x, PSBTMap) for x in self.o)
         assert PSBT_GLOBAL_UNSIGNED_TX in self.g.map
         tx = from_binary(CTransaction, self.g.map[PSBT_GLOBAL_UNSIGNED_TX])
-        assert len(tx.vin) == len(self.i)
-        assert len(tx.vout) == len(self.o)
+        assert_equal(len(tx.vin), len(self.i))
+        assert_equal(len(tx.vout), len(self.o))
 
         psbt = [x.serialize() for x in [self.g] + self.i + self.o]
         return b"psbt\xff" + b"".join(psbt)
diff --git a/test/functional/test_framework/script.py b/test/functional/test_framework/script.py
index 16bd871bb23b..fb168928c3e8 100644
--- a/test/functional/test_framework/script.py
+++ b/test/functional/test_framework/script.py
@@ -21,6 +21,7 @@
 )
 
 from .crypto.ripemd160 import ripemd160
+from .util import assert_equal
 
 MAX_SCRIPT_ELEMENT_SIZE = 520
 MAX_SCRIPT_SIZE = 10000
@@ -108,7 +109,7 @@ def __new__(cls, n):
         try:
             return _opcode_instances[n]
         except IndexError:
-            assert len(_opcode_instances) == n
+            assert_equal(len(_opcode_instances), n)
             _opcode_instances.append(super().__new__(cls, n))
             return _opcode_instances[n]
 
@@ -814,8 +815,8 @@ def BIP341_sha_outputs(txTo):
     return sha256(b"".join(o.serialize() for o in txTo.vout))
 
 def TaprootSignatureMsg(txTo, spent_utxos, hash_type, input_index=0, *, scriptpath=False, leaf_script=None, codeseparator_pos=-1, annex=None, leaf_ver=LEAF_VERSION_TAPSCRIPT):
-    assert (len(txTo.vin) == len(spent_utxos))
-    assert (input_index < len(txTo.vin))
+    assert_equal(len(txTo.vin), len(spent_utxos))
+    assert input_index < len(txTo.vin)
     out_type = SIGHASH_ALL if hash_type == 0 else hash_type & 3
     in_type = hash_type & SIGHASH_ANYONECANPAY
     spk = spent_utxos[input_index].scriptPubKey
@@ -853,7 +854,7 @@ def TaprootSignatureMsg(txTo, spent_utxos, hash_type, input_index=0, *, scriptpa
         ss += TaggedHash("TapLeaf", bytes([leaf_ver]) + ser_string(leaf_script))
         ss += bytes([0])
         ss += codeseparator_pos.to_bytes(4, "little", signed=False)
-    assert len(ss) == 175 - (in_type == SIGHASH_ANYONECANPAY) * 49 - (out_type != SIGHASH_ALL and out_type != SIGHASH_SINGLE) * 32 + (annex is not None) * 32 + scriptpath * 37
+    assert_equal(len(ss), 175 - (in_type == SIGHASH_ANYONECANPAY) * 49 - (out_type != SIGHASH_ALL and out_type != SIGHASH_SINGLE) * 32 + (annex is not None) * 32 + scriptpath * 37)
     return ss
 
 def TaprootSignatureHash(*args, **kwargs):
@@ -874,7 +875,7 @@ def taproot_tree_helper(scripts):
         code = script[1]
         if len(script) == 3:
             version = script[2]
-        assert version & 1 == 0
+        assert_equal(version & 1, 0)
         assert isinstance(code, bytes)
         h = TaggedHash("TapLeaf", bytes([version]) + ser_string(code))
         if name is None:
diff --git a/test/functional/test_framework/script_util.py b/test/functional/test_framework/script_util.py
index 812d9bbd0a8b..02be353854be 100755
--- a/test/functional/test_framework/script_util.py
+++ b/test/functional/test_framework/script_util.py
@@ -61,12 +61,12 @@
 # least 5 bytes.
 MIN_STANDARD_TX_NONWITNESS_SIZE = 65
 MIN_PADDING = MIN_STANDARD_TX_NONWITNESS_SIZE - 10 - 41 - 9
-assert MIN_PADDING == 5
+assert_equal(MIN_PADDING, 5)
 
 # This script cannot be spent, allowing dust output values under
 # standardness checks
 DUMMY_MIN_OP_RETURN_SCRIPT = CScript([OP_RETURN] + ([OP_0] * (MIN_PADDING - 1)))
-assert len(DUMMY_MIN_OP_RETURN_SCRIPT) == MIN_PADDING
+assert_equal(len(DUMMY_MIN_OP_RETURN_SCRIPT), MIN_PADDING)
 
 PAY_TO_ANCHOR = CScript([OP_1, bytes.fromhex("4e73")])
 ANCHOR_ADDRESS = "bcrt1pfeesnyr2tx"
@@ -86,12 +86,12 @@ def keys_to_multisig_script(keys, *, k=None):
 
 
 def keyhash_to_p2pkh_script(hash):
-    assert len(hash) == 20
+    assert_equal(len(hash), 20)
     return CScript([OP_DUP, OP_HASH160, hash, OP_EQUALVERIFY, OP_CHECKSIG])
 
 
 def scripthash_to_p2sh_script(hash):
-    assert len(hash) == 20
+    assert_equal(len(hash), 20)
     return CScript([OP_HASH160, hash, OP_EQUAL])
 
 
@@ -147,7 +147,7 @@ def bulk_vout(tx, target_vsize):
     assert_equal(tx.get_vsize(), target_vsize)
 
 def output_key_to_p2tr_script(key):
-    assert len(key) == 32
+    assert_equal(len(key), 32)
     return program_to_witness_script(1, key)
 
 
diff --git a/test/functional/test_framework/test_framework.py b/test/functional/test_framework/test_framework.py
index fb0fc0af6b8e..36445144503b 100755
--- a/test/functional/test_framework/test_framework.py
+++ b/test/functional/test_framework/test_framework.py
@@ -10,6 +10,7 @@
 from datetime import datetime, timezone
 import logging
 import os
+from pathlib import Path
 import platform
 import pdb
 import random
@@ -260,7 +261,7 @@ def setup(self):
         self.log.debug('Setting up network thread')
         self.network_thread = NetworkThread()
         self.network_thread.start()
-        self.wait_until(lambda: self.network_thread.network_event_loop.is_running())
+        self.wait_until(lambda: self.network_thread.network_event_loop is not None and self.network_thread.network_event_loop.is_running())
 
         if self.options.usecli:
             if not self.supports_cli:
@@ -331,7 +332,7 @@ def shutdown(self):
             h.flush()
             rpc_logger.removeHandler(h)
         if cleanup_tree_on_exit:
-            shutil.rmtree(self.options.tmpdir)
+            self.cleanup_folder(self.options.tmpdir)
 
         self.nodes.clear()
         return exit_code
@@ -672,7 +673,8 @@ def create_outpoints(self, node, *, outputs):
         `[{"txid": txid, "vout": vout1}, {"txid": txid, "vout": vout2}, ...]`.
         The result can be used to specify inputs for RPCs like `createrawtransaction`,
         `createpsbt`, `lockunspent` etc."""
-        assert all(len(output.keys()) == 1 for output in outputs)
+        for output in outputs:
+            assert_equal(len(output.keys()), 1)
         send_res = node.send(outputs)
         assert send_res["complete"]
         utxos = []
@@ -1031,3 +1033,9 @@ def inspect_sqlite_db(self, path, fn, *args, **kwargs):
             return result
         except ImportError:
             self.log.warning("sqlite3 module not available, skipping tests that inspect the database")
+
+    def cleanup_folder(self, _path):
+        path = Path(_path)
+        if not path.is_relative_to(self.options.tmpdir):
+            raise AssertionError(f"Trying to delete #{path} outside of #{self.options.tmpdir}")
+        shutil.rmtree(path)
diff --git a/test/functional/test_framework/test_node.py b/test/functional/test_framework/test_node.py
index 4bcf01e37c00..bf0250f745e7 100755
--- a/test/functional/test_framework/test_node.py
+++ b/test/functional/test_framework/test_node.py
@@ -11,7 +11,6 @@
 import json
 import logging
 import os
-import pathlib
 import platform
 import re
 import subprocess
@@ -20,7 +19,6 @@
 import urllib.parse
 import collections
 import shlex
-import shutil
 import sys
 from collections.abc import Iterable
 from pathlib import Path
@@ -120,7 +118,6 @@ def __init__(
         """
 
         self.index = i
-        self.p2p_conn_index = 1
         self.datadir_path = datadir_path
         self.bitcoinconf = self.datadir_path / "bitcoin.conf"
         self.stdout_dir = self.datadir_path / "stdout"
@@ -164,8 +161,8 @@ def __init__(
                 self.args.append("-ipcbind=unix")
             else:
                 # Work around default CI path exceeding maximum socket path length.
-                self.ipc_tmp_dir = pathlib.Path(tempfile.mkdtemp(prefix="test-ipc-"))
-                self.ipc_socket_path = self.ipc_tmp_dir / "node.sock"
+                self.ipc_tmp_dir = tempfile.TemporaryDirectory(prefix="test-ipc-")
+                self.ipc_socket_path = Path(self.ipc_tmp_dir.name) / "node.sock"
                 self.args.append(f"-ipcbind=unix:{self.ipc_socket_path}")
 
         if self.version_is_at_least(190000):
@@ -229,7 +226,7 @@ def __init__(
 
     def get_deterministic_priv_key(self):
         """Return a deterministic priv key in base58, that only depends on the node's index"""
-        assert len(self.PRIV_KEYS) == MAX_NODES
+        assert_equal(len(self.PRIV_KEYS), MAX_NODES)
         return self.PRIV_KEYS[self.index]
 
     def _node_msg(self, msg: str) -> str:
@@ -249,9 +246,6 @@ def __del__(self):
             # this destructor is called.
             print(self._node_msg("Cleaning up leftover process"), file=sys.stderr)
             self.process.kill()
-        if self.ipc_tmp_dir:
-            print(self._node_msg(f"Cleaning up ipc directory {str(self.ipc_tmp_dir)!r}"))
-            shutil.rmtree(self.ipc_tmp_dir)
 
     def __getattr__(self, name):
         """Dispatches any unrecognised messages to the RPC connection or a CLI instance."""
diff --git a/test/functional/test_framework/util.py b/test/functional/test_framework/util.py
index 3a6346a3d919..8e1e3c716f6d 100644
--- a/test/functional/test_framework/util.py
+++ b/test/functional/test_framework/util.py
@@ -75,7 +75,10 @@ def summarise_dict_differences(thing1, thing2):
 def assert_equal(thing1, thing2, *args):
     if thing1 != thing2 and not args and isinstance(thing1, dict) and isinstance(thing2, dict):
         d1,d2 = summarise_dict_differences(thing1, thing2)
-        raise AssertionError("not(%s == %s)\n  in particular not(%s == %s)" % (thing1, thing2, d1, d2))
+        if d1 != thing1 or d2 != thing2:
+            raise AssertionError(f"not({thing1!s} == {thing2!s})\n  in particular not({d1!s} == {d2!s})")
+        else:
+            raise AssertionError(f"not({thing1!s} == {thing2!s})")
     if thing1 != thing2 or any(thing1 != arg for arg in args):
         raise AssertionError("not(%s)" % " == ".join(str(arg) for arg in (thing1, thing2) + args))
 
@@ -133,7 +136,7 @@ def assert_raises_process_error(returncode: int, output: str, fun: Callable, *ar
         if returncode != e.returncode:
             raise AssertionError("Unexpected returncode %i" % e.returncode)
         if output not in e.output:
-            raise AssertionError("Expected substring not found:" + e.output)
+            raise AssertionError(f"Expected substring not found in: {e.output!r}")
     else:
         raise AssertionError("No exception raised")
 
@@ -726,7 +729,7 @@ def dumb_sync_blocks(*, src, dst, height=None):
     height = height or src.getblockcount()
     for i in range(dst.getblockcount() + 1, height + 1):
         block_hash = src.getblockhash(i)
-        block = src.getblock(blockhash=block_hash, verbose=0)
+        block = src.getblock(blockhash=block_hash, verbosity=0)
         dst.submitblock(block)
     assert_equal(dst.getblockcount(), height)
 
diff --git a/test/functional/test_framework/v2_p2p.py b/test/functional/test_framework/v2_p2p.py
index 5315aaf8a69f..087b885ae027 100644
--- a/test/functional/test_framework/v2_p2p.py
+++ b/test/functional/test_framework/v2_p2p.py
@@ -12,6 +12,7 @@
 from .crypto.hkdf import hkdf_sha256
 from .key import TaggedHash
 from .messages import MAGIC_BYTES
+from .util import assert_equal
 
 
 CHACHA20POLY1305_EXPANSION = 16
@@ -218,7 +219,7 @@ def authenticate_handshake(self, response):
             # decoy packets have contents = None. v2 handshake is complete only when version packet
             # (can be empty with contents = b"") with contents != None is received.
             if contents is not None:
-                assert contents == b""  # currently TestNode sends an empty version packet
+                assert_equal(contents, b"")  # currently TestNode sends an empty version packet
                 self.tried_v2_handshake = True
                 return processed_length, True
             response = response[length:]
diff --git a/test/functional/test_runner.py b/test/functional/test_runner.py
index a4052f910243..698742bc79e7 100755
--- a/test/functional/test_runner.py
+++ b/test/functional/test_runner.py
@@ -352,6 +352,7 @@
     'tool_bitcoin.py',
     'p2p_sendtxrcncl.py',
     'rpc_scantxoutset.py',
+    'feature_torcontrol.py',
     'feature_unsupported_utxo_db.py',
     'mempool_cluster.py',
     'feature_logging.py',
@@ -379,6 +380,7 @@
     'tool_rpcauth.py',
     'p2p_handshake.py',
     'p2p_handshake.py --v2transport',
+    'interface_ipc_cli.py',
     'feature_dirsymlinks.py',
     'feature_help.py',
     'feature_framework_startup_failures.py',
@@ -415,7 +417,6 @@ def main():
     parser.add_argument('--extended', action='store_true', help='run the extended test suite in addition to the basic tests')
     parser.add_argument('--help', '-h', '-?', action='store_true', help='print help text and exit')
     parser.add_argument('--jobs', '-j', type=int, default=4, help='how many test scripts to run in parallel. Default=4.')
-    parser.add_argument('--keepcache', '-k', action='store_true', help='the default behavior is to flush the cache directory on startup. --keepcache retains the cache from the previous testrun.')
     parser.add_argument('--quiet', '-q', action='store_true', help='only print dots, results summary and failure logs')
     parser.add_argument('--tmpdirprefix', '-t', default=tempfile.gettempdir(), help="Root directory for datadirs")
     parser.add_argument('--failfast', '-F', action='store_true', help='stop execution after the first test failure')
@@ -565,9 +566,6 @@ def remove_tests(exclude_list):
     check_script_list(src_dir=config["environment"]["SRCDIR"], fail_on_warn=fail_on_warn)
     check_script_prefixes()
 
-    if not args.keepcache:
-        shutil.rmtree("%s/test/cache" % config["environment"]["BUILDDIR"], ignore_errors=True)
-
     run_tests(
         test_list=test_list,
         build_dir=config["environment"]["BUILDDIR"],
@@ -584,6 +582,11 @@ def remove_tests(exclude_list):
 def run_tests(*, test_list, build_dir, tmpdir, jobs=1, enable_coverage=False, args=None, combined_logs_len=0, failfast=False, use_term_control, results_filepath=None):
     args = args or []
 
+    # Some optional Python dependencies (e.g. pycapnp) may emit warnings or fail under
+    # CPython free-threaded builds when the GIL is disabled. Force it on for all
+    # functional tests so every child process inherits PYTHON_GIL=1.
+    os.environ["PYTHON_GIL"] = "1"
+
     # Warn if bitcoind is already running
     try:
         # pgrep exits with code zero when one or more matching processes found
@@ -593,11 +596,6 @@ def run_tests(*, test_list, build_dir, tmpdir, jobs=1, enable_coverage=False, ar
         # pgrep not supported
         pass
 
-    # Warn if there is a cache directory
-    cache_dir = "%s/test/cache" % build_dir
-    if os.path.isdir(cache_dir):
-        print("%sWARNING!%s There is a cache directory here: %s. If tests fail unexpectedly, try deleting the cache directory." % (BOLD[1], BOLD[0], cache_dir))
-
     # Warn if there is not enough space on the testing dir
     min_space = MIN_FREE_SPACE + (jobs - 1) * ADDITIONAL_SPACE_PER_JOB
     if shutil.disk_usage(tmpdir).free < min_space:
@@ -609,7 +607,8 @@ def run_tests(*, test_list, build_dir, tmpdir, jobs=1, enable_coverage=False, ar
     # a hard link or a copy on any platform. See https://github.com/bitcoin/bitcoin/pull/27561.
     sys.path.append(tests_dir)
 
-    flags = ['--cachedir={}'.format(cache_dir)] + args
+    cache_tmp_dir = tempfile.TemporaryDirectory(prefix="functional_test_cache")
+    flags = [f"--cachedir={cache_tmp_dir.name}"] + args
 
     if enable_coverage:
         coverage = RPCCoverage()
@@ -626,7 +625,7 @@ def run_tests(*, test_list, build_dir, tmpdir, jobs=1, enable_coverage=False, ar
             sys.stdout.buffer.write(e.output)
             raise
 
-    #Run Tests
+    # Run Tests
     job_queue = TestHandler(
         num_tests_parallel=jobs,
         tests_dir=tests_dir,
@@ -684,9 +683,6 @@ def run_tests(*, test_list, build_dir, tmpdir, jobs=1, enable_coverage=False, ar
 
     if coverage:
         coverage_passed = coverage.report_rpc_coverage()
-
-        logging.debug("Cleaning up coverage data")
-        coverage.cleanup()
     else:
         coverage_passed = True
 
@@ -901,7 +897,8 @@ class RPCCoverage():
 
     """
     def __init__(self):
-        self.dir = tempfile.mkdtemp(prefix="coverage")
+        self.temp_dir = tempfile.TemporaryDirectory(prefix="coverage")
+        self.dir = self.temp_dir.name
         self.flag = '--coveragedir=%s' % self.dir
 
     def report_rpc_coverage(self):
@@ -919,9 +916,6 @@ def report_rpc_coverage(self):
             print("All RPC commands covered.")
             return True
 
-    def cleanup(self):
-        return shutil.rmtree(self.dir)
-
     def _get_uncovered_rpc_commands(self):
         """
         Return a set of currently untested RPC commands.
diff --git a/test/functional/tool_bitcoin.py b/test/functional/tool_bitcoin.py
index d59c75dee532..976c7f47571c 100755
--- a/test/functional/tool_bitcoin.py
+++ b/test/functional/tool_bitcoin.py
@@ -35,7 +35,8 @@ def setup_network(self):
         self.add_nodes(self.num_nodes, self.extra_args)
         node_argv = self.get_binaries().node_argv()
         self.node_options = [node.args[len(node_argv):] for node in self.nodes]
-        assert all(node.args[:len(node_argv)] == node_argv for node in self.nodes)
+        for node in self.nodes:
+            assert_equal(node.args[:len(node_argv)], node_argv)
 
     def set_cmd_args(self, node, args):
         """Set up node so it will be started through bitcoin wrapper command with specified arguments."""
diff --git a/test/functional/tool_bitcoin_chainstate.py b/test/functional/tool_bitcoin_chainstate.py
index 8f33da357bed..c57da1fc376d 100755
--- a/test/functional/tool_bitcoin_chainstate.py
+++ b/test/functional/tool_bitcoin_chainstate.py
@@ -51,15 +51,15 @@ def generate_snapshot_chain(self):
         assert_equal(n0.getbestblockhash(), SNAPSHOT_BASE_BLOCK_HASH)
         return n0.dumptxoutset('utxos.dat', "latest")
 
-    def add_block(self, datadir, input, expected_stderr=None, expected_stdout=None):
+    def add_block(self, datadir, input, *, expected_stderr=None, expected_stdout=None):
         proc = subprocess.Popen(
             self.get_binaries().chainstate_argv() + ["-regtest", datadir],
             stdin=subprocess.PIPE,
             stdout=subprocess.PIPE,
             stderr=subprocess.PIPE,
-            text=True
+            text=True,
         )
-        stdout, stderr = proc.communicate(input=input + "\n", timeout=5)
+        stdout, stderr = proc.communicate(input=input + "\n", timeout=5 * self.options.timeout_factor)
         self.log.debug("STDOUT: {0}".format(stdout.strip("\n")))
         self.log.info("STDERR: {0}".format(stderr.strip("\n")))
 
diff --git a/test/functional/tool_utxo_to_sqlite.py b/test/functional/tool_utxo_to_sqlite.py
index d1f3e7e19348..d3b3fc434397 100755
--- a/test/functional/tool_utxo_to_sqlite.py
+++ b/test/functional/tool_utxo_to_sqlite.py
@@ -4,7 +4,8 @@
 # file COPYING or http://www.opensource.org/licenses/mit-license.php.
 """Test utxo-to-sqlite conversion tool"""
 from itertools import product
-import os.path
+import os
+import platform
 try:
     import sqlite3
 except ImportError:
@@ -135,6 +136,19 @@ def run_test(self):
             assert_equal(muhash_sqlite, muhash_compact_serialized)
             self.log.info('')
 
+        if platform.system() != "Windows":  # FIFOs are not available on Windows
+            self.log.info('Convert UTXO set directly (without intermediate dump) via named pipe')
+            fifo_filename = os.path.join(self.options.tmpdir, "utxos.fifo")
+            os.mkfifo(fifo_filename)
+            output_direct_filename = os.path.join(self.options.tmpdir, "utxos_direct.sqlite")
+            p = subprocess.Popen([sys.executable, utxo_to_sqlite_path, fifo_filename, output_direct_filename],
+                                 stderr=subprocess.STDOUT)
+            node.dumptxoutset(fifo_filename, "latest")
+            p.wait(timeout=10)
+            muhash_direct_sqlite = calculate_muhash_from_sqlite_utxos(output_direct_filename, "hex", "hex")
+            assert_equal(muhash_sqlite, muhash_direct_sqlite)
+            os.remove(fifo_filename)
+
 
 if __name__ == "__main__":
     UtxoToSqliteTest(__file__).main()
diff --git a/test/functional/tool_wallet.py b/test/functional/tool_wallet.py
index ecef5e137374..737aaf54d166 100755
--- a/test/functional/tool_wallet.py
+++ b/test/functional/tool_wallet.py
@@ -93,7 +93,7 @@ def read_dump(self, filename):
     def assert_is_sqlite(self, filename):
         with open(filename, 'rb') as f:
             file_magic = f.read(16)
-            assert file_magic == b'SQLite format 3\x00'
+            assert_equal(file_magic, b'SQLite format 3\x00')
 
     def write_dump(self, dump, filename, magic=None, skip_checksum=False):
         if magic is None:
diff --git a/test/functional/wallet_address_types.py b/test/functional/wallet_address_types.py
index 4c6e6ad79541..2ba8eb9d9fde 100755
--- a/test/functional/wallet_address_types.py
+++ b/test/functional/wallet_address_types.py
@@ -176,12 +176,12 @@ def test_desc(self, node, address, multisig, typ, utxo):
         # Verify the descriptor checksum against the Python implementation
         assert descsum_check(info['desc'])
         # Verify that stripping the checksum and recreating it using Python roundtrips
-        assert info['desc'] == descsum_create(info['desc'][:-9])
+        assert_equal(info['desc'], descsum_create(info['desc'][:-9]))
         # Verify that stripping the checksum and feeding it to getdescriptorinfo roundtrips
-        assert info['desc'] == self.nodes[0].getdescriptorinfo(info['desc'][:-9])['descriptor']
+        assert_equal(info['desc'], self.nodes[0].getdescriptorinfo(info['desc'][:-9])['descriptor'])
         assert_equal(info['desc'][-8:], self.nodes[0].getdescriptorinfo(info['desc'][:-9])['checksum'])
         # Verify that keeping the checksum and feeding it to getdescriptorinfo roundtrips
-        assert info['desc'] == self.nodes[0].getdescriptorinfo(info['desc'])['descriptor']
+        assert_equal(info['desc'], self.nodes[0].getdescriptorinfo(info['desc'])['descriptor'])
         assert_equal(info['desc'][-8:], self.nodes[0].getdescriptorinfo(info['desc'])['checksum'])
 
         if not multisig and typ == 'legacy':
diff --git a/test/functional/wallet_backwards_compatibility.py b/test/functional/wallet_backwards_compatibility.py
index a67b4676a86c..f00f2958d122 100755
--- a/test/functional/wallet_backwards_compatibility.py
+++ b/test/functional/wallet_backwards_compatibility.py
@@ -240,8 +240,8 @@ def run_test(self):
         node_master.createwallet(wallet_name="w2", disable_private_keys=True)
         wallet = node_master.get_wallet_rpc("w2")
         info = wallet.getwalletinfo()
-        assert info['private_keys_enabled'] == False
-        assert info['keypoolsize'] == 0
+        assert_equal(info['private_keys_enabled'], False)
+        assert_equal(info['keypoolsize'], 0)
 
         # w3: blank wallet, created on master: update this
         #     test when default blank wallets can no longer be opened by older versions.
@@ -249,7 +249,7 @@ def run_test(self):
         wallet = node_master.get_wallet_rpc("w3")
         info = wallet.getwalletinfo()
         assert info['private_keys_enabled']
-        assert info['keypoolsize'] == 0
+        assert_equal(info['keypoolsize'], 0)
 
         # Unload wallets and copy to older nodes:
         node_master_wallets_dir = node_master.wallets_path
@@ -279,7 +279,7 @@ def run_test(self):
                     wallet = n.get_wallet_rpc(wallet_name)
                     info = wallet.getwalletinfo()
                     if wallet_name == "w1":
-                        assert info['private_keys_enabled'] == True
+                        assert_equal(info['private_keys_enabled'], True)
                         assert info['keypoolsize'] > 0
                         txs = wallet.listtransactions()
                         assert_equal(len(txs), 5)
@@ -294,16 +294,17 @@ def run_test(self):
                         assert_equal(txs[3]["replaced_by_txid"], tx4_id)
                         assert not hasattr(txs[3], "blockindex")
                     elif wallet_name == "w2":
-                        assert info['private_keys_enabled'] == False
-                        assert info['keypoolsize'] == 0
+                        assert_equal(info['private_keys_enabled'], False)
+                        assert_equal(info['keypoolsize'], 0)
                     else:
-                        assert info['private_keys_enabled'] == True
-                        assert info['keypoolsize'] == 0
+                        assert_equal(info['private_keys_enabled'], True)
+                        assert_equal(info['keypoolsize'], 0)
 
                     # Copy back to master
                     wallet.unloadwallet()
                     if n == node:
-                        shutil.rmtree(node_master.wallets_path / wallet_name)
+                        (node_master.wallets_path / wallet_name / "wallet.dat").unlink()
+                        (node_master.wallets_path / wallet_name).rmdir()
                         shutil.copytree(
                             n.wallets_path / wallet_name,
                             node_master.wallets_path / wallet_name,
diff --git a/test/functional/wallet_bumpfee.py b/test/functional/wallet_bumpfee.py
index 4a6c45e746f9..80735e01dd14 100755
--- a/test/functional/wallet_bumpfee.py
+++ b/test/functional/wallet_bumpfee.py
@@ -341,8 +341,8 @@ def test_simple_bumpfee_succeeds(self, mode, rbf_node, peer_node, dest_address):
     assert_equal(bumpedwtx["replaces_txid"], rbfid)
     # if this is a new_outputs test, check that outputs were indeed replaced
     if mode == "new_outputs":
-        assert len(bumpedwtx["details"]) == 1
-        assert bumpedwtx["details"][0]["address"] == new_address
+        assert_equal(len(bumpedwtx["details"]), 1)
+        assert_equal(bumpedwtx["details"][0]["address"], new_address)
     self.clear_mempool()
 
 
diff --git a/test/functional/wallet_conflicts.py b/test/functional/wallet_conflicts.py
index 30f0672647c3..80a0a8510161 100755
--- a/test/functional/wallet_conflicts.py
+++ b/test/functional/wallet_conflicts.py
@@ -146,7 +146,8 @@ def test_mempool_conflict(self):
 
         unspents = alice.listunspent()
         assert_equal(len(unspents), 3)
-        assert all([tx["amount"] == 25 for tx in unspents])
+        for tx in unspents:
+            assert_equal(tx["amount"], 25)
 
         # tx1 spends unspent[0] and unspent[1]
         raw_tx = alice.createrawtransaction(inputs=[unspents[0], unspents[1]], outputs=[{bob.getnewaddress() : 49.9999}])
@@ -336,7 +337,8 @@ def test_descendants_with_mempool_conflicts(self):
 
         unspents = alice.listunspent()
         assert_equal(len(unspents), 2)
-        assert all([tx["amount"] == 25 for tx in unspents])
+        for tx in unspents:
+            assert_equal(tx["amount"], 25)
 
         assert_equal(alice.getrawmempool(), [])
 
diff --git a/test/functional/wallet_disable.py b/test/functional/wallet_disable.py
index dbcccd477847..17b327e17e84 100755
--- a/test/functional/wallet_disable.py
+++ b/test/functional/wallet_disable.py
@@ -9,7 +9,7 @@
 """
 
 from test_framework.test_framework import BitcoinTestFramework
-from test_framework.util import assert_raises_rpc_error
+from test_framework.util import assert_raises_rpc_error, assert_equal
 
 class DisableWalletTest (BitcoinTestFramework):
     def set_test_params(self):
@@ -22,9 +22,9 @@ def run_test (self):
         # Make sure wallet is really disabled
         assert_raises_rpc_error(-32601, 'Method not found', self.nodes[0].getwalletinfo)
         x = self.nodes[0].validateaddress('3J98t1WpEZ73CNmQviecrnyiWrnqRhWNLy')
-        assert x['isvalid'] == False
+        assert_equal(x['isvalid'], False)
         x = self.nodes[0].validateaddress('mneYUmWYsuk7kySiURxCi3AGxrAqZxLgPZ')
-        assert x['isvalid'] == True
+        assert_equal(x['isvalid'], True)
 
 
 if __name__ == '__main__':
diff --git a/test/functional/wallet_fallbackfee.py b/test/functional/wallet_fallbackfee.py
index e6930627c446..23fa5b681c3c 100755
--- a/test/functional/wallet_fallbackfee.py
+++ b/test/functional/wallet_fallbackfee.py
@@ -2,13 +2,18 @@
 # Copyright (c) 2017-present The Bitcoin 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."""
+"""Test wallet fallbackfee."""
+
+from decimal import Decimal
 
 from test_framework.blocktools import COINBASE_MATURITY
 from test_framework.test_framework import BitcoinTestFramework
-from test_framework.util import assert_raises_rpc_error
+from test_framework.util import assert_equal, assert_raises_rpc_error
+
+HIGH_TX_FEE_PER_KB = Decimal('0.01')
+
 
-class WalletRBFTest(BitcoinTestFramework):
+class WalletFallbackFeeTest(BitcoinTestFramework):
     def set_test_params(self):
         self.num_nodes = 1
         self.setup_clean_chain = True
@@ -16,17 +21,55 @@ def set_test_params(self):
     def skip_test_if_missing_module(self):
         self.skip_if_no_wallet()
 
+    def sending_succeeds(self, node):
+        # Check that fallback fee is being used as a test-of-the-test.
+        assert_equal(
+            node.sendtoaddress(node.getnewaddress(), 1, verbose=True)['fee_reason'],
+            "Fallback fee"
+        )
+        node.fundrawtransaction(node.createrawtransaction([], {node.getnewaddress(): 1}))
+        assert_equal(
+            node.sendmany("", {node.getnewaddress(): 1}, verbose=True)["fee_reason"],
+            "Fallback fee"
+        )
+
+    def sending_fails(self, node):
+        assert_raises_rpc_error(-6, "Fee estimation failed", lambda: node.sendtoaddress(node.getnewaddress(), 1))
+        assert_raises_rpc_error(-4, "Fee estimation failed", lambda: node.fundrawtransaction(node.createrawtransaction([], {node.getnewaddress(): 1})))
+        assert_raises_rpc_error(-6, "Fee estimation failed", lambda: node.sendmany("", {node.getnewaddress(): 1}))
+
     def run_test(self):
-        self.generate(self.nodes[0], COINBASE_MATURITY + 1)
+        node = self.nodes[0]
+        self.generate(node, COINBASE_MATURITY + 1)
 
-        # sending a transaction without fee estimations must be possible by default on regtest
-        self.nodes[0].sendtoaddress(self.nodes[0].getnewaddress(), 1)
+        # By default, the test framework sets a fallback fee for nodes,
+        # in order to test default behavior, comment this line out.
+        node.replace_in_config([("fallbackfee=", "#fallbackfee=")])
+        self.restart_node(0)
 
-        # test sending a tx with disabled fallback fee (must fail)
+        # Sending a transaction with no -fallbackfee setting fails, since the
+        # default value is 0.
+        self.sending_fails(node)
+
+        # Sending a tx with explicitly disabled fallback fee fails.
         self.restart_node(0, extra_args=["-fallbackfee=0"])
-        assert_raises_rpc_error(-6, "Fee estimation failed", lambda: self.nodes[0].sendtoaddress(self.nodes[0].getnewaddress(), 1))
-        assert_raises_rpc_error(-4, "Fee estimation failed", lambda: self.nodes[0].fundrawtransaction(self.nodes[0].createrawtransaction([], {self.nodes[0].getnewaddress(): 1})))
-        assert_raises_rpc_error(-6, "Fee estimation failed", lambda: self.nodes[0].sendmany("", {self.nodes[0].getnewaddress(): 1}))
+        self.sending_fails(node)
+
+        # Sending a transaction with a fallback fee set succeeds. Use the
+        # largest fallbackfee value that doesn't trigger a warning.
+        self.restart_node(0, extra_args=[f"-fallbackfee={HIGH_TX_FEE_PER_KB}"])
+        self.sending_succeeds(node)
+        self.stop_node(0, expected_stderr='')
+
+        # Starting a node with a large fallback fee set...
+        excessive_fallback = HIGH_TX_FEE_PER_KB + Decimal('0.00000001')
+        self.start_node(0, extra_args=[f"-fallbackfee={excessive_fallback}"])
+        # ...works...
+        self.sending_succeeds(node)
+        # ...but results in a warning message.
+        expected_error = "Warning: -fallbackfee is set very high! This is the transaction fee you may pay when fee estimates are not available."
+        self.stop_node(0, expected_stderr=expected_error)
+
 
 if __name__ == '__main__':
-    WalletRBFTest(__file__).main()
+    WalletFallbackFeeTest(__file__).main()
diff --git a/test/functional/wallet_fast_rescan.py b/test/functional/wallet_fast_rescan.py
index 3bd4c8f068a2..d6a43fa48647 100755
--- a/test/functional/wallet_fast_rescan.py
+++ b/test/functional/wallet_fast_rescan.py
@@ -14,7 +14,6 @@
 
 
 KEYPOOL_SIZE = 100   # smaller than default size to speed-up test
-NUM_DESCRIPTORS = 9  # number of descriptors (8 default ranged ones + 1 fixed non-ranged one)
 NUM_BLOCKS = 6       # number of blocks to mine
 
 
@@ -33,41 +32,56 @@ def get_wallet_txids(self, node: TestNode, wallet_name: str) -> list[str]:
 
     def run_test(self):
         node = self.nodes[0]
-        wallet = MiniWallet(node)
+        funding_wallet = MiniWallet(node)
 
         self.log.info("Create descriptor wallet with backup")
         WALLET_BACKUP_FILENAME = node.datadir_path / 'wallet.bak'
         node.createwallet(wallet_name='topup_test')
         w = node.get_wallet_rpc('topup_test')
         fixed_key = get_generate_key()
-        print(w.importdescriptors([{"desc": descsum_create(f"wpkh({fixed_key.privkey})"), "timestamp": "now"}]))
+        w.importdescriptors([{"desc": descsum_create(f"wpkh({fixed_key.privkey})"), "timestamp": "now"}])
         descriptors = w.listdescriptors()['descriptors']
-        assert_equal(len(descriptors), NUM_DESCRIPTORS)
         w.backupwallet(WALLET_BACKUP_FILENAME)
 
+        num_txs = 0
+
+        fast_rescan_messages = []
+        def append_fast_rescan_message():
+            chain_info = self.nodes[0].getblockchaininfo()
+            fast_rescan_messages.append(f"Fast rescan: inspect block {chain_info['blocks']} [{chain_info['bestblockhash']}] (filter matched)")
+
+        self.log.info("Create tx sending to non-ranged descriptors")
+        self.log.debug(f"Block 1/{NUM_BLOCKS}")
+        spk = bytes.fromhex(fixed_key.p2wpkh_script)
+        self.log.debug(f"-> fixed non-range descriptor address {fixed_key.p2wpkh_addr}")
+        funding_wallet.send_to(from_node=node, scriptPubKey=spk, amount=10000)
+        num_txs += 1
+        self.generate(node, 1)
+        append_fast_rescan_message()
+
         self.log.info("Create txs sending to end range address of each descriptor, triggering top-ups")
-        for i in range(NUM_BLOCKS):
-            self.log.info(f"Block {i+1}/{NUM_BLOCKS}")
-            for desc_info in w.listdescriptors()['descriptors']:
-                if 'range' in desc_info:
-                    start_range, end_range = desc_info['range']
-                    addr = w.deriveaddresses(desc_info['desc'], [end_range, end_range])[0]
-                    spk = address_to_scriptpubkey(addr)
-                    self.log.info(f"-> range [{start_range},{end_range}], last address {addr}")
-                else:
-                    spk = bytes.fromhex(fixed_key.p2wpkh_script)
-                    self.log.info(f"-> fixed non-range descriptor address {fixed_key.p2wpkh_addr}")
-                wallet.send_to(from_node=node, scriptPubKey=spk, amount=10000)
+        for i in range(1, NUM_BLOCKS):
+            self.log.debug(f"Block {i+1}/{NUM_BLOCKS}")
+            # Get descriptors with updated ranges
+            ranged_descs = [desc for desc in w.listdescriptors()['descriptors'] if 'range' in desc]
+            for desc_info in ranged_descs:
+                start_range, end_range = desc_info['range']
+                addr = w.deriveaddresses(desc_info['desc'], [end_range, end_range])[0]
+                spk = address_to_scriptpubkey(addr)
+                self.log.debug(f"-> range [{start_range},{end_range}], last address {addr}")
+                funding_wallet.send_to(from_node=node, scriptPubKey=spk, amount=10000)
+                num_txs += 1
             self.generate(node, 1)
+            append_fast_rescan_message()
 
         self.log.info("Import wallet backup with block filter index")
-        with node.assert_debug_log(['fast variant using block filters']):
+        with node.assert_debug_log(['fast variant using block filters', *fast_rescan_messages]):
             node.restorewallet('rescan_fast', WALLET_BACKUP_FILENAME)
         txids_fast = self.get_wallet_txids(node, 'rescan_fast')
 
         self.log.info("Import non-active descriptors with block filter index")
         node.createwallet(wallet_name='rescan_fast_nonactive', disable_private_keys=True, blank=True)
-        with node.assert_debug_log(['fast variant using block filters']):
+        with node.assert_debug_log(['fast variant using block filters', *fast_rescan_messages]):
             w = node.get_wallet_rpc('rescan_fast_nonactive')
             w.importdescriptors([{"desc": descriptor['desc'], "timestamp": 0} for descriptor in descriptors])
         txids_fast_nonactive = self.get_wallet_txids(node, 'rescan_fast_nonactive')
@@ -86,10 +100,10 @@ def run_test(self):
         txids_slow_nonactive = self.get_wallet_txids(node, 'rescan_slow_nonactive')
 
         self.log.info("Verify that all rescans found the same txs in slow and fast variants")
-        assert_equal(len(txids_slow), NUM_DESCRIPTORS * NUM_BLOCKS)
-        assert_equal(len(txids_fast), NUM_DESCRIPTORS * NUM_BLOCKS)
-        assert_equal(len(txids_slow_nonactive), NUM_DESCRIPTORS * NUM_BLOCKS)
-        assert_equal(len(txids_fast_nonactive), NUM_DESCRIPTORS * NUM_BLOCKS)
+        assert_equal(len(txids_slow), num_txs)
+        assert_equal(len(txids_fast), num_txs)
+        assert_equal(len(txids_slow_nonactive), num_txs)
+        assert_equal(len(txids_fast_nonactive), num_txs)
         assert_equal(sorted(txids_slow), sorted(txids_fast))
         assert_equal(sorted(txids_slow_nonactive), sorted(txids_fast_nonactive))
 
diff --git a/test/functional/wallet_fundrawtransaction.py b/test/functional/wallet_fundrawtransaction.py
index 0d435a35e919..a00e7e682dd3 100755
--- a/test/functional/wallet_fundrawtransaction.py
+++ b/test/functional/wallet_fundrawtransaction.py
@@ -785,7 +785,7 @@ def test_all_watched_funds(self):
         result = wwatch.fundrawtransaction(rawtx, changeAddress=w3.getrawchangeaddress(), subtractFeeFromOutputs=[0])
         res_dec = self.nodes[0].decoderawtransaction(result["hex"])
         assert_equal(len(res_dec["vin"]), 1)
-        assert res_dec["vin"][0]["txid"] == self.watchonly_utxo['txid']
+        assert_equal(res_dec["vin"][0]["txid"], self.watchonly_utxo['txid'])
 
         assert_greater_than(result["fee"], 0)
         assert_equal(result["changepos"], -1)
@@ -1481,7 +1481,7 @@ def test_input_confs_control(self):
         assert_equal(len(tx1_inputs), 1)
 
         utxo1 = tx1_inputs[0]
-        assert unconfirmed_txid == utxo1['txid']
+        assert_equal(unconfirmed_txid, utxo1['txid'])
 
         final_tx1 = wallet.signrawtransactionwithwallet(funded_tx1)['hex']
         txid1 = self.nodes[0].sendrawtransaction(final_tx1)
diff --git a/test/functional/wallet_gethdkeys.py b/test/functional/wallet_gethdkeys.py
index 9325627917ae..d25ed4ed24a6 100755
--- a/test/functional/wallet_gethdkeys.py
+++ b/test/functional/wallet_gethdkeys.py
@@ -10,6 +10,7 @@
     assert_equal,
     assert_raises_rpc_error,
     assert_not_equal,
+    assert_greater_than,
 )
 from test_framework.wallet_util import WalletUnlock
 
@@ -130,31 +131,46 @@ def test_lone_key_imports(self):
 
     def test_ranged_multisig(self):
         self.log.info("HD keys of a multisig appear in gethdkeys")
+
         def_wallet = self.nodes[0].get_wallet_rpc(self.default_wallet_name)
+        outside_wallet_xpub = def_wallet.gethdkeys()[0]["xpub"]
+
         self.nodes[0].createwallet("ranged_multisig")
         wallet = self.nodes[0].get_wallet_rpc("ranged_multisig")
 
-        xpub1 = wallet.gethdkeys()[0]["xpub"]
-        xprv1 = wallet.gethdkeys(private=True)[0]["xprv"]
-        xpub2 = def_wallet.gethdkeys()[0]["xpub"]
+        hdkeys_info = wallet.gethdkeys(private=True)
+        assert_equal(len(hdkeys_info), 1)
+        within_wallet_xprv = hdkeys_info[0]["xprv"]
+        within_wallet_xpub = hdkeys_info[0]["xpub"]
 
-        prv_multi_desc = descsum_create(f"wsh(multi(2,{xprv1}/*,{xpub2}/*))")
-        pub_multi_desc = descsum_create(f"wsh(multi(2,{xpub1}/*,{xpub2}/*))")
+        prv_multi_desc = descsum_create(f"wsh(multi(2,{within_wallet_xprv}/*,{outside_wallet_xpub}/*))")
+        pub_multi_desc = descsum_create(f"wsh(multi(2,{within_wallet_xpub}/*,{outside_wallet_xpub}/*))")
         assert_equal(wallet.importdescriptors([{"desc": prv_multi_desc, "timestamp": "now"}])[0]["success"], True)
 
-        xpub_info = wallet.gethdkeys()
-        assert_equal(len(xpub_info), 2)
-        for x in xpub_info:
-            if x["xpub"] == xpub1:
-                found_desc = next((d for d in xpub_info[0]["descriptors"] if d["desc"] == pub_multi_desc), None)
-                assert found_desc is not None
+        rpcs_req_resp = [[False, wallet.gethdkeys()], [True, wallet.gethdkeys(private=True)]]
+        for rpc_req_resp in rpcs_req_resp:
+            requested_private, hdkeys_response = rpc_req_resp
+            assert_equal(len(hdkeys_response), 2)
+
+            for hdkeys_info in hdkeys_response:
+                if hdkeys_info["xpub"] == within_wallet_xpub:
+                    assert_equal(hdkeys_info["has_private"], True)
+                    if requested_private:
+                        assert_equal(hdkeys_info["xprv"], within_wallet_xprv)
+                    else:
+                        assert_equal("xprv" not in hdkeys_info, True)
+                    assert_greater_than(len(hdkeys_info["descriptors"]), 1) # within wallet xpub by default is part of multiple descriptors
+                    found_desc = next((d for d in hdkeys_info["descriptors"] if d["desc"] == pub_multi_desc), None)
+                elif hdkeys_info["xpub"] == outside_wallet_xpub:
+                    assert_equal(hdkeys_info["has_private"], False)
+                    assert_equal("xprv" not in hdkeys_info, True)
+                    assert_equal(len(hdkeys_info["descriptors"]), 1) # outside wallet xpub is part of only the imported descriptor
+                    found_desc = hdkeys_info["descriptors"][0]
+                else:
+                    assert False
+
+                assert_equal(found_desc["desc"], pub_multi_desc)
                 assert_equal(found_desc["active"], False)
-            elif x["xpub"] == xpub2:
-                assert_equal(len(x["descriptors"]), 1)
-                assert_equal(x["descriptors"][0]["desc"], pub_multi_desc)
-                assert_equal(x["descriptors"][0]["active"], False)
-            else:
-                assert False
 
     def test_mixed_multisig(self):
         self.log.info("Non-HD keys of a multisig do not appear in gethdkeys")
diff --git a/test/functional/wallet_hd.py b/test/functional/wallet_hd.py
index 62ad88d2d7d7..c130c731ce5a 100755
--- a/test/functional/wallet_hd.py
+++ b/test/functional/wallet_hd.py
@@ -70,8 +70,8 @@ def run_test(self):
         self.stop_node(1)
         # we need to delete the complete chain directory
         # otherwise node1 would auto-recover all funds in flag the keypool keys as used
-        shutil.rmtree(self.nodes[1].blocks_path)
-        shutil.rmtree(self.nodes[1].chain_path / "chainstate")
+        self.cleanup_folder(self.nodes[1].blocks_path)
+        self.cleanup_folder(self.nodes[1].chain_path / "chainstate")
         shutil.copyfile(
             self.nodes[1].datadir_path / "hd.bak",
             self.nodes[1].wallets_path / self.default_wallet_name / self.wallet_data_filename
@@ -95,8 +95,8 @@ def run_test(self):
 
         # Try a RPC based rescan
         self.stop_node(1)
-        shutil.rmtree(self.nodes[1].blocks_path)
-        shutil.rmtree(self.nodes[1].chain_path / "chainstate")
+        self.cleanup_folder(self.nodes[1].blocks_path)
+        self.cleanup_folder(self.nodes[1].chain_path / "chainstate")
         shutil.copyfile(
             self.nodes[1].datadir_path / "hd.bak",
             self.nodes[1].wallets_path / self.default_wallet_name / self.wallet_data_filename
diff --git a/test/functional/wallet_importdescriptors.py b/test/functional/wallet_importdescriptors.py
index fdaeae35afd6..bfb25c63ade5 100755
--- a/test/functional/wallet_importdescriptors.py
+++ b/test/functional/wallet_importdescriptors.py
@@ -723,12 +723,14 @@ def run_test(self):
             try:
                 self.nodes[0].cli("-rpcwallet=encrypted_wallet").walletlock()
             except JSONRPCException as e:
-                assert e.error["code"] == -4 and "Error: the wallet is currently being used to rescan the blockchain for related transactions. Please call `abortrescan` before locking the wallet." in e.error["message"]
+                assert_equal(e.error["code"], -4)
+                assert "Error: the wallet is currently being used to rescan the blockchain for related transactions. Please call `abortrescan` before locking the wallet." in e.error["message"]
 
             try:
                 self.nodes[0].cli("-rpcwallet=encrypted_wallet").walletpassphrasechange("passphrase", "newpassphrase")
             except JSONRPCException as e:
-                assert e.error["code"] == -4 and "Error: the wallet is currently being used to rescan the blockchain for related transactions. Please call `abortrescan` before changing the passphrase." in e.error["message"]
+                assert_equal(e.error["code"], -4)
+                assert "Error: the wallet is currently being used to rescan the blockchain for related transactions. Please call `abortrescan` before changing the passphrase." in e.error["message"]
 
             assert_equal(importing.result(), [{"success": True}])
 
diff --git a/test/functional/wallet_importprunedfunds.py b/test/functional/wallet_importprunedfunds.py
index 1948cb9278b0..95e2a5b3a4f6 100755
--- a/test/functional/wallet_importprunedfunds.py
+++ b/test/functional/wallet_importprunedfunds.py
@@ -90,13 +90,13 @@ def run_test(self):
         wwatch = self.nodes[1].get_wallet_rpc('wwatch')
         wwatch.importdescriptors([{"desc": self.nodes[0].getaddressinfo(address2)["desc"], "timestamp": "now"}])
         wwatch.importprunedfunds(rawtransaction=rawtxn2, txoutproof=proof2)
-        assert [tx for tx in wwatch.listtransactions() if tx['txid'] == txnid2]
+        assert txnid2 in [tx['txid'] for tx in wwatch.listtransactions()]
 
         # Import with private key with no rescan
         w1 = self.nodes[1].get_wallet_rpc(self.default_wallet_name)
         wallet_importprivkey(w1, address3_privkey, "now")
         w1.importprunedfunds(rawtxn3, proof3)
-        assert [tx for tx in w1.listtransactions() if tx['txid'] == txnid3]
+        assert txnid3 in [tx['txid'] for tx in w1.listtransactions()]
         balance3 = w1.getbalance()
         assert_equal(balance3, Decimal('0.025'))
 
@@ -110,13 +110,13 @@ def run_test(self):
 
         # Remove transactions
         assert_raises_rpc_error(-4, f'Transaction {txnid1} does not belong to this wallet', w1.removeprunedfunds, txnid1)
-        assert not [tx for tx in w1.listtransactions() if tx['txid'] == txnid1]
+        assert txnid1 not in [tx['txid'] for tx in w1.listtransactions()]
 
         wwatch.removeprunedfunds(txnid2)
-        assert not [tx for tx in wwatch.listtransactions() if tx['txid'] == txnid2]
+        assert txnid2 not in [tx['txid'] for tx in wwatch.listtransactions()]
 
         w1.removeprunedfunds(txnid3)
-        assert not [tx for tx in w1.listtransactions() if tx['txid'] == txnid3]
+        assert txnid3 not in [tx['txid'] for tx in w1.listtransactions()]
 
         # Check various RPC parameter validation errors
         assert_raises_rpc_error(-22, "TX decode failed", w1.importprunedfunds, b'invalid tx'.hex(), proof1)
diff --git a/test/functional/wallet_keypool.py b/test/functional/wallet_keypool.py
index a935b8543ce8..78c760db52dc 100755
--- a/test/functional/wallet_keypool.py
+++ b/test/functional/wallet_keypool.py
@@ -110,7 +110,7 @@ def run_test(self):
         addr.add(nodes[0].getnewaddress(address_type="bech32"))
         addr.add(nodes[0].getnewaddress(address_type="bech32"))
         addr.add(nodes[0].getnewaddress(address_type="bech32"))
-        assert len(addr) == 6
+        assert_equal(len(addr), 6)
         # remember keypool sizes
         wi = nodes[0].getwalletinfo()
         kp_size_before = [wi['keypoolsize_hd_internal'], wi['keypoolsize']]
diff --git a/test/functional/wallet_listdescriptors.py b/test/functional/wallet_listdescriptors.py
index e7d33cc2dc79..98938f1bdd9a 100755
--- a/test/functional/wallet_listdescriptors.py
+++ b/test/functional/wallet_listdescriptors.py
@@ -46,8 +46,8 @@ def run_test(self):
         assert_equal(4, len([d for d in result['descriptors'] if d['internal']]))
         for item in result['descriptors']:
             assert_not_equal(item['desc'], '')
-            assert item['next_index'] == 0
-            assert item['range'] == [0, 0]
+            assert_equal(item['next_index'], 0)
+            assert_equal(item['range'], [0, 0])
             assert item['timestamp'] is not None
 
         self.log.info('Test that descriptor strings are returned in lexicographically sorted order.')
diff --git a/test/functional/wallet_listsinceblock.py b/test/functional/wallet_listsinceblock.py
index 2b7ec635039c..0517c2aacde1 100755
--- a/test/functional/wallet_listsinceblock.py
+++ b/test/functional/wallet_listsinceblock.py
@@ -272,7 +272,7 @@ def test_double_spend(self):
 
         # listsinceblock(lastblockhash) should now include txid1, as seen from nodes[0]
         lsbres = self.nodes[0].listsinceblock(lastblockhash)
-        assert any(tx['txid'] == txid1 for tx in lsbres['removed'])
+        assert txid1 in [tx['txid'] for tx in lsbres['removed']]
 
         # but it should not include 'removed' if include_removed=false
         lsbres2 = self.nodes[0].listsinceblock(blockhash=lastblockhash, include_removed=False)
@@ -354,8 +354,8 @@ def test_double_send(self):
         # listsinceblock(lastblockhash) should now include txid1 in transactions
         # as well as in removed
         lsbres = self.nodes[0].listsinceblock(lastblockhash)
-        assert any(tx['txid'] == txid1 for tx in lsbres['transactions'])
-        assert any(tx['txid'] == txid1 for tx in lsbres['removed'])
+        assert txid1 in [tx['txid'] for tx in lsbres['transactions']]
+        assert txid1 in [tx['txid'] for tx in lsbres['removed']]
 
         # find transaction and ensure confirmations is valid
         for tx in lsbres['transactions']:
@@ -463,14 +463,14 @@ def test_send_to_self(self):
 
         # If we don't list change, we won't have an entry for it.
         coins = self.nodes[2].listsinceblock(blockhash=block_hash)["transactions"]
-        assert not any(c["address"] == addr for c in coins)
+        assert addr not in [c["address"] for c in coins]
 
         # Now if we list change, we'll get both the send (to a change address) and
         # the actual change.
         res = self.nodes[2].listsinceblock(blockhash=block_hash, include_change=True)
         coins = [entry for entry in res["transactions"] if entry["category"] == "receive"]
         assert_equal(len(coins), 2)
-        assert any(c["address"] == addr for c in coins)
+        assert addr in [c["address"] for c in coins]
         assert all(self.nodes[2].getaddressinfo(c["address"])["ischange"] for c in coins)
 
     def test_op_return(self):
diff --git a/test/functional/wallet_migration.py b/test/functional/wallet_migration.py
index 45ebd435cde0..b1554902da46 100755
--- a/test/functional/wallet_migration.py
+++ b/test/functional/wallet_migration.py
@@ -3,6 +3,7 @@
 # Distributed under the MIT software license, see the accompanying
 # file COPYING or http://www.opensource.org/licenses/mit-license.php.
 """Test Migrating a wallet from legacy to descriptor."""
+from contextlib import suppress
 from pathlib import Path
 import os.path
 import random
@@ -664,8 +665,12 @@ def clear_default_wallet(self, backup_file):
         # Test cleanup: Clear unnamed default wallet for subsequent tests
         (self.old_node.wallets_path / "wallet.dat").unlink()
         (self.master_node.wallets_path / "wallet.dat").unlink(missing_ok=True)
-        shutil.rmtree(self.master_node.wallets_path / "default_wallet_watchonly", ignore_errors=True)
-        shutil.rmtree(self.master_node.wallets_path / "default_wallet_solvables", ignore_errors=True)
+        with suppress(FileNotFoundError):
+            (self.master_node.wallets_path / "default_wallet_watchonly" / "wallet.dat").unlink()
+            (self.master_node.wallets_path / "default_wallet_watchonly").rmdir()
+
+            (self.master_node.wallets_path / "default_wallet_solvables" / "wallet.dat").unlink()
+            (self.master_node.wallets_path / "default_wallet_solvables").rmdir()
         backup_file.unlink()
 
     def test_default_wallet(self):
@@ -977,7 +982,7 @@ def send_to_script(script, amount):
 
         # Also, the watch-only wallet should have the descriptor for the standard sh(pkh())
         desc = descsum_create(f"addr({addy_script_sh_pkh})")
-        assert next(it['desc'] for it in wallet_wo.listdescriptors()['descriptors'] if it['desc'] == desc)
+        assert desc in [it['desc'] for it in wallet_wo.listdescriptors()['descriptors']]
         # And doesn't have a descriptor for the invalid one
         desc_invalid = descsum_create(f"addr({addy_script_double_sh_pkh})")
         assert_equal(next((it['desc'] for it in wallet_wo.listdescriptors()['descriptors'] if it['desc'] == desc_invalid), None), None)
diff --git a/test/functional/wallet_miniscript.py b/test/functional/wallet_miniscript.py
index a086cf02e6d5..b6b452967811 100755
--- a/test/functional/wallet_miniscript.py
+++ b/test/functional/wallet_miniscript.py
@@ -213,7 +213,7 @@ def skip_test_if_missing_module(self):
     def watchonly_test(self, desc):
         self.log.info(f"Importing descriptor '{desc}'")
         desc = descsum_create(f"{desc}")
-        assert self.ms_wo_wallet.importdescriptors(
+        assert_equal(self.ms_wo_wallet.importdescriptors(
             [
                 {
                     "desc": desc,
@@ -223,7 +223,7 @@ def watchonly_test(self, desc):
                     "timestamp": "now",
                 }
             ]
-        )[0]["success"]
+        )[0]["success"], True)
 
         self.log.info("Testing we derive new addresses for it")
         addr_type = "bech32m" if desc.startswith("tr(") else "bech32"
@@ -243,7 +243,8 @@ def watchonly_test(self, desc):
             lambda: len(self.ms_wo_wallet.listunspent(minconf=0, addresses=[addr])) == 1
         )
         utxo = self.ms_wo_wallet.listunspent(minconf=0, addresses=[addr])[0]
-        assert utxo["txid"] == txid and utxo["solvable"]
+        assert_equal(utxo["txid"], txid)
+        assert_equal(utxo["solvable"], True)
 
     def signing_test(
         self, desc, sequence, locktime, sigs_count, stack_size, sha256_preimages
@@ -271,7 +272,8 @@ def signing_test(
         self.wait_until(lambda: txid in self.funder.getrawmempool())
         self.funder.generatetoaddress(1, self.funder.getnewaddress())
         utxo = self.ms_sig_wallet.listunspent(addresses=[addr])[0]
-        assert txid == utxo["txid"] and utxo["solvable"]
+        assert_equal(txid, utxo["txid"])
+        assert_equal(utxo["solvable"], True)
 
         self.log.info("Creating a transaction spending these funds")
         dest_addr = self.funder.getnewaddress()
@@ -299,9 +301,9 @@ def signing_test(
         res = self.ms_sig_wallet.walletprocesspsbt(psbt=psbt, finalize=False)
         psbtin = self.nodes[0].decodepsbt(res["psbt"])["inputs"][0]
         sigs_field_name = "taproot_script_path_sigs" if is_taproot else "partial_signatures"
-        assert len(psbtin[sigs_field_name]) == sigs_count
+        assert_equal(len(psbtin[sigs_field_name]), sigs_count)
         res = self.ms_sig_wallet.finalizepsbt(res["psbt"])
-        assert res["complete"] == (stack_size is not None)
+        assert_equal(res["complete"], stack_size is not None)
 
         if stack_size is not None:
             txin = self.nodes[0].decoderawtransaction(res["hex"])["vin"][0]
@@ -340,7 +342,7 @@ def run_test(self):
                 }
             ]
         )[0]
-        assert not res["success"]
+        assert_equal(res["success"], False)
         assert "is not sane: witnesses without signature exist" in res["error"]["message"]
 
         # Sanity check we wouldn't let an unspendable Miniscript descriptor in
@@ -392,7 +394,7 @@ def run_test(self):
                 }
             ]
         )[0]
-        assert not res["success"]
+        assert_equal(res["success"], False)
         assert "is not a valid descriptor function" in res["error"]["message"]
 
 
diff --git a/test/functional/wallet_multisig_descriptor_psbt.py b/test/functional/wallet_multisig_descriptor_psbt.py
index 7b8c8df29a8b..a3236a2249a4 100755
--- a/test/functional/wallet_multisig_descriptor_psbt.py
+++ b/test/functional/wallet_multisig_descriptor_psbt.py
@@ -86,9 +86,11 @@ def run_test(self):
         self.log.info("Check that every participant's multisig generates the same addresses...")
         for _ in range(10):  # we check that the first 10 generated addresses are the same for all participant's multisigs
             receive_addresses = [multisig.getnewaddress() for multisig in participants["multisigs"]]
-            assert all(address == receive_addresses[0] for address in receive_addresses)
+            for address in receive_addresses:
+                assert_equal(address, receive_addresses[0])
             change_addresses = [multisig.getrawchangeaddress() for multisig in participants["multisigs"]]
-            assert all(address == change_addresses[0] for address in change_addresses)
+            for address in change_addresses:
+                assert_equal(address, change_addresses[0])
 
         self.log.info("Get a mature utxo to send to the multisig...")
         coordinator_wallet = participants["signers"][0]
diff --git a/test/functional/wallet_multiwallet.py b/test/functional/wallet_multiwallet.py
index 07bd7cb204ca..5b9a23b593f5 100755
--- a/test/functional/wallet_multiwallet.py
+++ b/test/functional/wallet_multiwallet.py
@@ -39,6 +39,15 @@ def test_load_unload(node, name):
                 got_loading_error = True
                 return
 
+def data_dir(node, *p):
+    return os.path.join(node.chain_path, *p)
+
+def wallet_dir(node, *p):
+    return data_dir(node, 'wallets', *p)
+
+def get_wallet(node, name):
+    return node.get_wallet_rpc(name)
+
 
 class MultiWalletTest(BitcoinTestFramework):
     def set_test_params(self):
@@ -50,60 +59,76 @@ def set_test_params(self):
     def skip_test_if_missing_module(self):
         self.skip_if_no_wallet()
 
-    def add_options(self, parser):
-        parser.add_argument(
-            '--data_wallets_dir',
-            default=os.path.join(os.path.dirname(os.path.realpath(__file__)), 'data/wallets/'),
-            help='Test data with wallet directories (default: %(default)s)',
-        )
+    def wallet_file(self, node, name):
+        if name == self.default_wallet_name:
+            return wallet_dir(node, self.default_wallet_name, self.wallet_data_filename)
+        if os.path.isdir(wallet_dir(node, name)):
+            return wallet_dir(node, name, "wallet.dat")
+        return wallet_dir(node, name)
 
     def run_test(self):
-        node = self.nodes[0]
-
-        data_dir = lambda *p: os.path.join(node.chain_path, *p)
-        wallet_dir = lambda *p: data_dir('wallets', *p)
-        wallet = lambda name: node.get_wallet_rpc(name)
+        self.check_chmod = True
+        self.check_symlinks = True
+        if platform.system() == 'Windows':
+            # Additional context:
+            # - chmod: Posix has one user per file while Windows has an ACL approach
+            # - symlinks: GCC 13 has FIXME notes for symlinks under Windows:
+            #   https://gcc.gnu.org/git/?p=gcc.git;a=blob;f=libstdc%2B%2B-v3/src/filesystem/ops-common.h;h=ba377905a2e90f7baf30c900b090f1f732397e08;hb=refs/heads/releases/gcc-13#l124
+            self.log.warning('Skipping chmod+symlink checks on Windows: '
+                             'chmod works differently due to how access rights work and '
+                             'symlink behavior with regard to the standard library is non-standard on cross-built binaries.')
+            self.check_chmod = False
+            self.check_symlinks = False
+        elif os.geteuid() == 0:
+            self.log.warning('Skipping checks involving chmod as they require non-root permissions.')
+            self.check_chmod = False
 
-        def wallet_file(name):
-            if name == self.default_wallet_name:
-                return wallet_dir(self.default_wallet_name, self.wallet_data_filename)
-            if os.path.isdir(wallet_dir(name)):
-                return wallet_dir(name, "wallet.dat")
-            return wallet_dir(name)
+        node = self.nodes[0]
 
-        assert_equal(self.nodes[0].listwalletdir(), {'wallets': [{'name': self.default_wallet_name, "warnings": []}]})
+        assert_equal(node.listwalletdir(), {'wallets': [{'name': self.default_wallet_name, "warnings": []}]})
 
         # check wallet.dat is created
         self.stop_nodes()
-        assert_equal(os.path.isfile(wallet_dir(self.default_wallet_name, self.wallet_data_filename)), True)
+        assert_equal(os.path.isfile(wallet_dir(node, self.default_wallet_name, self.wallet_data_filename)), True)
+
+        self.test_scanning_main_dir_access(node)
+        empty_wallet, empty_created_wallet, wallet_names, in_wallet_dir = self.test_mixed_wallets(node)
+        self.test_scanning_sub_dir(node, in_wallet_dir)
+        self.test_scanning_symlink_levels(node, in_wallet_dir)
+        self.test_init(node, wallet_names)
+        self.test_balances_and_fees(node, wallet_names, in_wallet_dir)
+        w1, w2 = self.test_loading(node, wallet_names)
+        self.test_creation(node, in_wallet_dir)
+        self.test_unloading(node, in_wallet_dir, w1, w2)
+        self.test_backup_and_restore(node, wallet_names, empty_wallet, empty_created_wallet)
+        self.test_lock_file_closed(node)
+
+    def test_scanning_main_dir_access(self, node):
+        if not self.check_chmod:
+            return
 
         self.log.info("Verify warning is emitted when failing to scan the wallets directory")
-        if platform.system() == 'Windows':
-            self.log.warning('Skipping test involving chmod as Windows does not support it.')
-        elif os.geteuid() == 0:
-            self.log.warning('Skipping test involving chmod as it requires a non-root user.')
-        else:
-            self.start_node(0)
-            with self.nodes[0].assert_debug_log(unexpected_msgs=['Error scanning directory entries under'], expected_msgs=[]):
-                result = self.nodes[0].listwalletdir()
-                assert_equal(result, {'wallets': [{'name': 'default_wallet', 'warnings': []}]})
-            os.chmod(data_dir('wallets'), 0)
-            with self.nodes[0].assert_debug_log(expected_msgs=['Error scanning directory entries under']):
-                result = self.nodes[0].listwalletdir()
-                assert_equal(result, {'wallets': []})
-            self.stop_node(0)
-            # Restore permissions
-            os.chmod(data_dir('wallets'), stat.S_IRUSR | stat.S_IWUSR | stat.S_IXUSR)
+        self.start_node(0)
+        with node.assert_debug_log(unexpected_msgs=['Error scanning directory entries under'], expected_msgs=[]):
+            result = node.listwalletdir()
+            assert_equal(result, {'wallets': [{'name': 'default_wallet', 'warnings': []}]})
+        os.chmod(data_dir(node, 'wallets'), 0)
+        with node.assert_debug_log(expected_msgs=['Error scanning directory entries under']):
+            result = node.listwalletdir()
+            assert_equal(result, {'wallets': []})
+        self.stop_node(0)
+        # Restore permissions
+        os.chmod(data_dir(node, 'wallets'), stat.S_IRUSR | stat.S_IWUSR | stat.S_IXUSR)
 
+    def test_mixed_wallets(self, node):
+        self.log.info("Test mixed wallets")
         # create symlink to verify wallet directory path can be referenced
         # through symlink
-        os.mkdir(wallet_dir('w7'))
-        os.symlink('w7', wallet_dir('w7_symlink'))
+        os.mkdir(wallet_dir(node, 'w7'))
+        os.symlink('w7', wallet_dir(node, 'w7_symlink'))
 
-        os.symlink('..', wallet_dir('recursive_dir_symlink'))
-
-        os.mkdir(wallet_dir('self_walletdat_symlink'))
-        os.symlink('wallet.dat', wallet_dir('self_walletdat_symlink/wallet.dat'))
+        if self.check_symlinks:
+            os.symlink('..', wallet_dir(node, 'recursive_dir_symlink'))
 
         # rename wallet.dat to make sure plain wallet file paths (as opposed to
         # directory paths) can be loaded
@@ -114,13 +139,13 @@ def wallet_file(name):
         node.createwallet("created")
         self.stop_nodes()
         empty_wallet = os.path.join(self.options.tmpdir, 'empty.dat')
-        os.rename(wallet_file("empty"), empty_wallet)
-        shutil.rmtree(wallet_dir("empty"))
+        os.rename(self.wallet_file(node, "empty"), empty_wallet)
+        os.rmdir(wallet_dir(node, "empty"))
         empty_created_wallet = os.path.join(self.options.tmpdir, 'empty.created.dat')
-        os.rename(wallet_dir("created", self.wallet_data_filename), empty_created_wallet)
-        shutil.rmtree(wallet_dir("created"))
-        os.rename(wallet_file("plain"), wallet_dir("w8"))
-        shutil.rmtree(wallet_dir("plain"))
+        os.rename(wallet_dir(node, "created", self.wallet_data_filename), empty_created_wallet)
+        os.rmdir(wallet_dir(node, "created"))
+        os.rename(self.wallet_file(node, "plain"), wallet_dir(node, "w8"))
+        os.rmdir(wallet_dir(node, "plain"))
 
         # restart node with a mix of wallet names:
         #   w1, w2, w3 - to verify new wallets created when non-existing paths specified
@@ -139,83 +164,109 @@ def wallet_file(name):
         in_wallet_dir += to_load  # The loaded wallets are also in the wallet dir
         self.start_node(0)
         for wallet_name in to_create:
-            self.nodes[0].createwallet(wallet_name)
+            node.createwallet(wallet_name)
         for wallet_name in to_load:
-            self.nodes[0].loadwallet(wallet_name)
+            node.loadwallet(wallet_name)
 
-        os.mkdir(wallet_dir('no_access'))
-        os.chmod(wallet_dir('no_access'), 0)
-        try:
-            with self.nodes[0].assert_debug_log(expected_msgs=["Error while scanning wallet dir"]):
-                walletlist = self.nodes[0].listwalletdir()['wallets']
-        finally:
-            # Need to ensure access is restored for cleanup
-            os.chmod(wallet_dir('no_access'), stat.S_IRUSR | stat.S_IWUSR | stat.S_IXUSR)
+        return empty_wallet, empty_created_wallet, wallet_names, in_wallet_dir
+
+    def test_scanning_sub_dir(self, node, in_wallet_dir):
+        if not self.check_chmod:
+            return
+
+        self.log.info("Test scanning for sub directories")
+        # Baseline, no errors.
+        with node.assert_debug_log(expected_msgs=[], unexpected_msgs=["Error while scanning wallet dir"]):
+            walletlist = node.listwalletdir()['wallets']
         assert_equal(sorted(map(lambda w: w['name'], walletlist)), sorted(in_wallet_dir))
 
-        assert_equal(set(node.listwallets()), set(wallet_names))
+        # "Permission denied" error.
+        os.mkdir(wallet_dir(node, 'no_access'))
+        os.chmod(wallet_dir(node, 'no_access'), 0)
+        with node.assert_debug_log(expected_msgs=["Error while scanning wallet dir"]):
+            walletlist = node.listwalletdir()['wallets']
+        # Need to ensure access is restored for cleanup
+        os.chmod(wallet_dir(node, 'no_access'), stat.S_IRUSR | stat.S_IWUSR | stat.S_IXUSR)
+
+        # Verify that we no longer emit errors after restoring permissions
+        with node.assert_debug_log(expected_msgs=[], unexpected_msgs=["Error while scanning wallet dir"]):
+            walletlist = node.listwalletdir()['wallets']
+        assert_equal(sorted(map(lambda w: w['name'], walletlist)), sorted(in_wallet_dir))
 
-        # should raise rpc error if wallet path can't be created
-        err_code = -4
-        assert_raises_rpc_error(err_code, "filesystem error:" if platform.system() != 'Windows' else "create_directories:", self.nodes[0].createwallet, "w8/bad")
+    def test_scanning_symlink_levels(self, node, in_wallet_dir):
+        if not self.check_symlinks:
+            return
+
+        self.log.info("Test for errors from too many levels of symbolic links")
+        os.mkdir(wallet_dir(node, 'self_walletdat_symlink'))
+        os.symlink('wallet.dat', wallet_dir(node, 'self_walletdat_symlink/wallet.dat'))
+        with node.assert_debug_log(expected_msgs=["Error while scanning wallet dir"]):
+            walletlist = node.listwalletdir()['wallets']
+        assert_equal(sorted(map(lambda w: w['name'], walletlist)), sorted(in_wallet_dir))
 
+    def test_init(self, node, wallet_names):
+        self.log.info("Test initialization")
+        assert_equal(set(node.listwallets()), set(wallet_names))
         # check that all requested wallets were created
         self.stop_node(0)
         for wallet_name in wallet_names:
-            assert_equal(os.path.isfile(wallet_file(wallet_name)), True)
+            assert_equal(os.path.isfile(self.wallet_file(node, wallet_name)), True)
 
-        self.nodes[0].assert_start_raises_init_error(['-walletdir=wallets'], 'Error: Specified -walletdir "wallets" does not exist')
-        self.nodes[0].assert_start_raises_init_error(['-walletdir=wallets'], 'Error: Specified -walletdir "wallets" is a relative path', cwd=data_dir())
-        self.nodes[0].assert_start_raises_init_error(['-walletdir=debug.log'], 'Error: Specified -walletdir "debug.log" is not a directory', cwd=data_dir())
+        node.assert_start_raises_init_error(['-walletdir=wallets'], 'Error: Specified -walletdir "wallets" does not exist')
+        node.assert_start_raises_init_error(['-walletdir=wallets'], 'Error: Specified -walletdir "wallets" is a relative path', cwd=data_dir(node))
+        node.assert_start_raises_init_error(['-walletdir=debug.log'], 'Error: Specified -walletdir "debug.log" is not a directory', cwd=data_dir(node))
 
         self.start_node(0, ['-wallet=w1', '-wallet=w1'])
         self.stop_node(0, 'Warning: Ignoring duplicate -wallet w1.')
 
         # should not initialize if wallet file is a symlink
-        os.symlink('w8', wallet_dir('w8_symlink'))
-        self.nodes[0].assert_start_raises_init_error(['-wallet=w8_symlink'], r'Error: Invalid -wallet path \'w8_symlink\'\. .*', match=ErrorMatch.FULL_REGEX)
+        if self.check_symlinks:
+            os.symlink('w8', wallet_dir(node, 'w8_symlink'))
+            node.assert_start_raises_init_error(['-wallet=w8_symlink'], r'Error: Invalid -wallet path \'w8_symlink\'\. .*', match=ErrorMatch.FULL_REGEX)
 
         # should not initialize if the specified walletdir does not exist
-        self.nodes[0].assert_start_raises_init_error(['-walletdir=bad'], 'Error: Specified -walletdir "bad" does not exist')
+        node.assert_start_raises_init_error(['-walletdir=bad'], 'Error: Specified -walletdir "bad" does not exist')
         # should not initialize if the specified walletdir is not a directory
-        not_a_dir = wallet_dir('notadir')
+        not_a_dir = wallet_dir(node, 'notadir')
         open(not_a_dir, 'a').close()
-        self.nodes[0].assert_start_raises_init_error(['-walletdir=' + not_a_dir], 'Error: Specified -walletdir "' + not_a_dir + '" is not a directory')
+        node.assert_start_raises_init_error(['-walletdir=' + not_a_dir], 'Error: Specified -walletdir "' + not_a_dir + '" is not a directory')
 
         # if wallets/ doesn't exist, datadir should be the default wallet dir
-        wallet_dir2 = data_dir('walletdir')
-        os.rename(wallet_dir(), wallet_dir2)
+        wallet_dir2 = data_dir(node, 'walletdir')
+        os.rename(wallet_dir(node), wallet_dir2)
         self.start_node(0)
-        self.nodes[0].createwallet("w4")
-        self.nodes[0].createwallet("w5")
+        node.createwallet("w4")
+        node.createwallet("w5")
         assert_equal(set(node.listwallets()), {"w4", "w5"})
-        w5 = wallet("w5")
+        w5 = get_wallet(node, "w5")
         self.generatetoaddress(node, nblocks=1, address=w5.getnewaddress(), sync_fun=self.no_op)
 
         # now if wallets/ exists again, but the rootdir is specified as the walletdir, w4 and w5 should still be loaded
-        os.rename(wallet_dir2, wallet_dir())
-        self.restart_node(0, ['-nowallet', '-walletdir=' + data_dir()])
-        self.nodes[0].loadwallet("w4")
-        self.nodes[0].loadwallet("w5")
+        os.rename(wallet_dir2, wallet_dir(node))
+        self.restart_node(0, ['-nowallet', '-walletdir=' + data_dir(node)])
+        node.loadwallet("w4")
+        node.loadwallet("w5")
         assert_equal(set(node.listwallets()), {"w4", "w5"})
-        w5 = wallet("w5")
+        w5 = get_wallet(node, "w5")
         assert_equal(w5.getbalances()["mine"]["immature"], 50)
 
         competing_wallet_dir = os.path.join(self.options.tmpdir, 'competing_walletdir')
         os.mkdir(competing_wallet_dir)
         self.restart_node(0, ['-nowallet', '-walletdir=' + competing_wallet_dir])
-        self.nodes[0].createwallet(self.default_wallet_name)
+        node.createwallet(self.default_wallet_name)
         exp_stderr = f"Error: SQLiteDatabase: Unable to obtain an exclusive lock on the database, is it being used by another instance of {self.config['environment']['CLIENT_NAME']}?"
         self.nodes[1].assert_start_raises_init_error(['-walletdir=' + competing_wallet_dir], exp_stderr, match=ErrorMatch.PARTIAL_REGEX)
 
+    def test_balances_and_fees(self, node, wallet_names, in_wallet_dir):
+        self.log.info("Test balances and fees")
         self.restart_node(0)
         for wallet_name in wallet_names:
-            self.nodes[0].loadwallet(wallet_name)
+            node.loadwallet(wallet_name)
 
-        assert_equal(sorted(map(lambda w: w['name'], self.nodes[0].listwalletdir()['wallets'])), sorted(in_wallet_dir))
+        assert_equal(sorted(map(lambda w: w['name'], node.listwalletdir()['wallets'])), sorted(in_wallet_dir))
 
-        wallets = [wallet(w) for w in wallet_names]
-        wallet_bad = wallet("bad")
+        wallets = [get_wallet(node, w) for w in wallet_names]
+        wallet_bad = get_wallet(node, "bad")
 
         # check wallet names and balances
         self.generatetoaddress(node, nblocks=1, address=wallets[0].getnewaddress(), sync_fun=self.no_op)
@@ -249,6 +300,7 @@ def wallet_file(name):
         assert_equal(batch[0]["result"]["chain"], self.chain)
         assert_equal(batch[1]["result"]["walletname"], "w1")
 
+    def test_loading(self, node, wallet_names):
         self.log.info("Test dynamic wallet loading")
 
         self.restart_node(0, ['-nowallet'])
@@ -260,7 +312,7 @@ def wallet_file(name):
         assert_equal(loadwallet_name['name'], wallet_names[0])
         assert_equal(node.listwallets(), wallet_names[0:1])
         node.getwalletinfo()
-        w1 = node.get_wallet_rpc(wallet_names[0])
+        w1 = get_wallet(node, wallet_names[0])
         w1.getwalletinfo()
 
         self.log.info("Load second wallet")
@@ -268,7 +320,7 @@ def wallet_file(name):
         assert_equal(loadwallet_name['name'], wallet_names[1])
         assert_equal(node.listwallets(), wallet_names[0:2])
         assert_raises_rpc_error(-19, "Multiple wallets are loaded. Please select which wallet", node.getwalletinfo)
-        w2 = node.get_wallet_rpc(wallet_names[1])
+        w2 = get_wallet(node, wallet_names[1])
         w2.getwalletinfo()
 
         self.log.info("Concurrent wallet loading")
@@ -285,115 +337,125 @@ def wallet_file(name):
 
         self.log.info("Load remaining wallets")
         for wallet_name in wallet_names[2:]:
-            loadwallet_name = self.nodes[0].loadwallet(wallet_name)
+            loadwallet_name = node.loadwallet(wallet_name)
             assert_equal(loadwallet_name['name'], wallet_name)
 
-        assert_equal(set(self.nodes[0].listwallets()), set(wallet_names))
+        assert_equal(set(node.listwallets()), set(wallet_names))
 
         # Fail to load if wallet doesn't exist
-        path = wallet_dir("wallets")
-        assert_raises_rpc_error(-18, "Wallet file verification failed. Failed to load database path '{}'. Path does not exist.".format(path), self.nodes[0].loadwallet, 'wallets')
+        path = wallet_dir(node, "wallets")
+        assert_raises_rpc_error(-18, "Wallet file verification failed. Failed to load database path '{}'. Path does not exist.".format(path), node.loadwallet, 'wallets')
 
         # Fail to load duplicate wallets
-        assert_raises_rpc_error(-35, "Wallet \"w1\" is already loaded.", self.nodes[0].loadwallet, wallet_names[0])
+        assert_raises_rpc_error(-35, "Wallet \"w1\" is already loaded.", node.loadwallet, wallet_names[0])
         # Fail to load if wallet file is a symlink
-        assert_raises_rpc_error(-4, "Wallet file verification failed. Invalid -wallet path 'w8_symlink'", self.nodes[0].loadwallet, 'w8_symlink')
+        if self.check_symlinks:
+            assert_raises_rpc_error(-4, "Wallet file verification failed. Invalid -wallet path 'w8_symlink'", node.loadwallet, 'w8_symlink')
 
         # Fail to load if a directory is specified that doesn't contain a wallet
-        os.mkdir(wallet_dir('empty_wallet_dir'))
-        path = wallet_dir("empty_wallet_dir")
-        assert_raises_rpc_error(-18, "Wallet file verification failed. Failed to load database path '{}'. Data is not in recognized format.".format(path), self.nodes[0].loadwallet, 'empty_wallet_dir')
+        os.mkdir(wallet_dir(node, 'empty_wallet_dir'))
+        path = wallet_dir(node, "empty_wallet_dir")
+        assert_raises_rpc_error(-18, "Wallet file verification failed. Failed to load database path '{}'. Data is not in recognized format.".format(path), node.loadwallet, 'empty_wallet_dir')
+
+        return w1, w2
+
+    def test_creation(self, node, in_wallet_dir):
+        self.log.info("Test dynamic wallet creation")
 
-        self.log.info("Test dynamic wallet creation.")
+        # should raise rpc error if wallet path can't be created
+        err_code = -4
+        assert_raises_rpc_error(err_code, "Wallet file verification failed. ", node.createwallet, "w8/bad")
 
         # Fail to create a wallet if it already exists.
-        path = wallet_dir("w2")
-        assert_raises_rpc_error(-4, "Failed to create database path '{}'. Database already exists.".format(path), self.nodes[0].createwallet, 'w2')
+        path = wallet_dir(node, "w2")
+        assert_raises_rpc_error(-4, "Failed to create database path '{}'. Database already exists.".format(path), node.createwallet, 'w2')
 
         # Successfully create a wallet with a new name
-        loadwallet_name = self.nodes[0].createwallet('w9')
+        loadwallet_name = node.createwallet('w9')
         in_wallet_dir.append('w9')
         assert_equal(loadwallet_name['name'], 'w9')
-        w9 = node.get_wallet_rpc('w9')
+        w9 = get_wallet(node, 'w9')
         assert_equal(w9.getwalletinfo()['walletname'], 'w9')
 
-        assert 'w9' in self.nodes[0].listwallets()
+        assert 'w9' in node.listwallets()
 
         # Successfully create a wallet using a full path
         new_wallet_dir = os.path.join(self.options.tmpdir, 'new_walletdir')
         new_wallet_name = os.path.join(new_wallet_dir, 'w10')
-        loadwallet_name = self.nodes[0].createwallet(new_wallet_name)
+        loadwallet_name = node.createwallet(new_wallet_name)
         assert_equal(loadwallet_name['name'], new_wallet_name)
-        w10 = node.get_wallet_rpc(new_wallet_name)
+        w10 = get_wallet(node, new_wallet_name)
         assert_equal(w10.getwalletinfo()['walletname'], new_wallet_name)
 
-        assert new_wallet_name in self.nodes[0].listwallets()
+        assert new_wallet_name in node.listwallets()
 
+    def test_unloading(self, node, in_wallet_dir, w1, w2):
         self.log.info("Test dynamic wallet unloading")
 
         # Test `unloadwallet` errors
-        assert_raises_rpc_error(-8, "Either the RPC endpoint wallet or the wallet name parameter must be provided", self.nodes[0].unloadwallet)
-        assert_raises_rpc_error(-18, "Requested wallet does not exist or is not loaded", self.nodes[0].unloadwallet, "dummy")
-        assert_raises_rpc_error(-18, "Requested wallet does not exist or is not loaded", node.get_wallet_rpc("dummy").unloadwallet)
+        assert_raises_rpc_error(-8, "Either the RPC endpoint wallet or the wallet name parameter must be provided", node.unloadwallet)
+        assert_raises_rpc_error(-18, "Requested wallet does not exist or is not loaded", node.unloadwallet, "dummy")
+        assert_raises_rpc_error(-18, "Requested wallet does not exist or is not loaded", get_wallet(node, "dummy").unloadwallet)
         assert_raises_rpc_error(-8, "The RPC endpoint wallet and the wallet name parameter specify different wallets", w1.unloadwallet, "w2"),
 
         # Successfully unload the specified wallet name
-        self.nodes[0].unloadwallet("w1")
-        assert 'w1' not in self.nodes[0].listwallets()
+        node.unloadwallet("w1")
+        assert 'w1' not in node.listwallets()
 
         # Unload w1 again, this time providing the wallet name twice
-        self.nodes[0].loadwallet("w1")
-        assert 'w1' in self.nodes[0].listwallets()
+        node.loadwallet("w1")
+        assert 'w1' in node.listwallets()
         w1.unloadwallet("w1")
-        assert 'w1' not in self.nodes[0].listwallets()
+        assert 'w1' not in node.listwallets()
 
         # Successfully unload the wallet referenced by the request endpoint
         # Also ensure unload works during walletpassphrase timeout
         w2.encryptwallet('test')
         w2.walletpassphrase('test', 1)
         w2.unloadwallet()
-        ensure_for(duration=1.1, f=lambda: 'w2' not in self.nodes[0].listwallets())
+        ensure_for(duration=1.1, f=lambda: 'w2' not in node.listwallets())
 
         # Successfully unload all wallets
-        for wallet_name in self.nodes[0].listwallets():
-            self.nodes[0].unloadwallet(wallet_name)
-        assert_equal(self.nodes[0].listwallets(), [])
-        assert_raises_rpc_error(-18, "No wallet is loaded. Load a wallet using loadwallet or create a new one with createwallet. (Note: A default wallet is no longer automatically created)", self.nodes[0].getwalletinfo)
+        for wallet_name in node.listwallets():
+            node.unloadwallet(wallet_name)
+        assert_equal(node.listwallets(), [])
+        assert_raises_rpc_error(-18, "No wallet is loaded. Load a wallet using loadwallet or create a new one with createwallet. (Note: A default wallet is no longer automatically created)", node.getwalletinfo)
 
         # Successfully load a previously unloaded wallet
-        self.nodes[0].loadwallet('w1')
-        assert_equal(self.nodes[0].listwallets(), ['w1'])
+        node.loadwallet('w1')
+        assert_equal(node.listwallets(), ['w1'])
         assert_equal(w1.getwalletinfo()['walletname'], 'w1')
 
-        assert_equal(sorted(map(lambda w: w['name'], self.nodes[0].listwalletdir()['wallets'])), sorted(in_wallet_dir))
+        assert_equal(sorted(map(lambda w: w['name'], node.listwalletdir()['wallets'])), sorted(in_wallet_dir))
 
-        # Test backing up and restoring wallets
-        self.log.info("Test wallet backup")
+    def test_backup_and_restore(self, node, wallet_names, empty_wallet, empty_created_wallet):
+        self.log.info("Test wallet backup and restore")
         self.restart_node(0, ['-nowallet'])
         for wallet_name in wallet_names:
-            self.nodes[0].loadwallet(wallet_name)
+            node.loadwallet(wallet_name)
         for wallet_name in wallet_names:
-            rpc = self.nodes[0].get_wallet_rpc(wallet_name)
+            rpc = get_wallet(node, wallet_name)
             addr = rpc.getnewaddress()
             backup = os.path.join(self.options.tmpdir, 'backup.dat')
             if os.path.exists(backup):
                 os.unlink(backup)
             rpc.backupwallet(backup)
-            self.nodes[0].unloadwallet(wallet_name)
-            shutil.copyfile(empty_created_wallet if wallet_name == self.default_wallet_name else empty_wallet, wallet_file(wallet_name))
-            self.nodes[0].loadwallet(wallet_name)
+            node.unloadwallet(wallet_name)
+            shutil.copyfile(empty_created_wallet if wallet_name == self.default_wallet_name else empty_wallet, self.wallet_file(node, wallet_name))
+            node.loadwallet(wallet_name)
             assert_equal(rpc.getaddressinfo(addr)['ismine'], False)
-            self.nodes[0].unloadwallet(wallet_name)
-            shutil.copyfile(backup, wallet_file(wallet_name))
-            self.nodes[0].loadwallet(wallet_name)
+            node.unloadwallet(wallet_name)
+            shutil.copyfile(backup, self.wallet_file(node, wallet_name))
+            node.loadwallet(wallet_name)
             assert_equal(rpc.getaddressinfo(addr)['ismine'], True)
 
-        # Test .walletlock file is closed
+    def test_lock_file_closed(self, node):
+        self.log.info("Test wallet lock file is closed")
         self.start_node(1)
         wallet = os.path.join(self.options.tmpdir, 'my_wallet')
-        self.nodes[0].createwallet(wallet)
+        node.createwallet(wallet)
         assert_raises_rpc_error(-4, "Unable to obtain an exclusive lock", self.nodes[1].loadwallet, wallet)
-        self.nodes[0].unloadwallet(wallet)
+        node.unloadwallet(wallet)
         self.nodes[1].loadwallet(wallet)
 
 
diff --git a/test/functional/wallet_reindex.py b/test/functional/wallet_reindex.py
index 71ab69e01bf2..a4180897bf4e 100755
--- a/test/functional/wallet_reindex.py
+++ b/test/functional/wallet_reindex.py
@@ -60,10 +60,8 @@ def birthtime_test(self, node, miner_wallet):
         assert_equal(wallet_watch_only.gettransaction(tx_id)['confirmations'], 50)
         assert_equal(wallet_watch_only.getbalances()['mine']['trusted'], 2)
 
-        # Reindex and wait for it to finish
-        with node.assert_debug_log(expected_msgs=["initload thread exit"]):
-            self.restart_node(0, extra_args=['-reindex=1', f'-mocktime={self.node_time}'])
-        node.syncwithvalidationinterfacequeue()
+        self.log.info("Reindex ...")  # restart_node waits for it to finish
+        self.restart_node(0, extra_args=[ f'-mocktime={self.node_time}'])
 
         # Verify the transaction is still 'confirmed' after reindex
         wallet_watch_only = node.get_wallet_rpc('watch_only')
diff --git a/test/functional/wallet_reorgsrestore.py b/test/functional/wallet_reorgsrestore.py
index 00693db85d19..763c46174b13 100755
--- a/test/functional/wallet_reorgsrestore.py
+++ b/test/functional/wallet_reorgsrestore.py
@@ -42,7 +42,8 @@ def test_coinbase_automatic_abandon_during_startup(self):
         self.connect_nodes(1, 0)
         self.sync_blocks(self.nodes[:2])
         self.disconnect_nodes(1, 0)
-        assert all(len(node.getpeerinfo()) == 0 for node in self.nodes[:2])
+        for node in self.nodes[:2]:
+            assert_equal(len(node.getpeerinfo()), 0)
 
         # Create a new block in node0, coinbase going to wallet0
         self.nodes[0].createwallet(wallet_name="w0", load_on_startup=True)
@@ -72,7 +73,7 @@ def test_coinbase_automatic_abandon_during_startup(self):
         # Stop both nodes and replace node0 chain entirely for the node1 chain
         self.stop_nodes()
         for path in ["chainstate", "blocks"]:
-            shutil.rmtree(self.nodes[0].chain_path / path)
+            self.cleanup_folder(self.nodes[0].chain_path / path)
             shutil.copytree(self.nodes[1].chain_path / path, self.nodes[0].chain_path / path)
 
         # Start node0 and verify that now it has node1 chain and no info about its previous best block
diff --git a/test/functional/wallet_resendwallettransactions.py b/test/functional/wallet_resendwallettransactions.py
index 83ae6f5a5c7b..7f29e929b738 100755
--- a/test/functional/wallet_resendwallettransactions.py
+++ b/test/functional/wallet_resendwallettransactions.py
@@ -21,13 +21,21 @@
     try_rpc,
 )
 
+# 36 hours is the upper limit of the resend timer, see CWallet::SetNextResend()
+RESEND_TIMER_LIMIT = 36 * 60 * 60
+
+
 class ResendWalletTransactionsTest(BitcoinTestFramework):
     def set_test_params(self):
-        self.num_nodes = 1
+        self.num_nodes = 2
+        self.noban_tx_relay = True  # Needed due to mocktime
 
     def skip_test_if_missing_module(self):
         self.skip_if_no_wallet()
 
+    def setup_network(self):
+        self.setup_nodes()  # Don't connect nodes
+
     def run_test(self):
         node = self.nodes[0]  # alias
 
@@ -69,13 +77,11 @@ def run_test(self):
         self.log.info("Bump time & check that transaction is rebroadcast")
         # Transaction should be rebroadcast approximately 24 hours in the future,
         # but can range from 12-36. So bump 36 hours to be sure.
-        with node.assert_debug_log(['resubmit 1 unconfirmed transactions'], timeout=2):
-            node.setmocktime(now + 36 * 60 * 60)
+        with node.assert_debug_log(['resubmit 1 unconfirmed transactions']):
+            node.setmocktime(now + RESEND_TIMER_LIMIT)
             # Tell scheduler to call MaybeResendWalletTxs now.
             node.mockscheduler(60)
-        # Give some time for trickle to occur
-        node.setmocktime(now + 36 * 60 * 60 + 600)
-        peer_second.wait_for_broadcast([txid])
+            peer_second.wait_for_broadcast([txid])
 
         self.log.info("Chain of unconfirmed not-in-mempool txs are rebroadcast")
         # This tests that the node broadcasts the parent transaction before the child transaction.
@@ -117,6 +123,7 @@ def run_test(self):
             child_txid = bumped_txid
         entry_time = node.getmempoolentry(child_txid)["time"]
 
+        # tx must be at least 5 minutes older than the last block to be rebroadcast
         block_time = entry_time + 6 * 60
         node.setmocktime(block_time)
         block = create_block(int(node.getbestblockhash(), 16), create_coinbase(node.getblockcount() + 1), block_time)
@@ -139,11 +146,47 @@ def run_test(self):
 
         # Rebroadcast and check that parent and child are both in the mempool
         with node.assert_debug_log(['resubmit 2 unconfirmed transactions'], timeout=2):
-            node.setmocktime(evict_time + 36 * 60 * 60) # 36 hrs is the upper limit of the resend timer
+            node.setmocktime(evict_time + RESEND_TIMER_LIMIT)
             node.mockscheduler(60)
         node.getmempoolentry(txid)
         node.getmempoolentry(child_txid)
 
+        self.log.info("Test rebroadcast of transactions received by others")
+        # clear mempool
+        self.generate(node, 1, sync_fun=self.no_op)
+        # Sync node1's mocktime to node0's before connecting so it accepts node0's blocks
+        node1 = self.nodes[1]
+        node1.setmocktime(evict_time + RESEND_TIMER_LIMIT)
+        self.connect_nodes(1, 0)
+        self.sync_all()
+
+        self.log.info("node0 sends a tx to node1 and disconnects")
+        recv_addr = node1.getnewaddress()
+        recv_txid = node.sendtoaddress(recv_addr, 1)
+        self.sync_mempools()
+        node1.syncwithvalidationinterfacequeue()
+
+        wallet_tx = node1.gettransaction(recv_txid)
+        assert_equal(wallet_tx["confirmations"], 0)
+        recv_wtxid = node1.getmempoolentry(recv_txid)["wtxid"]
+        self.disconnect_nodes(0, 1)
+
+        self.log.info("Create a block without the transaction")
+        node1.bumpmocktime(6 * 60)
+        block = create_block(int(node1.getbestblockhash(), 16), create_coinbase(node1.getblockcount() + 1), node1.mocktime)
+        block.solve()
+        node1.submitblock(block.serialize().hex())
+        node1.syncwithvalidationinterfacequeue()
+
+        self.log.info("Connect p2p who hasn't seen the tx")
+        peer = node1.add_p2p_connection(P2PTxInvStore())
+
+        self.log.info("Check that rebroadcast happens after 36 hours")
+        with node1.assert_debug_log(['resubmit 1 unconfirmed transactions']):
+            node1.bumpmocktime(RESEND_TIMER_LIMIT)
+            node1.mockscheduler(60)
+            peer.wait_for_broadcast([recv_wtxid])
+
 
 if __name__ == '__main__':
     ResendWalletTransactionsTest(__file__).main()
diff --git a/test/functional/wallet_send.py b/test/functional/wallet_send.py
index ab8f74f20e8e..e6a740501e3e 100755
--- a/test/functional/wallet_send.py
+++ b/test/functional/wallet_send.py
@@ -392,7 +392,7 @@ def run_test(self):
         res = self.test_send(from_wallet=w0, to_wallet=w1, amount=1, add_to_wallet=False, change_type="legacy", change_position=0)
         assert res["complete"]
         change_address = self.nodes[0].decodepsbt(res["psbt"])["tx"]["vout"][0]["scriptPubKey"]["address"]
-        assert change_address[0] == "m" or change_address[0] == "n"
+        assert change_address[0] in ("m", "n")
 
         self.log.info("Set lock time...")
         height = self.nodes[0].getblockchaininfo()["blocks"]
diff --git a/test/functional/wallet_startup.py b/test/functional/wallet_startup.py
index d2355360ac29..fe35ee12f9ec 100755
--- a/test/functional/wallet_startup.py
+++ b/test/functional/wallet_startup.py
@@ -36,7 +36,7 @@ def create_unnamed_wallet(self, **kwargs):
         self.nodes[0].createwallet(wallet_name=wallet_name, **kwargs)
         self.nodes[0].unloadwallet(wallet_name)
         shutil.move(self.nodes[0].wallets_path / wallet_name / "wallet.dat", self.nodes[0].wallets_path / "wallet.dat")
-        shutil.rmtree(self.nodes[0].wallets_path / wallet_name)
+        (self.nodes[0].wallets_path / wallet_name).rmdir()
 
     def run_test(self):
         self.log.info('Should start without any wallets')
diff --git a/test/functional/wallet_txn_doublespend.py b/test/functional/wallet_txn_doublespend.py
index 4b61fa891eb1..8a0bf28b8ca1 100755
--- a/test/functional/wallet_txn_doublespend.py
+++ b/test/functional/wallet_txn_doublespend.py
@@ -43,7 +43,7 @@ def run_test(self):
         # blockchain sync later in the test when nodes are connected, due to
         # timing issues.
         for n in self.nodes:
-            assert n.getblockchaininfo()["initialblockdownload"] == False
+            assert_equal(n.getblockchaininfo()["initialblockdownload"], False)
 
         for i in range(3):
             assert_equal(self.nodes[i].getbalance(), starting_balance)
diff --git a/test/lint/README.md b/test/lint/README.md
index e98522a7e608..08703ab8efb0 100644
--- a/test/lint/README.md
+++ b/test/lint/README.md
@@ -52,7 +52,6 @@ or `--help`:
 | [`lint-python.py`](/test/lint/lint-python.py) | [lief](https://github.com/lief-project/LIEF)
 | [`lint-python.py`](/test/lint/lint-python.py) | [mypy](https://github.com/python/mypy)
 | [`lint-python.py`](/test/lint/lint-python.py) | [pyzmq](https://github.com/zeromq/pyzmq)
-| [`lint-python-dead-code.py`](/test/lint/lint-python-dead-code.py) | [vulture](https://github.com/jendrikseipp/vulture)
 | [`lint-shell.py`](/test/lint/lint-shell.py) | [ShellCheck](https://github.com/koalaman/shellcheck)
 | `py_lint` | [ruff](https://github.com/astral-sh/ruff)
 | markdown link check | [mlc](https://github.com/becheran/mlc)
diff --git a/test/lint/git-subtree-check.sh b/test/lint/git-subtree-check.sh
index 1eb83401f2ce..534fadbad710 100755
--- a/test/lint/git-subtree-check.sh
+++ b/test/lint/git-subtree-check.sh
@@ -47,33 +47,33 @@ fi
 # Taken from git-subtree (Copyright (C) 2009 Avery Pennarun <apenwarr@gmail.com>)
 find_latest_squash()
 {
-	dir="$1"
-	sq=
-	main=
-	sub=
-	git log --grep="^git-subtree-dir: $dir/*\$" \
-		--pretty=format:'START %H%n%s%n%n%b%nEND%n' "$COMMIT" |
-	while read a b _; do
-		case "$a" in
-			START) sq="$b" ;;
-			git-subtree-mainline:) main="$b" ;;
-			git-subtree-split:) sub="$b" ;;
-			END)
-				if [ -n "$sub" ]; then
-					if [ -n "$main" ]; then
-						# a rejoin commit?
-						# Pretend its sub was a squash.
-						sq="$sub"
-					fi
-					echo "$sq" "$sub"
-					break
-				fi
-				sq=
-				main=
-				sub=
-				;;
-		esac
-	done
+    dir="$1"
+    sq=
+    main=
+    sub=
+    git log --grep="^git-subtree-dir: $dir/*\$" \
+        --pretty=format:'START %H%n%s%n%n%b%nEND%n' "$COMMIT" |
+    while read a b _; do
+        case "$a" in
+            START) sq="$b" ;;
+            git-subtree-mainline:) main="$b" ;;
+            git-subtree-split:) sub="$b" ;;
+            END)
+                if [ -n "$sub" ]; then
+                    if [ -n "$main" ]; then
+                        # a rejoin commit?
+                        # Pretend its sub was a squash.
+                        sq="$sub"
+                    fi
+                    echo "$sq" "$sub"
+                    break
+                fi
+                sq=
+                main=
+                sub=
+                ;;
+        esac
+    done
 }
 
 # find latest subtree update
diff --git a/test/lint/lint-include-guards.py b/test/lint/lint-include-guards.py
index dbbf0325c4ed..4518f458d51a 100755
--- a/test/lint/lint-include-guards.py
+++ b/test/lint/lint-include-guards.py
@@ -19,7 +19,6 @@
 HEADER_ID_SUFFIX = '_H'
 
 EXCLUDE_FILES_WITH_PREFIX = ['contrib/devtools/bitcoin-tidy',
-                             'src/crypto/ctaes',
                              'src/tinyformat.h',
                              'src/bench/nanobench.h',
                              'src/test/fuzz/FuzzedDataProvider.h'] + SHARED_EXCLUDED_SUBTREES
diff --git a/test/lint/lint-includes.py b/test/lint/lint-includes.py
index 70c4e0e2e2f7..18f47240f9dd 100755
--- a/test/lint/lint-includes.py
+++ b/test/lint/lint-includes.py
@@ -31,9 +31,6 @@
                            "boost/multi_index/tag.hpp",
                            "boost/multi_index_container.hpp",
                            "boost/operators.hpp",
-                           "boost/signals2/connection.hpp",
-                           "boost/signals2/optional_last_value.hpp",
-                           "boost/signals2/signal.hpp",
                            "boost/test/included/unit_test.hpp",
                            "boost/test/unit_test.hpp",
                            "boost/tuple/tuple.hpp",
diff --git a/test/lint/lint-locale-dependence.py b/test/lint/lint-locale-dependence.py
index c6a645870912..4957c694dacd 100755
--- a/test/lint/lint-locale-dependence.py
+++ b/test/lint/lint-locale-dependence.py
@@ -40,6 +40,8 @@
 
 from subprocess import check_output, CalledProcessError
 
+from lint_ignore_dirs import SHARED_EXCLUDED_SUBTREES
+
 
 KNOWN_VIOLATIONS = [
     "src/dbwrapper.cpp:.*vsnprintf",
@@ -50,13 +52,8 @@
 ]
 
 REGEXP_EXTERNAL_DEPENDENCIES_EXCLUSIONS = [
-    "src/crypto/ctaes/",
-    "src/ipc/libmultiprocess/",
-    "src/leveldb/",
-    "src/secp256k1/",
-    "src/minisketch/",
     "src/tinyformat.h",
-]
+] + SHARED_EXCLUDED_SUBTREES
 
 LOCALE_DEPENDENT_FUNCTIONS = [
     "alphasort",    # LC_COLLATE (via strcoll)
diff --git a/test/lint/lint-python-dead-code.py b/test/lint/lint-python-dead-code.py
deleted file mode 100755
index cd6471e2ab7e..000000000000
--- a/test/lint/lint-python-dead-code.py
+++ /dev/null
@@ -1,41 +0,0 @@
-#!/usr/bin/env python3
-#
-# Copyright (c) 2022-present The Bitcoin Core developers
-# Distributed under the MIT software license, see the accompanying
-# file COPYING or http://www.opensource.org/licenses/mit-license.php.
-
-"""
-Find dead Python code.
-"""
-
-from subprocess import check_output, STDOUT, CalledProcessError
-
-FILES_ARGS = ['git', 'ls-files', '--', '*.py']
-
-
-def check_vulture_install():
-    try:
-        check_output(["vulture", "--version"])
-    except FileNotFoundError:
-        print("Skipping Python dead code linting since vulture is not installed. Install by running \"pip3 install vulture\"")
-        exit(0)
-
-
-def main():
-    check_vulture_install()
-
-    files = check_output(FILES_ARGS, text=True).splitlines()
-    # --min-confidence 100 will only report code that is guaranteed to be unused within the analyzed files.
-    # Any value below 100 introduces the risk of false positives, which would create an unacceptable maintenance burden.
-    vulture_args = ['vulture', '--min-confidence=100'] + files
-
-    try:
-        check_output(vulture_args, stderr=STDOUT, text=True)
-    except CalledProcessError as e:
-        print(e.output, end="")
-        print("Python dead code detection found some issues")
-        exit(1)
-
-
-if __name__ == "__main__":
-    main()
diff --git a/test/lint/lint-tests.py b/test/lint/lint-tests.py
index 919912dc6922..c7354bc41228 100755
--- a/test/lint/lint-tests.py
+++ b/test/lint/lint-tests.py
@@ -20,6 +20,7 @@ def grep_boost_fixture_test_suite():
         "-E",
         r"^BOOST_FIXTURE_TEST_SUITE\(",
         "--",
+        "src/ipc/test/**.cpp",
         "src/test/**.cpp",
         "src/wallet/test/**.cpp",
     ]
diff --git a/test/lint/lint_ignore_dirs.py b/test/lint/lint_ignore_dirs.py
index 838f01b66641..60637832309a 100644
--- a/test/lint/lint_ignore_dirs.py
+++ b/test/lint/lint_ignore_dirs.py
@@ -9,4 +9,5 @@
                  "src/secp256k1/",
                  "src/minisketch/",
                  "src/ipc/libmultiprocess/",
+                 "src/crypto/ctaes/",
                 ]
diff --git a/test/lint/test_runner/src/lint_cpp.rs b/test/lint/test_runner/src/lint_cpp.rs
index 4ad3c06d30b6..727c87584df4 100644
--- a/test/lint/test_runner/src/lint_cpp.rs
+++ b/test/lint/test_runner/src/lint_cpp.rs
@@ -122,6 +122,33 @@ fs:: namespace, which has unsafe filesystem functions marked as deleted.
     }
 }
 
+pub fn lint_remove_all() -> LintResult {
+    let found = git()
+        .args([
+            "grep",
+            "--line-number",
+            "remove_all(.*)",
+            "--",
+            "./src/",
+            // These are likely not avoidable.
+            ":(exclude)src/test/kernel/test_kernel.cpp",
+            ":(exclude)src/test/util/setup_common.cpp",
+        ])
+        .status()
+        .expect("command error")
+        .success();
+    if found {
+        Err(r#"
+Use of fs::remove_all or std::filesystem::remove_all is dangerous and should be avoided. If removal
+is required, prefer fs::remove.
+            "#
+        .trim()
+        .to_string())
+    } else {
+        Ok(())
+    }
+}
+
 pub fn lint_rpc_assert() -> LintResult {
     let found = git()
         .args([
diff --git a/test/lint/test_runner/src/lint_py.rs b/test/lint/test_runner/src/lint_py.rs
index d9177c86907a..7c5c0dae5a65 100644
--- a/test/lint/test_runner/src/lint_py.rs
+++ b/test/lint/test_runner/src/lint_py.rs
@@ -73,3 +73,28 @@ pub fn lint_py_lint() -> LintResult {
         Err(e) => Err(format!("Error running `{bin_name}`: {e}")),
     }
 }
+
+pub fn lint_rmtree() -> LintResult {
+    let found = git()
+        .args([
+            "grep",
+            "--line-number",
+            "rmtree",
+            "--",
+            "test/functional/",
+            ":(exclude)test/functional/test_framework/test_framework.py",
+        ])
+        .status()
+        .expect("command error")
+        .success();
+    if found {
+        Err(r#"
+Use of shutil.rmtree() is dangerous and should be avoided. If it
+is really required for the test, use self.cleanup_folder(_).
+            "#
+        .trim()
+        .to_string())
+    } else {
+        Ok(())
+    }
+}
diff --git a/test/lint/test_runner/src/lint_text_format.rs b/test/lint/test_runner/src/lint_text_format.rs
index ca51e6db0818..98e27d8ce103 100644
--- a/test/lint/test_runner/src/lint_text_format.rs
+++ b/test/lint/test_runner/src/lint_text_format.rs
@@ -18,17 +18,9 @@ fn get_pathspecs_exclude_whitespace() -> Vec<String> {
             "contrib/windeploy/win-codesign.cert",
             "doc/README_windows.txt",
             // Temporary excludes, or existing violations
-            "contrib/init/bitcoind.openrc",
-            "contrib/macdeploy/macdeployqtplus",
-            "src/crypto/sha256_sse4.cpp",
             "src/qt/res/src/*.svg",
             "test/functional/test_framework/crypto/ellswift_decode_test_vectors.csv",
             "test/functional/test_framework/crypto/xswiftec_inv_test_vectors.csv",
-            "contrib/qos/tc.sh",
-            "contrib/verify-commits/gpg.sh",
-            "src/univalue/include/univalue_escapes.h",
-            "src/univalue/test/object.cpp",
-            "test/lint/git-subtree-check.sh",
         ]
         .iter()
         .map(|s| format!(":(exclude){s}")),
diff --git a/test/lint/test_runner/src/main.rs b/test/lint/test_runner/src/main.rs
index fa69d2b5f9a9..7c0eb5858935 100644
--- a/test/lint/test_runner/src/main.rs
+++ b/test/lint/test_runner/src/main.rs
@@ -14,10 +14,11 @@ use std::fs;
 use std::process::{Command, ExitCode};
 
 use lint_cpp::{
-    lint_boost_assert, lint_includes_build_config, lint_rpc_assert, lint_std_filesystem,
+    lint_boost_assert, lint_includes_build_config, lint_remove_all, lint_rpc_assert,
+    lint_std_filesystem,
 };
 use lint_docs::{lint_doc_args, lint_doc_release_note_snippets, lint_markdown};
-use lint_py::lint_py_lint;
+use lint_py::{lint_py_lint, lint_rmtree};
 use lint_repo_hygiene::{lint_scripted_diff, lint_subtree};
 use lint_text_format::{
     lint_commit_msg, lint_tabs_whitespace, lint_trailing_newline, lint_trailing_whitespace,
@@ -52,11 +53,21 @@ fn get_linter_list() -> Vec<&'static Linter> {
             name: "py_lint",
             lint_fn: lint_py_lint,
         },
+        &Linter {
+            description: "Check that shutil.rmtree is not used",
+            name: "rmtree",
+            lint_fn: lint_rmtree,
+        },
         &Linter {
             description: "Check that std::filesystem is not used directly",
             name: "std_filesystem",
             lint_fn: lint_std_filesystem
         },
+        &Linter {
+            description: "Check that remove_all is not used",
+            name: "remove_all",
+            lint_fn: lint_remove_all
+        },
         &Linter {
             description: "Check that fatal assertions are not used in RPC code",
             name: "rpc_assert",
diff --git a/test/sanitizer_suppressions/valgrind.supp b/test/sanitizer_suppressions/valgrind.supp
index 584cdcf755ef..8bcad9140e31 100644
--- a/test/sanitizer_suppressions/valgrind.supp
+++ b/test/sanitizer_suppressions/valgrind.supp
@@ -12,8 +12,10 @@
 #       --error-limit=no build/bin/test_bitcoin
 #
 # Note that suppressions may depend on OS and/or library versions.
-# Tested on aarch64 and x86_64 with Ubuntu Noble system libs, using clang-16
-# and GCC, without gui.
+# Tested on Debian Trixie system libs,
+# * using clang (only x86_64, see https://bugs.kde.org/show_bug.cgi?id=485276),
+# * and GCC (only -O1, see https://bugs.kde.org/show_bug.cgi?id=472329),
+# without gui (because it only passes with a DEBUG=1 depends build).
 {
    Suppress leaks on shutdown
    Memcheck:Leak
diff --git a/vcpkg.json b/vcpkg.json
index e034c7916456..49906808c8f1 100644
--- a/vcpkg.json
+++ b/vcpkg.json
@@ -4,7 +4,6 @@
   "builtin-baseline": "120deac3062162151622ca4860575a33844ba10b",
   "dependencies": [
     "boost-multi-index",
-    "boost-signals2",
     "libevent"
   ],
   "default-features": [