Skip to content

Commit

Permalink
Merge remote-tracking branch 'origin/develop' into ft/round_voting
Browse files Browse the repository at this point in the history
  • Loading branch information
CodeIsTheKey committed Feb 29, 2024
2 parents 7eac731 + 310e5fa commit b61208c
Show file tree
Hide file tree
Showing 32 changed files with 14,835 additions and 3,339 deletions.
2 changes: 1 addition & 1 deletion doc/build-unix.md
Original file line number Diff line number Diff line change
Expand Up @@ -12,7 +12,7 @@ Run the following commands to install required packages:

##### Debian/Ubuntu:
```bash
$ sudo apt-get install curl build-essential libtool autotools-dev automake pkg-config python3 bsdmainutils bison cmake byacc
$ sudo apt-get install curl build-essential libtool autotools-dev automake pkg-config python3 bsdmainutils bison
```

##### Fedora:
Expand Down
2 changes: 1 addition & 1 deletion doc/release-notes/dash/release-notes-0.16.0.1
Original file line number Diff line number Diff line change
Expand Up @@ -257,7 +257,7 @@ by specifying a path to custom css files via `--custom-css-dir`. Additionally, t
which makes it possible to see and debug all css adjustments live in the running GUI.

From now on the "Pay To" field in "Send" and "PrivateSend" tabs also accepts Dash URIs.
The Dash address and the amount from the URI are assigned to corresponding fields automatically
The Raptoreum address and the amount from the URI are assigned to corresponding fields automatically
if a Dash URI gets pasted into the field.

Sporks
Expand Down
2 changes: 1 addition & 1 deletion doc/release-notes/dash/release-notes-0.16.0.1.md
Original file line number Diff line number Diff line change
Expand Up @@ -257,7 +257,7 @@ by specifying a path to custom css files via `--custom-css-dir`. Additionally, t
which makes it possible to see and debug all css adjustments live in the running GUI.

From now on the "Pay To" field in "Send" and "PrivateSend" tabs also accepts Dash URIs.
The Dash address and the amount from the URI are assigned to corresponding fields automatically
The Raptoreum address and the amount from the URI are assigned to corresponding fields automatically
if a Dash URI gets pasted into the field.

Sporks
Expand Down
2 changes: 1 addition & 1 deletion src/Makefile.am
Original file line number Diff line number Diff line change
Expand Up @@ -298,7 +298,7 @@ BITCOIN_CORE_H = \
util/spanparsing.h \
util/system.h \
util/asmap.h \
util/macros.h \
util/macro.h \
util/memory.h \
util/moneystr.h \
util/ranges.h \
Expand Down
2 changes: 1 addition & 1 deletion src/Makefile.qt.include
Original file line number Diff line number Diff line change
Expand Up @@ -161,7 +161,7 @@ BITCOIN_QT_H = \
qt/rpcconsole.h \
qt/sendcoinsdialog.h \
qt/sendcoinsentry.h \
qt/sendassesdialog.h \
qt/sendassetsdialog.h \
qt/sendassetsentry.h \
qt/createassetsdialog.h \
qt/updateassetsdialog.h \
Expand Down
4 changes: 2 additions & 2 deletions src/qt/forms/createassetsdialog.ui
Original file line number Diff line number Diff line change
Expand Up @@ -1209,7 +1209,7 @@
<item>
<widget class="QCheckBox" name="checkBoxMinimumFee">
<property name="toolTip">
<string>Paying only the minimum fee is just fine as long as there is less transaction volume than space in the blocks. But be aware that this can end up in a never confirming transaction once there is more demand for neoxa transactions than the network can process.</string>
<string>Paying only the minimum fee is just fine as long as there is less transaction volume than space in the blocks. But be aware that this can end up in a never confirming transaction once there is more demand for Raptoreum transactions than the network can process.</string>
</property>
<property name="text">
<string/>
Expand All @@ -1222,7 +1222,7 @@
<bool>true</bool>
</property>
<property name="toolTip">
<string>Paying only the minimum fee is just fine as long as there is less transaction volume than space in the blocks. But be aware that this can end up in a never confirming transaction once there is more demand for neoxa transactions than the network can process.</string>
<string>Paying only the minimum fee is just fine as long as there is less transaction volume than space in the blocks. But be aware that this can end up in a never confirming transaction once there is more demand for Raptoreum transactions than the network can process.</string>
</property>
<property name="text">
<string>(read the tooltip)</string>
Expand Down
4 changes: 2 additions & 2 deletions src/qt/forms/updateassetsdialog.ui
Original file line number Diff line number Diff line change
Expand Up @@ -676,7 +676,7 @@
<item>
<widget class="QCheckBox" name="checkBoxMinimumFee">
<property name="toolTip">
<string>Paying only the minimum fee is just fine as long as there is less transaction volume than space in the blocks. But be aware that this can end up in a never confirming transaction once there is more demand for neoxa transactions than the network can process.</string>
<string>Paying only the minimum fee is just fine as long as there is less transaction volume than space in the blocks. But be aware that this can end up in a never confirming transaction once there is more demand for Raptoreum transactions than the network can process.</string>
</property>
<property name="text">
<string/>
Expand All @@ -689,7 +689,7 @@
<bool>true</bool>
</property>
<property name="toolTip">
<string>Paying only the minimum fee is just fine as long as there is less transaction volume than space in the blocks. But be aware that this can end up in a never confirming transaction once there is more demand for neoxa transactions than the network can process.</string>
<string>Paying only the minimum fee is just fine as long as there is less transaction volume than space in the blocks. But be aware that this can end up in a never confirming transaction once there is more demand for Raptoreum transactions than the network can process.</string>
</property>
<property name="text">
<string>(read the tooltip)</string>
Expand Down
1 change: 1 addition & 0 deletions src/qt/locale/raptoreum_ar.ts
Original file line number Diff line number Diff line change
@@ -1,4 +1,5 @@
<?xml version="1.0" encoding="utf-8"?>
<!DOCTYPE TS>
<TS version="2.1" language="ar">
<context>
<name>AddressBookPage</name>
Expand Down
1 change: 1 addition & 0 deletions src/qt/locale/raptoreum_bg.ts
Original file line number Diff line number Diff line change
@@ -1,4 +1,5 @@
<?xml version="1.0" encoding="utf-8"?>
<!DOCTYPE TS>
<TS version="2.1" language="bg">
<context>
<name>AddressBookPage</name>
Expand Down
1 change: 1 addition & 0 deletions src/qt/locale/raptoreum_de.ts
Original file line number Diff line number Diff line change
@@ -1,4 +1,5 @@
<?xml version="1.0" encoding="utf-8"?>
<!DOCTYPE TS>
<TS version="2.1" language="de">
<context>
<name>AddressBookPage</name>
Expand Down
Loading

0 comments on commit b61208c

Please sign in to comment.